feat: support Symfony 7 and modernize code base

.github/workflows/ci.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 7.4, 8.0 ]
-        symfony: [ 4.4.*, 5.3.*, 5.4.* ]
-        deps: [ hightest ]
+        php: [ 8.1, 8.2, 8.3 ]
+        symfony: [ 6.3.*, 6.4.*, 7.0.* ]
+        deps: [ highest ]
         include:
-          - php: 7.2
+          - php: 7.4
             deps: lowest
             symfony: '*'
-          - php: 8.0
-            deps: highest
-            symfony: 6.0.*
+        exclude:
+          - php: 8.1
+            symfony: 7.0.*
 
     steps:
       - name: Checkout code
@@ -40,15 +40,8 @@ jobs:
         env:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
-      - name: Install phpspec
-        run: composer bin phpspec install
-
       - name: Run tests
-        run: vendor/bin/simple-phpunit -v
-
-      - name: Run phpspec
-        run: vendor/bin/phpspec run --format=pretty
-        if: matrix.symfony != '6.0.*'
+        run: vendor/bin/phpunit -v
 
   code-coverage:
     name: Code Coverage
@@ -60,7 +53,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: xdebug
 
       - name: Install dependencies
@@ -69,7 +62,7 @@ jobs:
           composer-options: --prefer-dist
 
       - name: Run code coverage
-        run: vendor/bin/simple-phpunit -v --coverage-text
+        run: vendor/bin/phpunit -v --coverage-text
 
   composer-validate:
     name: Validate composer.json

.gitignore

@@ -1,4 +1,5 @@
 /composer.lock
+/.phpunit.result.cache
 /vendor
 /tests/fixtures/app/cache
 /tests/fixtures/app/logs

composer.json

@@ -11,14 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0"
+        "php": "^7.4|^8.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
-        "symfony/var-dumper": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^5.3",
-        "bamarni/composer-bin-plugin": "^1.4",
-        "symfony/yaml": "^4.4|^5.0|^6.0"
+        "symfony/var-dumper": "^5.4|^6.0|^7.0",
+        "symfony/phpunit-bridge": "^6.0|^7.0",
+        "symfony/yaml": "^5.0|^6.0|^7.0",
+        "phpunit/phpunit": "^9.6.13"
     },
     "autoload": {
         "psr-4": { "Umpirsky\\I18nRoutingBundle\\": "src/" }
@@ -29,9 +29,6 @@
     "extra": {
         "branch-alias": {
             "dev-master": "0.0.1-dev"
-        },
-        "bamarni-bin": {
-            "target-directory": "bin/tools"
         }
     },
     "minimum-stability": "dev",

phpunit.xml

@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="vendor/autoload.php">
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
     <php>
         <server name="KERNEL_DIR" value="tests/fixtures/app" />
         <server name="KERNEL_CLASS" value="AppKernel" />
-        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
+        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;quiet[]=indirect&amp;quiet[]=other"/>
     </php>
 
     <testsuites>
         <testsuite name="UmpirskyI18nRoutingBundle Test Suite">
-            <directory suffix="Test.php">tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>src/</directory>
-            <exclude>
-                <directory>src/Resources</directory>
-                <directory>tests</directory>
-                <directory>vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory>src</directory>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>

src/DependencyInjection/UmpirskyI18nRoutingExtension.php

@@ -16,7 +16,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $processor = new Processor();
         $config = $processor->processConfiguration(new Configuration(), $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.xml');
 
         $container->getDefinition('umpirsky_i18n_routing.routing.loader.i18n_route_loader')->addArgument(

src/Routing/Router.php

@@ -70,7 +70,7 @@ public function matchRequest(Request $request): array
         return $this->normalizeI18nMatch($this->router->matchRequest($request));
     }
 
-    public function warmUp($cacheDir): array
+    public function warmUp($cacheDir, $buildDir = null): array
     {
         if ($this->router instanceof WarmableInterface) {
             return $this->router->warmUp($cacheDir);