DevKit updates for 4.x branch (#7833)

* DevKit updates * DevKit updates * Fix test with Symfony 6.1 see symfony/symfony#45771 Co-authored-by: Fran Moreno <[email protected]>
sonata-project · May 29, 2022 · 09d8950 · 09d8950
1 parent a439577
commit 09d8950
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -67,11 +67,6 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 4.4.*
                       variant: symfony/symfony:"4.4.*"
-                    - php-version: '8.1'
-                      dependencies: highest
-                      allowed-to-fail: false
-                      symfony-require: 5.3.*
-                      variant: symfony/symfony:"5.3.*"
                     - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
@@ -82,6 +77,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.0.*
                       variant: symfony/symfony:"6.0.*"
+                    - php-version: '8.1'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.1.*
+                      variant: symfony/symfony:"6.1.*"
 
         steps:
             - name: Checkout

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -64,7 +64,6 @@
     'static_lambda' => true,
     'strict_comparison' => true,
     'strict_param' => true,
-    'types_spaces' => ['space' => 'single'],
     'void_return' => false,
 ];
 

diff --git a/tests/Form/AdminLayoutTest.php b/tests/Form/AdminLayoutTest.php
@@ -107,8 +107,9 @@ public function testHelp(): void
         $view = $form->createView();
         $html = $this->renderHelp($view);
 
+        // TODO: Replace "/p|div" with "/div" when support for Symfony < 6.1 is dropped.
         $expression = <<<'EOD'
-/p
+/p|div
     [@id="name_help"]
     [@class="help-block sonata-ba-field-help help-text"]
     [.="[trans]Help text test![/trans]"]
@@ -128,8 +129,9 @@ public function testHelpWithAdminTranslationDomain(): void
         $view = $form->createView();
         $html = $this->renderHelp($view);
 
+        // TODO: Replace "/p|div" with "/div" when support for Symfony < 6.1 is dropped.
         $expression = <<<'EOD'
-/p
+/p|div
     [@id="name_help"]
     [@class="help-block sonata-ba-field-help help-text"]
     [.="[trans domain=sonata_translation_domain]Help text test![/trans]"]

diff --git a/tests/Functional/Controller/CRUDControllerTest.php b/tests/Functional/Controller/CRUDControllerTest.php
@@ -44,7 +44,7 @@ public function testCreate(): void
         );
         static::assertCount(
             1,
-            $crawler->filter('p.help-block.sonata-ba-field-help:contains("Help me!")')
+            $crawler->filter('.help-block.sonata-ba-field-help:contains("Help me!")')
         );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ public function testCreate(): void @@
             );
             static::assertCount(
 ,
-                $crawler->filter('p.help-block.sonata-ba-field-help:contains("Help me!")')
+                $crawler->filter('.help-block.sonata-ba-field-help:contains("Help me!")')
             );
         }
@@ Expand Down @@