⬆️ allow Symfony 8

garak · garak · commit 333618106d7c · 2025-08-13T09:09:29.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,6 +1,10 @@
 name: build
 
-on: [push, pull_request]
+on:
+    push:
+        branches:
+            - master
+    pull_request: ~
 
 env:
   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -85,17 +89,24 @@ jobs:
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.3'
-                      symfony: '7.2.*'
+                      symfony: '7.3.*'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false
                       max_deprecations: 0
                     - php: '8.4'
-                      symfony: '7.3.*@dev'
+                      symfony: '7.4.*@dev'
                       dependencies: highest
                       with_imagine: false
                       with_oneupbundle: false
                       max_deprecations: 6
+                    - php: '8.4'
+                      symfony: '8.0.*@dev'
+                      dependencies: highest
+                      with_imagine: false
+                      with_oneupbundle: false
+                      max_deprecations: 6
+
         name: PHP ${{ matrix.php }} with Symfony ${{ matrix.symfony }} tests with ${{ matrix.dependencies }} dependencies
         steps:
             - name: Checkout
@@ -115,7 +126,7 @@ jobs:
                   sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0",\n"symfony\/http-kernel": "6.4.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json
             - run: |
                   composer global config --no-plugins allow-plugins.symfony/flex true
-                  composer global require --no-interaction --no-progress symfony/flex:^2.2
+                  composer global require --no-interaction --no-progress symfony/flex:^2.8
                   composer config extra.symfony.require ${{ matrix.symfony }}
               if: matrix.symfony != '*'
             - name: use possible dev deps
diff --git a/composer.json b/composer.json
@@ -19,15 +19,15 @@
         "ext-simplexml": "*",
         "doctrine/persistence": "^3.0 || ^4.0",
         "jms/metadata": "^2.4",
-        "symfony/config": "^5.4 || ^6.0 || ^7.0",
-        "symfony/console": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/config": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/console": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
         "symfony/event-dispatcher-contracts": "^3.1",
-        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
-        "symfony/mime": "^5.4 || ^6.0 || ^7.0",
-        "symfony/property-access": "^5.4 || ^6.0 || ^7.0",
-        "symfony/string": "^5.4 || ^6.0 || ^7.0"
+        "symfony/http-foundation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/mime": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/property-access": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/string": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
@@ -41,22 +41,22 @@
         "league/flysystem-memory": "^2.0 || ^3.0",
         "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "mikey179/vfsstream": "^1.6.11",
-        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.0",
-        "symfony/asset": "^5.4 || ^6.0 || ^7.0",
-        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
-        "symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0",
-        "symfony/form": "^5.4 || ^6.0 || ^7.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/phpunit-bridge": "^7.2",
-        "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0",
-        "symfony/translation": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
-        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
-        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.2",
+        "symfony/asset": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/dom-crawler": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/form": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/phpunit-bridge": "^7.3",
+        "symfony/security-csrf": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/translation": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/validator": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0 || ^8.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "For integration with Doctrine",
diff --git a/src/Naming/DirectoryNamerInterface.php b/src/Naming/DirectoryNamerInterface.php
@@ -19,9 +19,9 @@ interface DirectoryNamerInterface
      * @param object|array    $object  The object or array the upload is attached to
      * @param PropertyMapping $mapping The mapping to use to manipulate the given object
      *
-     * @return string The directory name
-     *
      * @phpstan-param T $object
+     *
+     * @return string The directory name
      */
     public function directoryName(object|array $object, PropertyMapping $mapping): string;
 }
diff --git a/src/Naming/NamerInterface.php b/src/Naming/NamerInterface.php
@@ -19,9 +19,9 @@ interface NamerInterface
      * @param object|array    $object  The object or array the upload is attached to
      * @param PropertyMapping $mapping The mapping to use to manipulate the given object
      *
-     * @return string The file name
-     *
      * @phpstan-param T $object
+     *
+     * @return string The file name
      */
     public function name(object $object, PropertyMapping $mapping): string;
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ interface DirectoryNamerInterface`
`19`	`19`	`* @param object\|array $object The object or array the upload is attached to`
`20`	`20`	`* @param PropertyMapping $mapping The mapping to use to manipulate the given object`
`21`	`21`	`*`
`22`		`- * @return string The directory name`
`23`		`- *`
`24`	`22`	`* @phpstan-param T $object`
	`23`	`+ *`
	`24`	`+ * @return string The directory name`
`25`	`25`	`*/`
`26`	`26`	`public function directoryName(object\|array $object, PropertyMapping $mapping): string;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ interface NamerInterface`
`19`	`19`	`* @param object\|array $object The object or array the upload is attached to`
`20`	`20`	`* @param PropertyMapping $mapping The mapping to use to manipulate the given object`
`21`	`21`	`*`
`22`		`- * @return string The file name`
`23`		`- *`
`24`	`22`	`* @phpstan-param T $object`
	`23`	`+ *`
	`24`	`+ * @return string The file name`
`25`	`25`	`*/`
`26`	`26`	`public function name(object $object, PropertyMapping $mapping): string;`
`27`	`27`	`}`