Merge 4.x into 5.x

sonata-project · Mar 25, 2023 · bb7a47e · bb7a47e
2 parents d044d18 + 72f7c77
commit bb7a47e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -79,6 +79,10 @@ jobs:
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+            - name: Use older Flex endpoint for Symfony 4.4
+              if: matrix.symfony-require == '4.4.*'
+              run: composer config extra.symfony.endpoint https://raw.githubusercontent.com/symfony/recipes/c8d90298241f176a261dadc4814d7058415a4c1f/index.json
+
             - name: Globally install symfony/flex
               if: matrix.symfony-require != ''
               run: |

diff --git a/composer.json b/composer.json
@@ -66,7 +66,7 @@
     "require-dev": {
         "async-aws/simple-s3": "^1.0",
         "aws/aws-sdk-php": "^3.0",
-        "dama/doctrine-test-bundle": "^6.7 || ^7.0",
+        "dama/doctrine-test-bundle": "^7.0",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/mongodb-odm": "^2.4",
         "doctrine/orm": "^2.14",