Updated Rector to commit a77b00d92bb3e62063ba56c63f42502e6fe6f316

TomasVotruba · TomasVotruba · commit bcb11a7c3fe5 · 2024-06-28T15:14:22.000Z
rectorphp/rector-src@a77b00d Skip files with short <?= PHP tag as leads to invalid changes (#6068)
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '1865d51f2f5e5045ac3b5e52fc45d79d8f36636b';
+    public const PACKAGE_VERSION = 'a77b00d92bb3e62063ba56c63f42502e6fe6f316';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-06-28 16:03:51';
+    public const RELEASE_DATE = '2024-06-28 17:11:57';
     /**
      * @var int
      */
diff --git a/src/Caching/UnchangedFilesFilter.php b/src/Caching/UnchangedFilesFilter.php
@@ -19,7 +19,7 @@ public function __construct(ChangedFilesDetector $changedFilesDetector)
      * @param string[] $filePaths
      * @return string[]
      */
-    public function filterFileInfos(array $filePaths) : array
+    public function filterFilePaths(array $filePaths) : array
     {
         $changedFileInfos = [];
         foreach ($filePaths as $filePath) {
diff --git a/src/FileSystem/FilesFinder.php b/src/FileSystem/FilesFinder.php
@@ -31,6 +31,11 @@ final class FilesFinder
      * @var \Rector\Skipper\Skipper\PathSkipper
      */
     private $pathSkipper;
+    /**
+     * @var string
+     * @see https://regex101.com/r/3NwDLo/1
+     */
+    private const OPEN_SHORTTAG_REGEX = '#^\\<\\?=#';
     public function __construct(\Rector\FileSystem\FilesystemTweaker $filesystemTweaker, UnchangedFilesFilter $unchangedFilesFilter, \Rector\FileSystem\FileAndDirectoryFilter $fileAndDirectoryFilter, PathSkipper $pathSkipper)
     {
         $this->filesystemTweaker = $filesystemTweaker;
@@ -47,6 +52,15 @@ public function findInDirectoriesAndFiles(array $source, array $suffixes = [], b
     {
         $filesAndDirectories = $this->filesystemTweaker->resolveWithFnmatch($source);
         $files = $this->fileAndDirectoryFilter->filterFiles($filesAndDirectories);
+        // exclude short "<?=" tags as lead to invalid changes
+        $files = \array_filter($files, static function (string $file) : bool {
+            // @ on purpose to deal with broken symlinks
+            $fileContents = @\file_get_contents($file);
+            if (!\is_string($fileContents)) {
+                return \true;
+            }
+            return \strncmp($fileContents, '<?=', \strlen('<?=')) !== 0;
+        });
         $filteredFilePaths = \array_filter($files, function (string $filePath) : bool {
             return !$this->pathSkipper->shouldSkip($filePath);
         });
@@ -60,7 +74,7 @@ public function findInDirectoriesAndFiles(array $source, array $suffixes = [], b
         $directories = $this->fileAndDirectoryFilter->filterDirectories($filesAndDirectories);
         $filteredFilePathsInDirectories = $this->findInDirectories($directories, $suffixes, $sortByName);
         $filePaths = \array_merge($filteredFilePaths, $filteredFilePathsInDirectories);
-        return $this->unchangedFilesFilter->filterFileInfos($filePaths);
+        return $this->unchangedFilesFilter->filterFilePaths($filePaths);
     }
     /**
      * @param string[] $directories
@@ -72,7 +86,7 @@ private function findInDirectories(array $directories, array $suffixes, bool $so
         if ($directories === []) {
             return [];
         }
-        $finder = Finder::create()->files()->size('> 0')->in($directories);
+        $finder = Finder::create()->files()->size('> 0')->notContains(self::OPEN_SHORTTAG_REGEX)->in($directories);
         if ($sortByName) {
             $finder->sortByName();
         }
diff --git a/src/PostRector/Rector/NameImportingPostRector.php b/src/PostRector/Rector/NameImportingPostRector.php
@@ -119,12 +119,7 @@ private function shouldSkipFileWithoutNamespace(File $file) : bool
             return \false;
         }
         $currentStmt = \current($firstStmt->stmts);
-        if ($currentStmt instanceof InlineHTML || $currentStmt === \false) {
-            return \true;
-        }
-        $oldTokens = $file->getOldTokens();
-        $tokenStartPos = $currentStmt->getStartTokenPos();
-        return isset($oldTokens[$tokenStartPos][1]) && $oldTokens[$tokenStartPos][1] === '<?=';
+        return $currentStmt instanceof InlineHTML || $currentStmt === \false;
     }
     private function processNodeName(FullyQualified $fullyQualified, File $file) : ?Node
     {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct(ChangedFilesDetector $changedFilesDetector)`
`19`	`19`	`* @param string[] $filePaths`
`20`	`20`	`* @return string[]`
`21`	`21`	`*/`
`22`		`- public function filterFileInfos(array $filePaths) : array`
	`22`	`+ public function filterFilePaths(array $filePaths) : array`
`23`	`23`	`{`
`24`	`24`	`$changedFileInfos = [];`
`25`	`25`	`foreach ($filePaths as $filePath) {`
Original file line number	Diff line number	Diff line change
`@@ -119,12 +119,7 @@ private function shouldSkipFileWithoutNamespace(File $file) : bool`
`119`	`119`	`return \false;`
`120`	`120`	`}`
`121`	`121`	`$currentStmt = \current($firstStmt->stmts);`
`122`		`- if ($currentStmt instanceof InlineHTML \|\| $currentStmt === \false) {`
`123`		`- return \true;`
`124`		`- }`
`125`		`- $oldTokens = $file->getOldTokens();`
`126`		`- $tokenStartPos = $currentStmt->getStartTokenPos();`
`127`		`- return isset($oldTokens[$tokenStartPos][1]) && $oldTokens[$tokenStartPos][1] === '<?=';`
	`122`	`+ return $currentStmt instanceof InlineHTML \|\| $currentStmt === \false;`
`128`	`123`	`}`
`129`	`124`	`private function processNodeName(FullyQualified $fullyQualified, File $file) : ?Node`
`130`	`125`	`{`