From 08022763f8c7e119cceeb6d89484acedc7319ea2 Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Tue, 6 Feb 2024 00:24:14 +0000
Subject: [PATCH 1/2] DevKit updates

---
 rector.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rector.php b/rector.php
index 2456d3ec..93a605cc 100644
--- a/rector.php
+++ b/rector.php
@@ -21,7 +21,6 @@
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
-use Rector\PHPUnit\Set\PHPUnitLevelSetList;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 
@@ -33,7 +32,7 @@
 
     $rectorConfig->sets([
         LevelSetList::UP_TO_PHP_80,
-        PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
+        PHPUnitSetList::PHPUNIT_90,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     ]);
 

From da059a64361a387c9869a90fc23da230fc65597b Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Tue, 6 Feb 2024 07:28:34 +0100
Subject: [PATCH 2/2] Revert

---
 tests/Type/FormChoiceWidgetTest.php | 43 +++++++++--------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/tests/Type/FormChoiceWidgetTest.php b/tests/Type/FormChoiceWidgetTest.php
index d613ecdd..bab7a091 100644
--- a/tests/Type/FormChoiceWidgetTest.php
+++ b/tests/Type/FormChoiceWidgetTest.php
@@ -15,7 +15,6 @@
 
 use Sonata\Form\Test\AbstractWidgetTestCase;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @author Christian Gripp <mail@core23.de>
@@ -36,35 +35,19 @@ public function testLabelRendering(): void
         );
 
         $html = $this->renderWidget($choice->createView());
-        if (version_compare(Kernel::VERSION, '6.4.0', '>=')) {
-            static::assertStringContainsString(
-                $this->cleanHtmlWhitespace(
-                    <<<'HTML'
-                        <div id="choice">
-                            <input type="checkbox" id="choice_0" name="choice[]" value="0" >
-                            <label for="choice_0">[trans]some[/trans]</label>
-                            <input type="checkbox" id="choice_1" name="choice[]" value="1" >
-                            <label for="choice_1">[trans]choices[/trans]</label>
-                        </div>
-                        HTML
-                ),
-                $this->cleanHtmlWhitespace($html)
-            );
-        } else {
-            static::assertStringContainsString(
-                $this->cleanHtmlWhitespace(
-                    <<<'HTML'
-                        <div id="choice">
-                            <input type="checkbox" id="choice_0" name="choice[]" value="0" />
-                            <label for="choice_0">[trans]some[/trans]</label>
-                            <input type="checkbox" id="choice_1" name="choice[]" value="1" />
-                            <label for="choice_1">[trans]choices[/trans]</label>
-                        </div>
-                        HTML
-                ),
-                $this->cleanHtmlWhitespace($html)
-            );
-        }
+        static::assertStringContainsString(
+            $this->cleanHtmlWhitespace(
+                <<<'HTML'
+                    <div id="choice">
+                        <input type="checkbox" id="choice_0" name="choice[]" value="0" />
+                        <label for="choice_0">[trans]some[/trans]</label>
+                        <input type="checkbox" id="choice_1" name="choice[]" value="1" />
+                        <label for="choice_1">[trans]choices[/trans]</label>
+                    </div>
+                    HTML
+            ),
+            $this->cleanHtmlWhitespace($html)
+        );
     }
 
     public function testDefaultValueRendering(): void