Updated Rector to commit 55227be6c338823f47f3fe6d4b1e48a4d8291740

rectorphp/rector-src@55227be Removing SmartFileInfo (#2879)

bootstrap.php

@@ -24,6 +24,7 @@
         }
     }
 
+    // @deprecated, to be removed
     if ($class === 'Symplify\SmartFileSystem\SmartFileInfo') {
         $filePath = __DIR__ . '/vendor/symplify/smart-file-system/src/SmartFileInfo.php';
         if (file_exists($filePath)) {

e2e/rector-prefixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php

@@ -6,7 +6,6 @@
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class RenameSimpleRectorTest extends AbstractRectorTestCase
 {

packages/NodeNameResolver/Error/InvalidNameNodeReporter.php

@@ -46,19 +46,18 @@ public function reportInvalidNodeForName($node) : void
         $message = \sprintf('Pick more specific node than "%s", e.g. "$node->name"', \get_class($node));
         $file = $this->currentFileProvider->getFile();
         if ($file instanceof File) {
-            //            $smartFileInfo = $file->getFilePath(); // getSmartFileInfo();
             $message .= \PHP_EOL . \PHP_EOL;
-            $relatilveFilePath = $this->filePathHelper->relativePath($file->getFilePath());
-            $message .= \sprintf('Caused in "%s" file on line %d on code "%s"', $relatilveFilePath, $node->getStartLine(), $this->nodePrinter->print($node));
+            $relativeFilePath = $this->filePathHelper->relativePath($file->getFilePath());
+            $message .= \sprintf('Caused in "%s" file on line %d on code "%s"', $relativeFilePath, $node->getStartLine(), $this->nodePrinter->print($node));
         }
         $backtrace = \debug_backtrace();
         $rectorBacktrace = $this->matchRectorBacktraceCall($backtrace);
         if ($rectorBacktrace !== null) {
             // issues to find the file in prefixed
             if (\file_exists($rectorBacktrace[self::FILE])) {
                 $filePath = $rectorBacktrace[self::FILE];
-                $relatilveFilePath = $this->filePathHelper->relativePath($filePath);
-                $fileAndLine = $relatilveFilePath . ':' . $rectorBacktrace['line'];
+                $relativeFilePath = $this->filePathHelper->relativePath($filePath);
+                $fileAndLine = $relativeFilePath . ':' . $rectorBacktrace['line'];
             } else {
                 $fileAndLine = $rectorBacktrace[self::FILE] . ':' . $rectorBacktrace['line'];
             }

packages/PostRector/Application/PostFileProcessor.php

@@ -81,6 +81,6 @@ private function shouldSkipPostRector(PostRectorInterface $postRector) : bool
         if (!$file instanceof File) {
             return \false;
         }
-        return $this->skipper->shouldSkipElementAndFileInfo($postRector, $file->getFilePath());
+        return $this->skipper->shouldSkipElementAndFilePath($postRector, $file->getFilePath());
     }
 }

packages/PostRector/Collector/NodesToRemoveCollector.php

@@ -17,10 +17,10 @@
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Provider\CurrentFileProvider;
+use Rector\Core\ValueObject\Application\File;
 use Rector\NodeRemoval\BreakingRemovalGuard;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PostRector\Contract\Collector\NodeCollectorInterface;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class NodesToRemoveCollector implements NodeCollectorInterface
 {
     /**
@@ -76,8 +76,7 @@ public function addNodeToRemove(Node $node) : void
             $this->breakingRemovalGuard->ensureNodeCanBeRemove($node);
         }
         $file = $this->currentFileProvider->getFile();
-        // /** @var SmartFileInfo|null $fileInfo */
-        if ($file !== null) {
+        if ($file instanceof File) {
             $this->affectedFilesCollector->addFile($file);
         }
         /** @var Stmt $node */

packages/Skipper/Contract/SkipVoterInterface.php

@@ -3,7 +3,6 @@
 declare (strict_types=1);
 namespace Rector\Skipper\Contract;
 
-use Symplify\SmartFileSystem\SmartFileInfo;
 interface SkipVoterInterface
 {
     /**
@@ -12,7 +11,6 @@ interface SkipVoterInterface
     public function match($element) : bool;
     /**
      * @param string|object $element
-     * @param string|\Symplify\SmartFileSystem\SmartFileInfo $file
      */
-    public function shouldSkip($element, $file) : bool;
+    public function shouldSkip($element, string $filePath) : bool;
 }

packages/Skipper/Matcher/FileInfoMatcher.php

@@ -5,7 +5,6 @@
 
 use Rector\Skipper\FileSystem\FnMatchPathNormalizer;
 use Rector\Skipper\Fnmatcher;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class FileInfoMatcher
 {
     /**
@@ -25,24 +24,21 @@ public function __construct(FnMatchPathNormalizer $fnMatchPathNormalizer, Fnmatc
     }
     /**
      * @param string[] $filePatterns
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $file
      */
-    public function doesFileInfoMatchPatterns($file, array $filePatterns) : bool
+    public function doesFileInfoMatchPatterns(string $filePath, array $filePatterns) : bool
     {
         foreach ($filePatterns as $filePattern) {
-            if ($this->doesFileMatchPattern($file, $filePattern)) {
+            if ($this->doesFileMatchPattern($filePath, $filePattern)) {
                 return \true;
             }
         }
         return \false;
     }
     /**
      * Supports both relative and absolute $file path. They differ for PHP-CS-Fixer and PHP_CodeSniffer.
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $file
      */
-    private function doesFileMatchPattern($file, string $ignoredPath) : bool
+    private function doesFileMatchPattern(string $filePath, string $ignoredPath) : bool
     {
-        $filePath = $file instanceof SmartFileInfo ? $file->getRealPath() : $file;
         // in ecs.php, the path can be absolute
         if ($filePath === $ignoredPath) {
             return \true;

packages/Skipper/SkipVoter/ClassSkipVoter.php

@@ -7,7 +7,6 @@
 use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
 use Rector\Skipper\Skipper\SkipSkipper;
 use RectorPrefix202209\Symplify\PackageBuilder\Reflection\ClassLikeExistenceChecker;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class ClassSkipVoter implements SkipVoterInterface
 {
     /**
@@ -43,11 +42,10 @@ public function match($element) : bool
     }
     /**
      * @param string|object $element
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $file
      */
-    public function shouldSkip($element, $file) : bool
+    public function shouldSkip($element, string $filePath) : bool
     {
         $skippedClasses = $this->skippedClassResolver->resolve();
-        return $this->skipSkipper->doesMatchSkip($element, $file, $skippedClasses);
+        return $this->skipSkipper->doesMatchSkip($element, $filePath, $skippedClasses);
     }
 }

packages/Skipper/SkipVoter/PathSkipVoter.php

@@ -6,7 +6,6 @@
 use Rector\Skipper\Contract\SkipVoterInterface;
 use Rector\Skipper\Matcher\FileInfoMatcher;
 use Rector\Skipper\SkipCriteriaResolver\SkippedPathsResolver;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class PathSkipVoter implements SkipVoterInterface
 {
     /**
@@ -33,11 +32,10 @@ public function match($element) : bool
     }
     /**
      * @param string|object $element
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $file
      */
-    public function shouldSkip($element, $file) : bool
+    public function shouldSkip($element, string $filePath) : bool
     {
         $skippedPaths = $this->skippedPathsResolver->resolve();
-        return $this->fileInfoMatcher->doesFileInfoMatchPatterns($file, $skippedPaths);
+        return $this->fileInfoMatcher->doesFileInfoMatchPatterns($filePath, $skippedPaths);
     }
 }

packages/Skipper/Skipper/SkipSkipper.php

@@ -4,7 +4,6 @@
 namespace Rector\Skipper\Skipper;
 
 use Rector\Skipper\Matcher\FileInfoMatcher;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class SkipSkipper
 {
     /**
@@ -19,9 +18,8 @@ public function __construct(FileInfoMatcher $fileInfoMatcher)
     /**
      * @param array<string, string[]|null> $skippedClasses
      * @param object|string $checker
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $file
      */
-    public function doesMatchSkip($checker, $file, array $skippedClasses) : bool
+    public function doesMatchSkip($checker, string $filePath, array $skippedClasses) : bool
     {
         foreach ($skippedClasses as $skippedClass => $skippedFiles) {
             if (!\is_a($checker, $skippedClass, \true)) {
@@ -31,7 +29,7 @@ public function doesMatchSkip($checker, $file, array $skippedClasses) : bool
             if (!\is_array($skippedFiles)) {
                 return \true;
             }
-            if ($this->fileInfoMatcher->doesFileInfoMatchPatterns($file, $skippedFiles)) {
+            if ($this->fileInfoMatcher->doesFileInfoMatchPatterns($filePath, $skippedFiles)) {
                 return \true;
             }
         }

packages/Skipper/Skipper/Skipper.php

@@ -4,7 +4,6 @@
 namespace Rector\Skipper\Skipper;
 
 use Rector\Skipper\Contract\SkipVoterInterface;
-use Symplify\SmartFileSystem\SmartFileInfo;
 /**
  * @api
  * @see \Rector\Tests\Skipper\Skipper\Skipper\SkipperTest
@@ -32,28 +31,22 @@ public function __construct(array $skipVoters)
      */
     public function shouldSkipElement($element) : bool
     {
-        $fileInfo = new SmartFileInfo(__FILE__);
-        return $this->shouldSkipElementAndFileInfo($element, $fileInfo);
-    }
-    public function shouldSkipFileInfo(SmartFileInfo $smartFileInfo) : bool
-    {
-        return $this->shouldSkipElementAndFileInfo(self::FILE_ELEMENT, $smartFileInfo);
+        return $this->shouldSkipElementAndFilePath($element, __FILE__);
     }
     public function shouldSkipFilePath(string $filePath) : bool
     {
-        return $this->shouldSkipElementAndFileInfo(self::FILE_ELEMENT, $filePath);
+        return $this->shouldSkipElementAndFilePath(self::FILE_ELEMENT, $filePath);
     }
     /**
      * @param string|object $element
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $smartFileInfo
      */
-    public function shouldSkipElementAndFileInfo($element, $smartFileInfo) : bool
+    public function shouldSkipElementAndFilePath($element, string $filePath) : bool
     {
         foreach ($this->skipVoters as $skipVoter) {
             if (!$skipVoter->match($element)) {
                 continue;
             }
-            return $skipVoter->shouldSkip($element, $smartFileInfo);
+            return $skipVoter->shouldSkip($element, $filePath);
         }
         return \false;
     }

packages/Testing/Fixture/FixtureFileFinder.php

@@ -4,12 +4,9 @@
 namespace Rector\Testing\Fixture;
 
 use Iterator;
-use RectorPrefix202209\Nette\Utils\Strings;
-use Rector\Core\Exception\ShouldNotHappenException;
 use RectorPrefix202209\Symfony\Component\Finder\Finder;
 use RectorPrefix202209\Symfony\Component\Finder\SplFileInfo;
 use Symplify\SmartFileSystem\SmartFileInfo;
-use RectorPrefix202209\Symplify\SmartFileSystem\Exception\FileNotFoundException;
 final class FixtureFileFinder
 {
     /**
@@ -23,7 +20,7 @@ public static function yieldFilePathsFromDirectory(string $directory, string $su
         }
     }
     /**
-     * @return Iterator<array<int, SmartFileInfo>>
+     * @deprecated
      */
     public static function yieldDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
     {

packages/Testing/Fixture/FixtureFileUpdater.php

@@ -4,42 +4,19 @@
 namespace Rector\Testing\Fixture;
 
 use RectorPrefix202209\Nette\Utils\FileSystem;
-use Symplify\SmartFileSystem\SmartFileInfo;
-use RectorPrefix202209\Symplify\SmartFileSystem\SmartFileSystem;
 final class FixtureFileUpdater
 {
-    /**
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $originalFileInfo
-     */
-    public static function updateFixtureContent($originalFileInfo, string $changedContent, string $fixtureFilepath) : void
+    public static function updateFixtureContent(string $originalFilePath, string $changedContent, string $fixtureFilepath) : void
     {
         if (!\getenv('UPDATE_TESTS') && !\getenv('UT')) {
             return;
         }
-        $newOriginalContent = self::resolveNewFixtureContent($originalFileInfo, $changedContent);
+        $newOriginalContent = self::resolveNewFixtureContent($originalFilePath, $changedContent);
         FileSystem::write($fixtureFilepath, $newOriginalContent);
     }
-    public static function updateExpectedFixtureContent(string $newOriginalContent, SmartFileInfo $expectedFixtureFileInfo) : void
+    private static function resolveNewFixtureContent(string $originalFilePath, string $changedContent) : string
     {
-        if (!\getenv('UPDATE_TESTS') && !\getenv('UT')) {
-            return;
-        }
-        self::getSmartFileSystem()->dumpFile($expectedFixtureFileInfo->getRealPath(), $newOriginalContent);
-    }
-    private static function getSmartFileSystem() : SmartFileSystem
-    {
-        return new SmartFileSystem();
-    }
-    /**
-     * @param \Symplify\SmartFileSystem\SmartFileInfo|string $originalFileInfo
-     */
-    private static function resolveNewFixtureContent($originalFileInfo, string $changedContent) : string
-    {
-        if ($originalFileInfo instanceof SmartFileInfo) {
-            $originalContent = $originalFileInfo->getContents();
-        } else {
-            $originalContent = $originalFileInfo;
-        }
+        $originalContent = FileSystem::read($originalFilePath);
         if ($originalContent === $changedContent) {
             return $originalContent;
         }

packages/Testing/Fixture/FixtureTempFileDumper.php

@@ -4,7 +4,6 @@
 namespace Rector\Testing\Fixture;
 
 use RectorPrefix202209\Nette\Utils\FileSystem;
-use Symplify\SmartFileSystem\SmartFileInfo;
 final class FixtureTempFileDumper
 {
     /**

packages/Testing/PHPUnit/AbstractRectorTestCase.php

@@ -80,7 +80,6 @@ protected function tearDown() : void
     }
     /**
      * @deprecated Use \Rector\Testing\PHPUnit\AbstractRectorTestCase::yieldFilePathsFromDirectory() instead
-     * @return Iterator<<SmartFileInfo>>
      */
     protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
     {

rules/PSR4/FileInfoAnalyzer/FileInfoDeletionAnalyzer.php

@@ -34,7 +34,6 @@ public function isClassLikeAndFileInfoMatch(File $file, ClassLike $classLike) :
     {
         $className = (string) $this->nodeNameResolver->getName($classLike);
         $filePath = $file->getFilePath();
-        // getSmartFileInfo();
         $basename = \pathinfo($filePath, \PATHINFO_BASENAME);
         $baseFileName = $this->clearNameFromTestingPrefix($basename);
         $classShortName = $this->classNaming->getShortName($className);

rules/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector.php

@@ -58,8 +58,6 @@ public function refactor(Node $node) : ?Node
         }
         $classShortName = $this->nodeNameResolver->getShortName($className);
         $filePath = $this->file->getFilePath();
-        // getSmartFileInfo();
-        // matches
         $basename = \pathinfo($filePath, \PATHINFO_BASENAME);
         if ($classShortName === $basename) {
             return null;

src/Application/ApplicationFileProcessor.php

@@ -188,7 +188,6 @@ private function printFiles(array $files, Configuration $configuration) : void
     private function printFile(File $file) : void
     {
         $filePath = $file->getFilePath();
-        //        $smartFileInfo = $file->getFilePath() getSmartFileInfo();
         $this->filesystem->dumpFile($filePath, $file->getFileContent());
         // @todo how to keep original chmod rights?
         // $this->filesystem->chmod($filePath, $smartFileInfo->getPerms());
@@ -280,8 +279,6 @@ private function resolvePhpFilePaths(array $files) : array
         $phpFilePaths = [];
         foreach ($files as $file) {
             $filePath = $file->getFilePath();
-            //            $smartFileInfo = $file->getSmartFileInfo();
-            //            $pathname = $smartFileInfo->getPathname();
             if (\substr_compare($filePath, '.php', -\strlen('.php')) === 0) {
                 $phpFilePaths[] = $filePath;
             }

src/Application/FileProcessor/PhpFileProcessor.php

@@ -163,7 +163,6 @@ private function parseFileAndDecorateNodes(File $file) : array
     private function printFile(File $file, Configuration $configuration) : void
     {
         $filePath = $file->getFilePath();
-        // getSmartFileInfo();
         if ($this->removedAndAddedFilesCollector->isFileRemoved($filePath)) {
             // skip, because this file exists no more
             return;

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '6a7faa26fba9ab70d2af08c4d8f36aba398d0f8b';
+    public const PACKAGE_VERSION = '55227be6c338823f47f3fe6d4b1e48a4d8291740';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-09-01 11:38:30';
+    public const RELEASE_DATE = '2022-09-01 13:20:16';
     /**
      * @var int
      */

src/NonPhpFile/NonPhpFileProcessor.php

@@ -58,11 +58,9 @@ public function process(File $file, Configuration $configuration) : array
     }
     public function supports(File $file, Configuration $configuration) : bool
     {
-        //        $smartFileInfo = $file->getFilePath();
         // early assign to variable for increase performance
         // @see https://3v4l.org/FM3vY#focus=8.0.7 vs https://3v4l.org/JZW7b#focus=8.0.7
         $filePath = $file->getFilePath();
-        // $smartFileInfo->getPathname();
         // bug in path extension
         foreach ($this->getSupportedFileExtensions() as $fileExtension) {
             if (\substr_compare($filePath, '.' . $fileExtension, -\strlen('.' . $fileExtension)) === 0) {

src/PhpParser/AstResolver.php

@@ -313,7 +313,6 @@ private function parseFileNameToDecoratedNodes(string $fileName) : ?array
         if ($stmts === []) {
             return null;
         }
-        //$smartFileInfo = new SmartFileInfo($fileName);
         $file = new File($fileName, FileSystem::read($fileName));
         return $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($file, $stmts);
     }