IBX-8119: Upgraded minimum PHP version to 8.3 and PHPUnit to ^9.6

.github/workflows/ci.yaml

@@ -10,13 +10,13 @@ on:
 jobs:
   cs-fix:
     name: Run code style check
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     strategy:
       matrix:
         php:
-          - '8.0'
+          - '8.3'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -26,29 +26,26 @@ jobs:
           extensions: 'pdo_sqlite, gd'
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
+          dependency-versions: highest
 
       - name: Run code style check
         run: composer run-script check-cs -- --format=checkstyle | cs2pr
 
   tests:
     name: Tests
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
         php:
-          - '7.4'
-          - '8.0'
-          - '8.1'
-        composer_options: [ "" ]
+          - '8.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -58,10 +55,9 @@ jobs:
           extensions: pdo_sqlite, gd
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
-          composer-options: "--prefer-dist --no-progress --no-suggest ${{ matrix.composer_options }}"
+          dependency-versions: highest
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -72,20 +68,17 @@ jobs:
   integration-tests:
     name: Integration yests
     needs: tests
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-22.04"
     timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
         php:
-          - '7.4'
-          - '8.0'
-          - '8.1'
-        composer_options: [ "" ]
+          - '8.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
@@ -95,10 +88,9 @@ jobs:
           extensions: pdo_sqlite, gd
           tools: cs2pr
 
-      - uses: "ramsey/composer-install@v1"
+      - uses: ramsey/composer-install@v3
         with:
-          dependency-versions: "highest"
-          composer-options: "--prefer-dist --no-progress --no-suggest ${{ matrix.composer_options }}"
+          dependency-versions: highest
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

composer.json

@@ -7,28 +7,27 @@
         "ezsystems/ez-support-tools": "*"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": " >=8.3",
         "ext-json": "*",
-        "ibexa/core": "~5.0.0@dev",
-        "ibexa/admin-ui": "~5.0.0@dev",
+        "ibexa/admin-ui": "~5.0.x-dev",
+        "ibexa/core": "~5.0.x-dev",
         "zetacomponents/system-information": "^1.1.1"
     },
     "require-dev": {
         "ibexa/ci-scripts": "^0.2@dev",
-        "ibexa/code-style": "^1.0",
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "ibexa/doctrine-schema": "~5.0.0@dev",
-        "ibexa/content-forms": "~5.0.0@dev",
-        "ibexa/design-engine": "~5.0.0@dev",
-        "ibexa/user": "~5.0.0@dev",
-        "ibexa/fieldtype-richtext": "~5.0.0@dev",
-        "ibexa/rest": "~5.0.0@dev",
-        "ibexa/search": "~5.0.0@dev",
-        "ibexa/test-core": "~5.0.x-dev",
-        "ibexa/http-cache": "~5.0.0@dev",
+        "ibexa/code-style": "~2.0.0",
+        "ibexa/content-forms": "~5.0.x-dev",
+        "ibexa/design-engine": "~5.0.x-dev",
+        "ibexa/doctrine-schema": "~5.0.x-dev",
+        "ibexa/fieldtype-richtext": "~5.0.x-dev",
+        "ibexa/http-cache": "~5.0.x-dev",
         "ibexa/notifications": "~5.0.x-dev",
-        "phpunit/phpunit": "^8.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0"
+        "ibexa/rest": "~5.0.x-dev",
+        "ibexa/search": "~5.0.x-dev",
+        "ibexa/test-core": "~5.0.x-dev",
+        "ibexa/user": "~5.0.x-dev",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {
@@ -58,6 +57,7 @@
         "test-integration": "phpunit -c phpunit.integration.xml"
     },
     "config": {
-        "allow-plugins": false
+        "allow-plugins": false,
+        "sort-packages": true
     }
 }

phpunit.xml

@@ -1,17 +1,21 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-
-<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         bootstrap="tests/bundle/bootstrap.php"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        colors="false"
-        >
+        colors="true"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+>
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>tests/</directory>
+            <directory>vendor/</directory>
+        </exclude>
+    </coverage>
     <php>
-        <ini name="error_reporting" value="-1" />
+        <ini name="error_reporting" value="-1"/>
     </php>
     <testsuites>
         <testsuite name="Bundle unit tests">
@@ -21,13 +25,4 @@
             <directory>tests/lib/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>

src/bundle/Command/SystemInfoDumpCommand.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\Command;
 
 use Ibexa\Bundle\Core\Command\BackwardCompatibleCommand;

src/bundle/Controller/SystemInfoController.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\Controller;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\SystemInfoCollectorRegistry;

src/bundle/DependencyInjection/Compiler/OutputFormatPass.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormatRegistry;

src/bundle/DependencyInjection/Compiler/SystemInfoTabGroupPass.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler;
 
 use Ibexa\AdminUi\Tab\TabGroup;

src/bundle/IbexaSystemInfoBundle.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo;
 
 use Ibexa\Bundle\SystemInfo\DependencyInjection\Compiler\OutputFormatPass;

src/bundle/SystemInfo/Collector/ConfigurationSymfonyKernelSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\SymfonyKernelSystemInfo;

src/bundle/SystemInfo/Collector/EzcHardwareSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\EzcSystemInfoWrapper;

src/bundle/SystemInfo/Collector/EzcPhpSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\EzcSystemInfoWrapper;

src/bundle/SystemInfo/Collector/IbexaSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use DateTime;

src/bundle/SystemInfo/Collector/JsonComposerLockSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Composer\InstalledVersions;

src/bundle/SystemInfo/Collector/RepositorySystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Doctrine\DBAL\Connection;

src/bundle/SystemInfo/Collector/ServicesSystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value\ServicesSystemInfo;

src/bundle/SystemInfo/Collector/SystemInfoCollector.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Collector;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\Value;

src/bundle/SystemInfo/Exception/ComposerFileValidationException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;

src/bundle/SystemInfo/Exception/ComposerJsonFileNotFoundException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;

src/bundle/SystemInfo/Exception/ComposerLockFileNotFoundException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;

src/bundle/SystemInfo/Exception/MetricsNotFoundException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;

src/bundle/SystemInfo/Exception/SystemInfoException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 interface SystemInfoException

src/bundle/SystemInfo/Exception/SystemInfoServiceNotFoundException.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Exception;
 
 use Exception;

src/bundle/SystemInfo/EzcSystemInfoWrapper.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 use ezcSystemInfo;

src/bundle/SystemInfo/OutputFormat.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 interface OutputFormat

src/bundle/SystemInfo/OutputFormat/JsonOutputFormat.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormat;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\OutputFormat as SystemInfoOutputFormat;

src/bundle/SystemInfo/OutputFormatRegistry.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo;
 
 use Ibexa\Core\Base\Exceptions\NotFoundException;

src/bundle/SystemInfo/Registry/IdentifierBased.php

@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+
 namespace Ibexa\Bundle\SystemInfo\SystemInfo\Registry;
 
 use Ibexa\Bundle\SystemInfo\SystemInfo\SystemInfoCollectorRegistry;