strip empty starting/ending php tags

.github/workflows/e2e.yaml

@@ -24,6 +24,7 @@ jobs:
                 php_version: ['8.0']
                 directory:
                     - 'e2e/template-extends'
+                    - 'e2e/plain-views'
 
         name: End to end test - ${{ matrix.directory }}
 
@@ -43,6 +44,8 @@ jobs:
                 run: composer install --ansi
                 working-directory: ${{ matrix.directory }}
 
+            # run e2e test
             -
-                run: ./../../bin/rector process src --dry-run --ansi -a vendor/autoload.php
+                run: php ../e2eTestRunner.php
                 working-directory: ${{ matrix.directory }}
+

e2e/e2eTestRunner.php

@@ -0,0 +1,36 @@
+#!/usr/bin/env php
+<?php
+
+// runs a rector e2e test.
+// checks whether we expect a certain output, or alternatively that rector just processed everything without errors
+
+$projectRoot = __DIR__ .'/../';
+$rectorBin = $projectRoot .'bin/rector';
+$autoloadFile = $projectRoot .'vendor/autoload.php';
+
+$e2eCommand = 'php '. $rectorBin .' process --dry-run --no-ansi --no-progress-bar -a '. $autoloadFile;
+exec($e2eCommand, $output, $exitCode);
+$output = trim(implode("\n", $output));
+
+$expectedDiff = 'expected-output.diff';
+if (!file_exists($expectedDiff)) {
+    echo $output;
+    exit($exitCode);
+}
+
+$matchedExpectedOutput = false;
+$expectedOutput = trim(file_get_contents($expectedDiff));
+if ($output === $expectedOutput) {
+    $matchedExpectedOutput = true;
+}
+
+if ($matchedExpectedOutput === false) {
+    echo "\nEXPECTED:\n";
+    var_dump($expectedOutput);
+    echo "\nACTUAL:\n";
+    var_dump($output);
+    exit(1);
+}
+
+echo "[OK] end-to-end test successfully completed.";
+exit(0);

e2e/plain-views/.editorconfig

@@ -0,0 +1,3 @@
+[src/view.php]
+insert_final_newline = false
+trim_trailing_whitespace = false

e2e/plain-views/.gitignore

@@ -0,0 +1 @@
+/vendor

e2e/plain-views/composer.json

@@ -0,0 +1,7 @@
+{
+    "require": {
+        "php": "^8.0"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

e2e/plain-views/expected-output.diff

@@ -0,0 +1,16 @@
+1 file with changes
+===================
+
+1) src/view.php:0
+
+    ---------- begin diff ----------
+@@ @@
+-
+-	<div>
++<div>
+ 	<?php echo 1 ?>
+-	</div>
++	</div>
+    ----------- end diff -----------
+
+ [OK] 1 file would have changed (dry-run) by Rector

e2e/plain-views/rector.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Core\Configuration\Option;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set(Option::PATHS, [
+        __DIR__.'/src/',
+    ]);
+};
+

e2e/plain-views/src/empty.php

@@ -0,0 +1 @@
+<?php

e2e/plain-views/src/view.php

@@ -0,0 +1,4 @@
+
+	<div>
+	<?php echo 1 ?>
+	</div>

e2e/template-extends/rector.php

@@ -3,7 +3,13 @@
 declare(strict_types=1);
 
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\Core\Configuration\Option;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set(Option::PATHS, [
+        __DIR__.'/src/',
+    ]);
 };
 

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -34,6 +34,18 @@
  */
 final class BetterStandardPrinter extends Standard
 {
+    /**
+     * @var string
+     * @see https://regex101.com/r/QA7mai/1
+     */
+    private const EMPTY_STARTING_TAG_REGEX = '/^<\\?php\\s+\\?>\\n?/';
+
+    /**
+     * @var string
+     * @see https://regex101.com/r/IVNkrt/1
+     */
+    private const EMPTY_ENDING_TAG_REGEX = '/<\\?php$/';
+
     /**
      * @var string
      * @see https://regex101.com/r/jUFizd/1
@@ -102,6 +114,12 @@ public function printFormatPreserving(array $stmts, array $origStmts, array $ori
 
         $content = parent::printFormatPreserving($newStmts, $origStmts, $origTokens);
 
+        // strip empty starting/ending php tags
+        if (array_key_exists(0, $stmts) && $stmts[0] instanceof FileWithoutNamespace) {
+            $content = Strings::replace($content, self::EMPTY_STARTING_TAG_REGEX, '');
+            $content = Strings::replace(\rtrim($content), self::EMPTY_ENDING_TAG_REGEX, '', ) ."\n";
+        }
+
         // add new line in case of added stmts
         if (count($stmts) !== count($origStmts) && ! StringUtils::isMatch($content, self::NEWLINE_END_REGEX)) {
             $content .= $this->nl;
@@ -427,7 +445,7 @@ protected function pCommaSeparated(array $nodes): string
     private function resolveNewStmts(array $stmts): array
     {
         if (count($stmts) === 1 && $stmts[0] instanceof FileWithoutNamespace) {
-            return $stmts[0]->stmts;
+            return $this->resolveNewStmts($stmts[0]->stmts);
         }
 
         return $stmts;