Updated Rector to commit 84a48e5e10be865e5fe6f0bbdcab3a7fc300a886

rectorphp/rector-src@84a48e5 [tests] Use file paths over value objects in tests to improve performance (rectorphp#2878)
kkmuffme · Sep 1, 2022 · 2518d99 · 2518d99
1 parent 6c20d25
commit 2518d99
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 33 deletions.
diff --git a/...refixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php b/...refixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php
@@ -13,17 +13,17 @@ final class RenameSimpleRectorTest extends AbstractRectorTestCase
     /**
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $fileInfo): void
+    public function test(string $filePath): void
     {
-        $this->doTestFileInfo($fileInfo);
+        $this->doTestFile($filePath);
     }
 
     /**
-     * @return Iterator<SmartFileInfo>
+     * @return Iterator<array<string>>
      */
     public function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+        return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/packages/Testing/PHPUnit/AbstractRectorTestCase.php b/packages/Testing/PHPUnit/AbstractRectorTestCase.php
@@ -79,13 +79,20 @@ protected function tearDown() : void
         \gc_collect_cycles();
     }
     /**
-     * @deprecated
-     * @return Iterator<SmartFileInfo>
+     * @deprecated Use \Rector\Testing\PHPUnit\AbstractRectorTestCase::yieldFilePathsFromDirectory() instead
+     * @return Iterator<<SmartFileInfo>>
      */
     protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
     {
         return FixtureFileFinder::yieldDirectory($directory, $suffix);
     }
+    /**
+     * @return Iterator<<string>>
+     */
+    protected function yieldFilePathsFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
+    {
+        return FixtureFileFinder::yieldFilePathsFromDirectory($directory, $suffix);
+    }
     protected function isWindows() : bool
     {
         return \strncasecmp(\PHP_OS, 'WIN', 3) === 0;

diff --git a/src/Application/FileProcessor.php b/src/Application/FileProcessor.php
@@ -48,7 +48,6 @@ public function __construct(AffectedFilesCollector $affectedFilesCollector, Node
     public function parseFileInfoToLocalCache(File $file) : void
     {
         // store tokens by absolute path, so we don't have to print them right now
-        //        $smartFileInfo = $file->getSmartFileInfo();
         $stmtsAndTokens = $this->rectorParser->parseFileToStmtsAndTokens($file->getFilePath());
         $oldStmts = $stmtsAndTokens->getStmts();
         $oldTokens = $stmtsAndTokens->getTokens();

diff --git a/src/Application/FileSystem/RemovedAndAddedFilesCollector.php b/src/Application/FileSystem/RemovedAndAddedFilesCollector.php
@@ -78,10 +78,10 @@ public function getAddedFilesWithNodes() : array
             return $addedFile instanceof AddedFileWithNodes;
         });
     }
-    //    public function getAffectedFilesCount(): int
-    //    {
-    //        return count($this->addedFiles) + count($this->removedFilePaths);
-    //    }
+    public function getAffectedFilesCount() : int
+    {
+        return \count($this->addedFiles) + \count($this->removedFilePaths);
+    }
     public function getAddedFileCount() : int
     {
         return \count($this->addedFiles);

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'd3d18d442c8f2ca64f5ebef5c7a7541938fa1e2a';
+    public const PACKAGE_VERSION = '84a48e5e10be865e5fe6f0bbdcab3a7fc300a886';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-09-01 11:26:12';
+    public const RELEASE_DATE = '2022-09-01 11:33:11';
     /**
      * @var int
      */

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -9,4 +9,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce::getLoader();
+return ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce
+class ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirea4b58e9af83043ebf51c6db45c1515ce($fileIdentifier, $file);
+            composerRequired475eda4ba9d2c1ac7b979b14447154f($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ public static function getLoader()
  * @param string $file
  * @return void
  */
-function composerRequirea4b58e9af83043ebf51c6db45c1515ce($fileIdentifier, $file)
+function composerRequired475eda4ba9d2c1ac7b979b14447154f($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce
+class ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -3139,9 +3139,9 @@ class ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1853,12 +1853,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
-                "reference": "18e2ce933cfa71950db6afb1fff2212d26839f7b"
+                "reference": "3ef708535ac9223b873e7002ced898bc8d2bf301"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/18e2ce933cfa71950db6afb1fff2212d26839f7b",
-                "reference": "18e2ce933cfa71950db6afb1fff2212d26839f7b",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/3ef708535ac9223b873e7002ced898bc8d2bf301",
+                "reference": "3ef708535ac9223b873e7002ced898bc8d2bf301",
                 "shasum": ""
             },
             "require": {
@@ -1877,14 +1877,14 @@
                 "rector\/phpstan-rules": "^0.6",
                 "rector\/rector-debugging": "dev-main",
                 "rector\/rector-generator": "^0.6.10",
-                "rector\/rector-src": "dev-main#ef56c1d",
+                "rector\/rector-src": "dev-main",
                 "symplify\/easy-coding-standard": "^11.0",
                 "symplify\/phpstan-extensions": "^11.1",
                 "symplify\/phpstan-rules": "^11.1",
                 "symplify\/rule-doc-generator": "^11.1",
                 "symplify\/vendor-patches": "^11.1"
             },
-            "time": "2022-09-01T09:21:32+00:00",
+            "time": "2022-09-01T09:33:18+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce::getLoader();
		return ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f::getLoader();