Symfony Panther and Maker supports Symfony 6

sonata-project · Nov 21, 2021 · 38b2aa4 · 38b2aa4
1 parent 8e0a447
commit 38b2aa4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/templates/project/.github/workflows/test.yaml.twig b/templates/project/.github/workflows/test.yaml.twig
@@ -91,7 +91,7 @@ jobs:
 {# Remove when when all dev dependencies are compatible with Symfony 6 #}
             - name: Remove dev dependencies not compatible with Symfony 6
               if: matrix.symfony-require == '6.0.*'
-              run: composer remove psalm/plugin-symfony symfony/maker-bundle symfony/panther --dev --no-update --no-interaction
+              run: composer remove psalm/plugin-symfony --dev --no-update --no-interaction
 
 {# Remove when removing 3.x for the managed branches of block-bundle #}
 {% if project.repository.name == 'SonataBlockBundle' and branch.name == '3.x' %}

diff --git a/templates/project/phpunit.xml.dist.twig b/templates/project/phpunit.xml.dist.twig
@@ -31,11 +31,9 @@ It's auto-generated by sonata-project/dev-kit package.
     </listeners>
 
 {% if project.usesPanther %}
-    <!-- TODO: Uncomment this section when Symfony Panther supports Symfony 6
     <extensions>
         <extension class="Symfony\Component\Panther\ServerExtension" />
     </extensions>
-    -->
 
 {% endif %}
     <php>

diff --git a/tests/Command/Dispatcher/DispatchFilesCommandTest.php b/tests/Command/Dispatcher/DispatchFilesCommandTest.php
@@ -185,7 +185,7 @@ public function projectProvider(): iterable
 
             - name: Remove dev dependencies not compatible with Symfony 6
               if: matrix.symfony-require == '6.0.*'
-              run: composer remove psalm/plugin-symfony symfony/maker-bundle symfony/panther --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