Merge 5.x into 6.x

sonata-project · Nov 14, 2024 · b29878f · b29878f
2 parents 862d2d9 + e990b8d
commit b29878f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -55,6 +55,7 @@
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
         "phpstan/extension-installer": "^1.0",
+        "phpstan/phpdoc-parser": "^1.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",

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/Functional/Action/ResetActionTest.php b/tests/Functional/Action/ResetActionTest.php
@@ -37,7 +37,7 @@ public function testItSubmitsResetPasswordFormWithNonValidData(): void
         $confirmationToken = $user->getConfirmationToken();
         \assert(null !== $confirmationToken);
 
-        static::assertSame($user->getPassword(), 'random_password');
+        static::assertSame('random_password', $user->getPassword());
 
         $client->request('GET', \sprintf('/reset/%s', $confirmationToken));
 
@@ -60,7 +60,7 @@ public function testItResetsPassword(): void
         $confirmationToken = $user->getConfirmationToken();
         \assert(null !== $confirmationToken);
 
-        static::assertSame($user->getPassword(), 'random_password');
+        static::assertSame('random_password', $user->getPassword());
 
         $client->request('GET', \sprintf('/reset/%s', $confirmationToken));
 
@@ -76,7 +76,7 @@ public function testItResetsPassword(): void
 
         static::assertNull($user->getPasswordRequestedAt());
         static::assertNull($user->getConfirmationToken());
-        static::assertSame($user->getPassword(), 'new_password');
+        static::assertSame('new_password', $user->getPassword());
     }
 
     private function prepareData(): UserInterface

diff --git a/tests/Functional/Command/ChangePasswordCommandTest.php b/tests/Functional/Command/ChangePasswordCommandTest.php
@@ -47,7 +47,7 @@ public function testChangesUserPassword(): void
     {
         $user = $this->prepareData('sonata-user-test', 'old_password');
 
-        static::assertSame($user->getPassword(), 'old_password');
+        static::assertSame('old_password', $user->getPassword());
 
         $this->commandTester->execute([
             'username' => 'sonata-user-test',
@@ -56,7 +56,7 @@ public function testChangesUserPassword(): void
 
         $user = $this->refreshUser($user);
 
-        static::assertSame($user->getPassword(), 'new_password');
+        static::assertSame('new_password', $user->getPassword());
         static::assertStringContainsString('Changed password for user "sonata-user-test".', $this->commandTester->getDisplay());
     }