Fix tests fixture updater (#4892)

rectorphp · Sep 1, 2023 · c5897e5 · c5897e5
1 parent 7078b51
commit c5897e5
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/packages/Testing/Fixture/FixtureFileUpdater.php b/packages/Testing/Fixture/FixtureFileUpdater.php
@@ -12,24 +12,23 @@ final class FixtureFileUpdater
      * @api
      */
     public static function updateFixtureContent(
-        string $originalFilePath,
+        string $originalContent,
         string $changedContent,
         string $fixtureFilePath
     ): void {
         if (! getenv('UPDATE_TESTS') && ! getenv('UT')) {
             return;
         }
 
-        $newOriginalContent = self::resolveNewFixtureContent($originalFilePath, $changedContent);
+        $newOriginalContent = self::resolveNewFixtureContent($originalContent, $changedContent);
+
         FileSystem::write($fixtureFilePath, $newOriginalContent);
     }
 
     private static function resolveNewFixtureContent(
-        string $originalFilePath,
+        string $originalContent,
         string $changedContent
     ): string {
-        $originalContent = FileSystem::read($originalFilePath);
-
         if ($originalContent === $changedContent) {
             return $originalContent;
         }

diff --git a/packages/Testing/PHPUnit/AbstractRectorTestCase.php b/packages/Testing/PHPUnit/AbstractRectorTestCase.php
@@ -225,6 +225,7 @@ private function doTestFileMatchesExpectedContent(
     ): void {
         SimpleParameterProvider::setParameter(Option::SOURCE, [$originalFilePath]);
 
+        $originalContents = FileSystem::read($originalFilePath);
         $changedContent = $this->processFilePath($originalFilePath);
 
         $fixtureFilename = basename($fixtureFilePath);
@@ -233,7 +234,7 @@ private function doTestFileMatchesExpectedContent(
         try {
             $this->assertSame($expectedFileContents, $changedContent, $failureMessage);
         } catch (ExpectationFailedException) {
-            FixtureFileUpdater::updateFixtureContent($originalFilePath, $changedContent, $fixtureFilePath);
+            FixtureFileUpdater::updateFixtureContent($originalContents, $changedContent, $fixtureFilePath);
 
             // if not exact match, check the regex version (useful for generated hashes/uuids in the code)
             $this->assertStringMatchesFormat($expectedFileContents, $changedContent, $failureMessage);
@@ -254,6 +255,7 @@ private function processFilePath(string $filePath): string
         $configuration = $configurationFactory->createForTests([$filePath]);
 
         $this->applicationFileProcessor->processFiles([$filePath], $configuration);
+
         return FileSystem::read($filePath);
     }
 

diff --git a/...e/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/try_return_finally_comment.php.inc b/...e/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/try_return_finally_comment.php.inc
@@ -34,4 +34,4 @@ class TryFinallyOnlyCommentStmt
     }
 }
 
-?>
+?>
diff --git a/...tests/Php80/Rector/Class_/AnnotationToAttributeRector/FixtureMultipleCall/fixture.php.inc b/...tests/Php80/Rector/Class_/AnnotationToAttributeRector/FixtureMultipleCall/fixture.php.inc
@@ -32,4 +32,4 @@ class User
     public $phonenumbers;
 }
 
-?>
+?>
diff --git a/...ector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/closure_type.php.inc b/...ector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/closure_type.php.inc
@@ -25,4 +25,4 @@ final class ClosureType
     }
 }
 
-?>
+?>
diff --git a/...omotionRector/FixtureInlinePublicDisable/typed_non_final_class_protected_property.php.inc b/...omotionRector/FixtureInlinePublicDisable/typed_non_final_class_protected_property.php.inc
@@ -25,4 +25,4 @@ class TypedNonFinalClassProtectedProperty
     }
 }
 
-?>
+?>
diff --git a/...AddMethodCallBasedStrictParamTypeRector/FixtureIntersection/intersection_in_union.php.inc b/...AddMethodCallBasedStrictParamTypeRector/FixtureIntersection/intersection_in_union.php.inc
@@ -62,4 +62,4 @@ abstract class IntersectionInUnion
     }
 }
 
-?>
+?>
diff --git a/...ation/Rector/Property/TypedPropertyFromAssignsRector/Fixture/nullable_mock_object.php.inc b/...ation/Rector/Property/TypedPropertyFromAssignsRector/Fixture/nullable_mock_object.php.inc
@@ -46,4 +46,4 @@ class NullableMockObject extends TestCase
     }
 }
 
-?>
+?>
diff --git a/...sts/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/Fixture/fixture.php.inc b/...sts/Visibility/Rector/ClassMethod/ExplicitPublicClassMethodRector/Fixture/fixture.php.inc
@@ -60,4 +60,4 @@ function notInScope()
 {
 }
 
-?>
+?>