Merge 2.x into 3.x

sonata-project · Nov 28, 2021 · 2a046f1 · 2a046f1
2 parents f5149c4 + 53b93bb
commit 2a046f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -27,7 +27,7 @@ jobs:
                   php-version: '8.0'
                   coverage: none
                   tools: composer:v2
-                  extensions: mongodb-1.9.0
+                  extensions: mongodb
 
             - name: Install Composer dependencies (highest)
               uses: ramsey/composer-install@v1
@@ -52,7 +52,7 @@ jobs:
                   php-version: '8.0'
                   coverage: none
                   tools: composer:v2
-                  extensions: mongodb-1.9.0
+                  extensions: mongodb
 
             - name: Install Composer dependencies (highest)
               uses: ramsey/composer-install@v1

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -74,7 +74,7 @@ jobs:
                   php-version: ${{ matrix.php-version }}
                   coverage: pcov
                   tools: composer:v2
-                  extensions: mongodb-1.9.0
+                  extensions: mongodb
 
             - name: Add PHPUnit matcher
               run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -92,7 +92,7 @@ jobs:
 
             - name: Remove dev dependencies not compatible with Symfony 6
               if: matrix.symfony-require == '6.0.*'
-              run: composer remove psalm/plugin-symfony symfony/maker-bundle --dev --no-update --no-interaction
+              run: composer remove psalm/plugin-symfony --dev --no-update --no-interaction
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
               uses: ramsey/composer-install@v1