feat: Allow Symfony 7

theofidry · Dec 3, 2023 · 35f3ea2 · 35f3ea2
1 parent 166464f
commit 35f3ea2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,7 +36,7 @@ jobs:
                 run: php-cs-fixer fix --dry-run --diff --ansi
 
     phpunit:
-        name: PHPUnit PHP ${{ matrix.php }} ${{ matrix.dependency }} (Symfony ${{ matrix.symfony }})
+        name: PHPUnit (PHP ${{ matrix.php }}) ${{ matrix.variant }}
         runs-on: ubuntu-latest
         strategy:
             matrix:
@@ -48,7 +48,9 @@ jobs:
                     -   php: '8.2'
                         variant: 'symfony/symfony:"^6.4"'
                         dependencies: 'highest'
-                        composer-flags: ''
+                    -   php: '8.2'
+                        variant: 'symfony/symfony:"^7.0"'
+                        dependencies: 'highest'
             fail-fast: false
 
         services:
@@ -65,25 +67,23 @@ jobs:
             -   name: Checkout
                 uses: actions/checkout@v2
 
+            -   name: Configure Symfony (variant)
+                if: matrix.variant != 'normal'
+                run: composer require --dev --no-update ${{ matrix.variant }}
+
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: ${{ matrix.php }}
-                    tools: composer, flex
+                    tools: composer
                     extensions: intl, bcmath, curl, openssl, mbstring
                     ini-values: memory_limit=-1
 
-            -   name: Update project dependencies
-                if: matrix.dependency == ''
-                run: composer update --no-progress --ansi --prefer-stable
-                env:
-                    SYMFONY_REQUIRE: ${{ matrix.symfony }}
-
-            -   name: Update project dependencies lowest
-                if: matrix.dependency == 'lowest'
-                run: composer update --no-progress --ansi --prefer-stable --prefer-lowest
-                env:
-                    SYMFONY_REQUIRE: ${{ matrix.symfony }}
+            -   name: Install Composer dependencies (${{ matrix.dependencies }})
+                uses: ramsey/composer-install@v1
+                with:
+                    dependency-versions: ${{ matrix.dependencies }}
+                    composer-options: "--prefer-dist"
 
             -   name: Wait for MySQL
                 run: |

diff --git a/composer.json b/composer.json
@@ -4,7 +4,6 @@
     "keywords": ["Symfony", "Fixture", "ORM", "Alice", "Faker"],
     "type": "symfony-bundle",
     "license": "MIT",
-    "minimum-stability": "dev",
     "authors": [
         {
             "name": "Baldur Rensch",
@@ -38,14 +37,14 @@
         "doctrine/orm": "^2.10.0",
         "doctrine/persistence": "^2.2 || ^3.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/finder": "^6.4",
-        "symfony/framework-bundle": "^6.4",
+        "symfony/finder": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
         "theofidry/alice-data-fixtures": "^1.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "phpspec/prophecy": "^1.7",
-        "symfony/phpunit-bridge": "^6.4",
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "monolog/monolog": "^3.5"
     },