Merge 2.x into 3.x

sonata-project · Nov 14, 2024 · 91d6edc · 91d6edc
2 parents e1660d1 + 4cf7308
commit 91d6edc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/rector.php b/rector.php
@@ -19,6 +19,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -40,5 +41,6 @@
     $rectorConfig->skip([
         ExceptionHandlerTypehintRector::class,
         PreferPHPUnitThisCallRector::class,
+        NarrowUnusedSetUpDefinedPropertyRector::class,
     ]);
 };
diff --git a/tests/FlashMessage/FlashManagerTest.php b/tests/FlashMessage/FlashManagerTest.php
@@ -115,19 +115,19 @@ public function testHandlingRegisteredTypes(): void
         static::assertCount(2, $successMessages);
 
         foreach ($successMessages as $message) {
-            static::assertSame($message, 'hey, success dude!');
+            static::assertSame('hey, success dude!', $message);
         }
 
         static::assertCount(2, $warningMessages);
 
         foreach ($warningMessages as $message) {
-            static::assertSame($message, 'hey, warning dude!');
+            static::assertSame('hey, warning dude!', $message);
         }
 
         static::assertCount(2, $errorMessages);
 
         foreach ($errorMessages as $message) {
-            static::assertSame($message, 'hey, error dude!');
+            static::assertSame('hey, error dude!', $message);
         }
     }
 
@@ -149,7 +149,7 @@ public function testHandlingNonRegisteredTypes(): void
         static::assertCount(1, $nonRegisteredMessages);
 
         foreach ($nonRegisteredMessages as $message) {
-            static::assertSame($message, 'hey, success dude!');
+            static::assertSame('hey, success dude!', $message);
         }
     }
 
@@ -170,11 +170,11 @@ public function testFlashMessageWithCustomDomain(): void
         static::assertCount(1, $messagesWithoutDomain);
 
         foreach ($messages as $message) {
-            static::assertSame($message, 'my_bundle_success_message');
+            static::assertSame('my_bundle_success_message', $message);
         }
 
         foreach ($messagesWithoutDomain as $message) {
-            static::assertSame($message, 'my_bundle_success_message');
+            static::assertSame('my_bundle_success_message', $message);
         }
     }