Do not require knplabs/doctrine-behaviors

sonata-project · Nov 10, 2024 · b35c371 · b35c371
1 parent 7dc7533
commit b35c371
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -58,6 +58,16 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
+                    - php-version: '8.3'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/test_symfony_7.yaml → .github/workflows/test_knp.yaml b/.github/workflows/test_symfony_7.yaml → .github/workflows/test_knp.yaml
@@ -23,21 +23,39 @@ jobs:
         continue-on-error: ${{ matrix.allowed-to-fail }}
 
         env:
-            SYMFONY_REQUIRE: ${{matrix.symfony-require}}
+            SYMFONY_REQUIRE: ${{ matrix.symfony-require }}
 
         strategy:
             matrix:
+                php-version:
+                    - '8.0'
+                    - '8.1'
+                    - '8.2'
+                    - '8.3'
+                dependencies: [ highest ]
+                allowed-to-fail: [ false ]
+                symfony-require: [ '' ]
+                variant: [ normal ]
                 include:
-                    - php-version: '8.2'
+                    - php-version: '8.0'
+                      dependencies: lowest
+                      allowed-to-fail: false
+                      variant: normal
+                    - php-version: '8.3'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 5.4.*
+                      variant: symfony/symfony:"5.4.*"
+                    - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.0.*
-                      variant: symfony/symfony:"7.0.*"
+                      symfony-require: 6.3.*
+                      variant: symfony/symfony:"6.3.*"
                     - php-version: '8.3'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.0.*
-                      variant: symfony/symfony:"7.0.*"
+                      symfony-require: 6.4.*
+                      variant: symfony/symfony:"6.4.*"
 
         steps:
             - name: Checkout
@@ -53,8 +71,8 @@ jobs:
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            - name: Remove knplabs/doctrine-behaviors
-              run: composer remove knplabs/doctrine-behaviors --dev --no-update
+            - name: Add knplabs/doctrine-behaviors
+              run: composer require knplabs/doctrine-behaviors --dev --no-update
 
             - name: Install variant
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')

diff --git a/composer.json b/composer.json
@@ -40,7 +40,6 @@
         "doctrine/persistence": "^3.0.2",
         "friendsofphp/php-cs-fixer": "^3.4",
         "gedmo/doctrine-extensions": "^3.11",
-        "knplabs/doctrine-behaviors": "^2.6.2",
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
         "phpstan/extension-installer": "^1.0",