feature: fully support symfony 7.x

APY · Feb 5, 2025 · dcbcffd · dcbcffd
1 parent f5468bf
commit dcbcffd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -6,32 +6,34 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 
 jobs:
   build-test:
     runs-on: ubuntu-latest
-    name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} + ${{ matrix.dependencies }} deps, ES ${{ matrix.elasticsearch }})'
+    name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony-version }} + ${{ matrix.dependencies }} deps)'
     env:
-      SYMFONY_REQUIRE: "${{ matrix.symfony }}"    
+      SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
     strategy:
       matrix:
         php:
-          - '7.4'
-          - '8.0'
           - '8.1'
-          - '8.2'
-        symfony:
-          - '5.4.*'       
-          - '6.3.*'          
+          - '8.4'
+        symfony-version:
+          - '^5.4'
+          - '^6.4'
+          - '^7.2'
         dependencies:
           - 'highest'
+        exclude:
+          - php: '8.1'
+            symfony-version: '^7.2'
         include:
           - php: '7.4'
-            dependencies: 'lowest'
-        exclude:
+            symfony-version: '^4.4'
+            dependencies: 'highest'
           - php: '7.4'
-            dependencies: 'highest'               
+            symfony-version: '^5.0'
+            dependencies: 'lowest'
     steps:
     - name: 'Checkout'
       uses: actions/checkout@v3
@@ -41,7 +43,7 @@ jobs:
       with:
         php-version: '${{ matrix.php }}'
         coverage: 'none'
-        extensions: 'curl, json, intl, mbstring, mongodb, openssl'    
+        extensions: 'curl, json, intl, mbstring, mongodb, openssl'
 
     - name: 'Install Composer dependencies' 
       uses : 'ramsey/composer-install@v2'

diff --git a/composer.json b/composer.json
@@ -25,8 +25,8 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "symfony/form": "^3.0 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/dependency-injection": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+        "symfony/form": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "symfony/config": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "symfony/http-foundation": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "symfony/http-kernel": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
@@ -36,19 +36,19 @@
         "twig/twig": "^2.14 || ^3.0"
     },
     "require-dev": {
-        "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0",
-        "symfony/browser-kit": "^3.0 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/templating": "^3.0 || ^4.0 || ^5.0 || ^6.0",
-        "symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+        "symfony/browser-kit": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/flex": "^1.21 || ^2.4",
+        "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/security-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
         "phpunit/phpunit": "^9.5",
-        "friendsofphp/php-cs-fixer": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "php-coveralls/php-coveralls": "^2.0",
         "doctrine/orm": "~2.10,>=2.10.0",
         "doctrine/mongodb-odm": "^2.2",
         "rector/rector": "^0.12.13",
         "dg/bypass-finals": "^1.3",
-        "symfony/security-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0",
         "doctrine/doctrine-bundle": "^2.5"
     },
     "suggest": {
@@ -59,6 +59,11 @@
         "doctrine/mongodb-odm": "If you want to use Document as source, please require doctrine/mongodb-odm",
         "jms/translation-bundle": "If you want to use translations"
     },
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": true
+        }
+    },
     "autoload": {
         "psr-4": { "APY\\DataGridBundle\\": "" }
     },