Skip to content

Commit 2518d99

Browse files
committed
Updated Rector to commit 84a48e5e10be865e5fe6f0bbdcab3a7fc300a886
rectorphp/rector-src@84a48e5 [tests] Use file paths over value objects in tests to improve performance (rectorphp#2878)
1 parent 6c20d25 commit 2518d99

File tree

12 files changed

+39
-33
lines changed

12 files changed

+39
-33
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ final class RenameSimpleRectorTest extends AbstractRectorTestCase
1313
/**
1414
* @dataProvider provideData()
1515
*/
16-
public function test(SmartFileInfo $fileInfo): void
16+
public function test(string $filePath): void
1717
{
18-
$this->doTestFileInfo($fileInfo);
18+
$this->doTestFile($filePath);
1919
}
2020

2121
/**
22-
* @return Iterator<SmartFileInfo>
22+
* @return Iterator<array<string>>
2323
*/
2424
public function provideData(): Iterator
2525
{
26-
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
26+
return $this->yieldFilePathsFromDirectory(__DIR__ . '/Fixture');
2727
}
2828

2929
public function provideConfigFilePath(): string

packages/Testing/PHPUnit/AbstractRectorTestCase.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,20 @@ protected function tearDown() : void
7979
\gc_collect_cycles();
8080
}
8181
/**
82-
* @deprecated
83-
* @return Iterator<SmartFileInfo>
82+
* @deprecated Use \Rector\Testing\PHPUnit\AbstractRectorTestCase::yieldFilePathsFromDirectory() instead
83+
* @return Iterator<<SmartFileInfo>>
8484
*/
8585
protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
8686
{
8787
return FixtureFileFinder::yieldDirectory($directory, $suffix);
8888
}
89+
/**
90+
* @return Iterator<<string>>
91+
*/
92+
protected function yieldFilePathsFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
93+
{
94+
return FixtureFileFinder::yieldFilePathsFromDirectory($directory, $suffix);
95+
}
8996
protected function isWindows() : bool
9097
{
9198
return \strncasecmp(\PHP_OS, 'WIN', 3) === 0;

src/Application/FileProcessor.php

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public function __construct(AffectedFilesCollector $affectedFilesCollector, Node
4848
public function parseFileInfoToLocalCache(File $file) : void
4949
{
5050
// store tokens by absolute path, so we don't have to print them right now
51-
// $smartFileInfo = $file->getSmartFileInfo();
5251
$stmtsAndTokens = $this->rectorParser->parseFileToStmtsAndTokens($file->getFilePath());
5352
$oldStmts = $stmtsAndTokens->getStmts();
5453
$oldTokens = $stmtsAndTokens->getTokens();

src/Application/FileSystem/RemovedAndAddedFilesCollector.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ public function getAddedFilesWithNodes() : array
7878
return $addedFile instanceof AddedFileWithNodes;
7979
});
8080
}
81-
// public function getAffectedFilesCount(): int
82-
// {
83-
// return count($this->addedFiles) + count($this->removedFilePaths);
84-
// }
81+
public function getAffectedFilesCount() : int
82+
{
83+
return \count($this->addedFiles) + \count($this->removedFilePaths);
84+
}
8585
public function getAddedFileCount() : int
8686
{
8787
return \count($this->addedFiles);

src/Application/VersionResolver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ final class VersionResolver
1717
* @api
1818
* @var string
1919
*/
20-
public const PACKAGE_VERSION = 'd3d18d442c8f2ca64f5ebef5c7a7541938fa1e2a';
20+
public const PACKAGE_VERSION = '84a48e5e10be865e5fe6f0bbdcab3a7fc300a886';
2121
/**
2222
* @api
2323
* @var string
2424
*/
25-
public const RELEASE_DATE = '2022-09-01 11:26:12';
25+
public const RELEASE_DATE = '2022-09-01 11:33:11';
2626
/**
2727
* @var int
2828
*/

vendor/autoload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

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

12-
return ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce::getLoader();
12+
return ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f::getLoader();

vendor/composer/autoload_real.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce
5+
class ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f
66
{
77
private static $loader;
88

@@ -22,19 +22,19 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInita4b58e9af83043ebf51c6db45c1515ce', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInitd475eda4ba9d2c1ac7b979b14447154f', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$includeFiles = \Composer\Autoload\ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$files;
35+
$includeFiles = \Composer\Autoload\ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$files;
3636
foreach ($includeFiles as $fileIdentifier => $file) {
37-
composerRequirea4b58e9af83043ebf51c6db45c1515ce($fileIdentifier, $file);
37+
composerRequired475eda4ba9d2c1ac7b979b14447154f($fileIdentifier, $file);
3838
}
3939

4040
return $loader;
@@ -46,7 +46,7 @@ public static function getLoader()
4646
* @param string $file
4747
* @return void
4848
*/
49-
function composerRequirea4b58e9af83043ebf51c6db45c1515ce($fileIdentifier, $file)
49+
function composerRequired475eda4ba9d2c1ac7b979b14447154f($fileIdentifier, $file)
5050
{
5151
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
5252
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce
7+
class ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f
88
{
99
public static $files = array (
1010
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -3139,9 +3139,9 @@ class ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce
31393139
public static function getInitializer(ClassLoader $loader)
31403140
{
31413141
return \Closure::bind(function () use ($loader) {
3142-
$loader->prefixLengthsPsr4 = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$prefixLengthsPsr4;
3143-
$loader->prefixDirsPsr4 = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$prefixDirsPsr4;
3144-
$loader->classMap = ComposerStaticInita4b58e9af83043ebf51c6db45c1515ce::$classMap;
3142+
$loader->prefixLengthsPsr4 = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$prefixLengthsPsr4;
3143+
$loader->prefixDirsPsr4 = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$prefixDirsPsr4;
3144+
$loader->classMap = ComposerStaticInitd475eda4ba9d2c1ac7b979b14447154f::$classMap;
31453145

31463146
}, null, ClassLoader::class);
31473147
}

vendor/composer/installed.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1853,12 +1853,12 @@
18531853
"source": {
18541854
"type": "git",
18551855
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
1856-
"reference": "18e2ce933cfa71950db6afb1fff2212d26839f7b"
1856+
"reference": "3ef708535ac9223b873e7002ced898bc8d2bf301"
18571857
},
18581858
"dist": {
18591859
"type": "zip",
1860-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/18e2ce933cfa71950db6afb1fff2212d26839f7b",
1861-
"reference": "18e2ce933cfa71950db6afb1fff2212d26839f7b",
1860+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/3ef708535ac9223b873e7002ced898bc8d2bf301",
1861+
"reference": "3ef708535ac9223b873e7002ced898bc8d2bf301",
18621862
"shasum": ""
18631863
},
18641864
"require": {
@@ -1877,14 +1877,14 @@
18771877
"rector\/phpstan-rules": "^0.6",
18781878
"rector\/rector-debugging": "dev-main",
18791879
"rector\/rector-generator": "^0.6.10",
1880-
"rector\/rector-src": "dev-main#ef56c1d",
1880+
"rector\/rector-src": "dev-main",
18811881
"symplify\/easy-coding-standard": "^11.0",
18821882
"symplify\/phpstan-extensions": "^11.1",
18831883
"symplify\/phpstan-rules": "^11.1",
18841884
"symplify\/rule-doc-generator": "^11.1",
18851885
"symplify\/vendor-patches": "^11.1"
18861886
},
1887-
"time": "2022-09-01T09:21:32+00:00",
1887+
"time": "2022-09-01T09:33:18+00:00",
18881888
"default-branch": true,
18891889
"type": "rector-extension",
18901890
"extra": {

0 commit comments

Comments
 (0)