Add support for Symfony ^6.0 (#5)

jwong-dayspring · web-flow · commit 12db13edca39 · 2025-03-03T11:15:47.000-08:00
* support symfony 6

* add php 8.2-8.4; also check with 5.0 family

* switch to ramsey/composer-install
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,11 +10,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1' ]
-        composer: [ '', '--prefer-lowest' ]
+        php: 
+          - '7.4'
+          - '8.0'
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4' 
+        deps:
+          - 'highest' 
+          - 'lowest'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use PHP
         uses: shivammathur/setup-php@v2
@@ -32,22 +40,22 @@ jobs:
 
       - name: cache dependencies
         id: cache-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.deps }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.deps }}-composer-
 
       - name: Validate composer.json and composer.lock
         run: composer validate
         working-directory: ./
 
       - name: Install dependencies
-        env:
-          COMPOSER_FLAGS: ${{ matrix.composer }}
-        run: composer update ${COMPOSER_FLAGS} --prefer-source
-        working-directory: ./
+        uses: ramsey/composer-install@v3
+        with:
+          dependency-versions: '${{ matrix.deps }}'            
+          working-directory: ./
 
 
       - name: Run Tests
diff --git a/Framework/Test/ServiceTestCase.php b/Framework/Test/ServiceTestCase.php
@@ -94,7 +94,7 @@ static private function getPhpUnitCliConfigArgument()
      */
     static protected function getKernelClass()
     {
-        $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir();
+        $dir = $_SERVER['KERNEL_DIR'] ?? static::getPhpUnitXmlDir();
 
         $finder = new Finder();
         $finder->name('*Kernel.php')->depth(0)->in($dir);
@@ -123,15 +123,15 @@ static protected function getKernelClass()
      *
      * @return HttpKernelInterface A HttpKernelInterface instance
      */
-    static protected function createKernel(array $options = array())
+    static protected function createKernel(array $options = [])
     {
         if (null === static::$class) {
             static::$class = static::getKernelClass();
         }
 
         return new static::$class(
-            isset($options['environment']) ? $options['environment'] : 'test',
-            isset($options['debug']) ? $options['debug'] : true
+            $options['environment'] ?? 'test',
+            $options['debug'] ?? true
         );
     }
 
diff --git a/Tests/TestKernel.php b/Tests/TestKernel.php
@@ -11,17 +11,16 @@ public function getRootDir()
     {
         return __DIR__.'/Resources';
     }
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
-        return array(
-        );
+        return [];
     }
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/Resources/config/config_test.yml');
         if (class_exists('Symfony\Component\Asset\Package')) {
             $loader->load(function (ContainerBuilder $container) {
-                $container->loadFromExtension('framework', array('assets' => array()));
+                $container->loadFromExtension('framework', ['assets' => []]);
             });
         }
     }
diff --git a/composer.json b/composer.json
@@ -21,13 +21,14 @@
     ],
     "require": {
         "php": ">=7.4",
-        "symfony/http-kernel": "^4.4.12|^5.0",
+        "symfony/http-kernel": "^4.4.12|^5.0|^6.0",
         "phpunit/phpunit": "^8.5.23|^9.0"
     },
     "require-dev": {
-        "symfony/config": "^4.4.12|^5.0",
-        "symfony/dependency-injection": "^4.4.12|^5.0",
-        "symfony/yaml": "^4.4.12|^5.0"
+        "symfony/config": "^4.4.12|^5.0|^6.0",
+        "symfony/dependency-injection": "^4.4.12|^5.0|^6.0",
+        "symfony/yaml": "^4.4.12|^5.0|^6.0",
+        "rector/rector": "^0.19.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,39 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="Tests/autoload.php">
-
-    <php>
-        <ini name="error_reporting" value="-1"/>
-        <server name="KERNEL_DIR" value="./Tests/" />
-    </php>
-
-    <testsuites>
-        <testsuite name="ServiceTestHelper Test Suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log type="junit" target="build/logs/junit.xml"
-             logIncompleteSkipped="false"/>
-    </logging>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-                <directory>./Resources</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+         bootstrap="Tests/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+      <directory>./Resources</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <server name="KERNEL_DIR" value="./Tests/"/>
+  </php>
+  <testsuites>
+    <testsuite name="ServiceTestHelper Test Suite">
+      <directory suffix="Test.php">./Tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/logs/junit.xml"/>
+  </logging>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static private function getPhpUnitCliConfigArgument()`
`94`	`94`	`*/`
`95`	`95`	`static protected function getKernelClass()`
`96`	`96`	`{`
`97`		`- $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir();`
	`97`	`+ $dir = $_SERVER['KERNEL_DIR'] ?? static::getPhpUnitXmlDir();`
`98`	`98`
`99`	`99`	`$finder = new Finder();`
`100`	`100`	`$finder->name('*Kernel.php')->depth(0)->in($dir);`
`@@ -123,15 +123,15 @@ static protected function getKernelClass()`
`123`	`123`	`*`
`124`	`124`	`* @return HttpKernelInterface A HttpKernelInterface instance`
`125`	`125`	`*/`
`126`		`- static protected function createKernel(array $options = array())`
	`126`	`+ static protected function createKernel(array $options = [])`
`127`	`127`	`{`
`128`	`128`	`if (null === static::$class) {`
`129`	`129`	`static::$class = static::getKernelClass();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`return new static::$class(`
`133`		`- isset($options['environment']) ? $options['environment'] : 'test',`
`134`		`- isset($options['debug']) ? $options['debug'] : true`
	`133`	`+ $options['environment'] ?? 'test',`
	`134`	`+ $options['debug'] ?? true`
`135`	`135`	`);`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,16 @@ public function getRootDir()`
`11`	`11`	`{`
`12`	`12`	`return __DIR__.'/Resources';`
`13`	`13`	`}`
`14`		`- public function registerBundles()`
	`14`	`+ public function registerBundles(): iterable`
`15`	`15`	`{`
`16`		`- return array(`
`17`		`- );`
	`16`	`+ return [];`
`18`	`17`	`}`
`19`	`18`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`20`	`19`	`{`
`21`	`20`	`$loader->load(__DIR__.'/Resources/config/config_test.yml');`
`22`	`21`	`if (class_exists('Symfony\Component\Asset\Package')) {`
`23`	`22`	`$loader->load(function (ContainerBuilder $container) {`
`24`		`- $container->loadFromExtension('framework', array('assets' => array()));`
	`23`	`+ $container->loadFromExtension('framework', ['assets' => []]);`
`25`	`24`	`});`
`26`	`25`	`}`
`27`	`26`	`}`