[Core][e2e] Handle space before content and space before open tag on …

…deep content on PhpFileProcessor (#3418) * [Core][e2e] Handle space and open tag on deep content on PhpFileProcessor * Fixed 🎉 * clean up * cs fix * clean up
rectorphp · Feb 26, 2023 · 8d9ff0a · 8d9ff0a
1 parent a8731b5
commit 8d9ff0a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/e2e/plain-views/src/short_open_tag_and_space_before.php b/e2e/plain-views/src/short_open_tag_and_space_before.php
@@ -0,0 +1,10 @@
+
+<?php
+function test_callback() {
+  // var_dump($output);
+  ?>
+  <div class="wrap">
+    <img src="<?= escape('hi there'); ?>">
+  </div>
+  <?php
+}
diff --git a/src/Application/FileProcessor/PhpFileProcessor.php b/src/Application/FileProcessor/PhpFileProcessor.php
@@ -163,16 +163,17 @@ private function printFile(File $file, Configuration $configuration): void
              * On very first content level
              */
             $originalFileContent = $file->getOriginalFileContent();
-            if (ltrim($originalFileContent) === $newContent) {
+            $ltrimOriginalFileContent = ltrim($originalFileContent);
+
+            if ($ltrimOriginalFileContent === $newContent) {
                 return;
             }
 
             /**
              * Handle space before <?php wiped on print format preserving
              * On inside content level
              */
-            $cleanedOriginalFileContent = Strings::replace($originalFileContent, self::OPEN_TAG_SPACED_REGEX, '<?php');
-            if ($cleanedOriginalFileContent === $newContent) {
+            if (Strings::replace($ltrimOriginalFileContent, self::OPEN_TAG_SPACED_REGEX, '<?php') === $newContent) {
                 return;
             }
         }