Merge 3.x into 4.x

sonata-project · Dec 3, 2021 · 059c0dc · 059c0dc
2 parents a03d001 + 03918ee
commit 059c0dc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -68,10 +68,6 @@ jobs:
             - name: Allow unstable dependencies
               run: composer config minimum-stability dev
 
-            - name: Remove dev dependencies not compatible with Symfony 6
-              if: matrix.symfony-require == '6.0.*'
-              run: composer remove psalm/plugin-symfony --dev --no-update --no-interaction
-
             - name: Install Composer dependencies (${{ matrix.dependencies }})
               uses: ramsey/composer-install@v1
               with:

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -16,10 +16,6 @@ parameters:
       message: "#^Call to static method getInstance\\(\\) on an unknown class Sonata\\\\EasyExtendsBundle\\\\Mapper\\\\DoctrineCollector\\.$#"
       count: 1
       path: src/DependencyInjection/SonataNewsExtension.php
-    - # NEXT_MAJOR: Remove this issue.
-      message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository::createQueryBuilder\\(\\)\\.$#"
-      count: 1
-      path: src/Document/CommentManager.php
     - # NEXT_MAJOR: Remove this issue.
       message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository<object>::createQueryBuilder\\(\\)\\.$#"
       count: 2