mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-22 16:32:27 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit b852d706e3c13bc862a91acac245b313db357450

Browse Source 
b852d706e3 Remove AffectedFilesCount as unused (#4094)
This commit is contained in:
Tomas Votruba 2023-06-06 13:19:57 +00:00
parent 189167959e
commit 1dba11eab4
9 changed files with 16 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/ChangesReporting/Collector/AffectedFilesCollector.php
View File

@ -1,31 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\ChangesReporting\Collector;
use Rector\Core\ValueObject\Application\File;
final class AffectedFilesCollector
{
/**
* @var array<string, File>
*/
private $affectedFiles = [];
/**
* @api
*/
public function addFile(File $file) : void
{
$this->affectedFiles[$file->getFilePath()] = $file;
}
public function getNext() : ?File
{
if ($this->affectedFiles !== []) {
return \current($this->affectedFiles);
}
return null;
}
public function removeFromList(File $file) : void
{
unset($this->affectedFiles[$file->getFilePath()]);
}
}

16
src/Application/FileProcessor.php
View File

@ -3,20 +3,13 @@
declare (strict_types=1);
namespace Rector\Core\Application;
use Rector\ChangesReporting\Collector\AffectedFilesCollector;
use Rector\Core\PhpParser\NodeTraverser\FileWithoutNamespaceNodeTraverser;
use Rector\Core\PhpParser\NodeTraverser\RectorNodeTraverser;
use Rector\Core\PhpParser\Parser\RectorParser;
use Rector\Core\ValueObject\Application\File;
use Rector\Core\ValueObject\Configuration;
use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
final class FileProcessor
{
/**
* @readonly
* @var \Rector\ChangesReporting\Collector\AffectedFilesCollector
*/
private $affectedFilesCollector;
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator
@ -37,9 +30,8 @@ final class FileProcessor
* @var \Rector\Core\PhpParser\NodeTraverser\FileWithoutNamespaceNodeTraverser
*/
private $fileWithoutNamespaceNodeTraverser;
public function __construct(AffectedFilesCollector $affectedFilesCollector, NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, RectorParser $rectorParser, RectorNodeTraverser $rectorNodeTraverser, FileWithoutNamespaceNodeTraverser $fileWithoutNamespaceNodeTraverser)
public function __construct(NodeScopeAndMetadataDecorator $nodeScopeAndMetadataDecorator, RectorParser $rectorParser, RectorNodeTraverser $rectorNodeTraverser, FileWithoutNamespaceNodeTraverser $fileWithoutNamespaceNodeTraverser)
{
$this->affectedFilesCollector = $affectedFilesCollector;
$this->nodeScopeAndMetadataDecorator = $nodeScopeAndMetadataDecorator;
$this->rectorParser = $rectorParser;
$this->rectorNodeTraverser = $rectorNodeTraverser;
@ -54,14 +46,10 @@ final class FileProcessor
$newStmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($file, $oldStmts);
$file->hydrateStmtsAndTokens($newStmts, $oldStmts, $oldTokens);
}
public function refactor(File $file, Configuration $configuration) : void
public function refactor(File $file) : void
{
$newStmts = $this->fileWithoutNamespaceNodeTraverser->traverse($file->getNewStmts());
$newStmts = $this->rectorNodeTraverser->traverse($newStmts);
$file->changeNewStmts($newStmts);
$this->affectedFilesCollector->removeFromList($file);
while (($otherTouchedFile = $this->affectedFilesCollector->getNext()) instanceof File) {
$this->refactor($otherTouchedFile, $configuration);
}
}
}

2
src/Application/FileProcessor/PhpFileProcessor.php
View File

@ -119,7 +119,7 @@ final class PhpFileProcessor implements FileProcessorInterface
$rectorWithLineChanges = null;
do {
$file->changeHasChanged(\false);
$this->fileProcessor->refactor($file, $configuration);
$this->fileProcessor->refactor($file);
// 3. apply post rectors
$newStmts = $this->postFileProcessor->traverse($file->getNewStmts());
// this is needed for new tokens added in "afterTraverse()"

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '701278e9882f33c2977753be99b08dd7aaf93997';
public const PACKAGE_VERSION = 'b852d706e3c13bc862a91acac245b313db357450';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-06 13:01:55';
public const RELEASE_DATE = '2023-06-06 14:15:56';
/**
* @var int
*/

2
src/Kernel/RectorKernel.php
View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v62';
private const CACHE_KEY = 'v63';
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f::getLoader();
return ComposerAutoloaderInit5730c11f2cb3912e912af1fb76b9e818::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1205,7 +1205,6 @@ return array(
'Rector\\Caching\\ValueObject\\Storage\\MemoryCacheStorage' => $baseDir . '/packages/Caching/ValueObject/Storage/MemoryCacheStorage.php',
'Rector\\ChangesReporting\\Annotation\\AnnotationExtractor' => $baseDir . '/packages/ChangesReporting/Annotation/AnnotationExtractor.php',
'Rector\\ChangesReporting\\Annotation\\RectorsChangelogResolver' => $baseDir . '/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php',
'Rector\\ChangesReporting\\Collector\\AffectedFilesCollector' => $baseDir . '/packages/ChangesReporting/Collector/AffectedFilesCollector.php',
'Rector\\ChangesReporting\\Collector\\RectorChangeCollector' => $baseDir . '/packages/ChangesReporting/Collector/RectorChangeCollector.php',
'Rector\\ChangesReporting\\Contract\\Output\\OutputFormatterInterface' => $baseDir . '/packages/ChangesReporting/Contract/Output/OutputFormatterInterface.php',
'Rector\\ChangesReporting\\Output\\ConsoleOutputFormatter' => $baseDir . '/packages/ChangesReporting/Output/ConsoleOutputFormatter.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f
class ComposerAutoloaderInit5730c11f2cb3912e912af1fb76b9e818
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit5730c11f2cb3912e912af1fb76b9e818', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit5730c11f2cb3912e912af1fb76b9e818', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f
class ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1447,7 +1447,6 @@ class ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f
'Rector\\Caching\\ValueObject\\Storage\\MemoryCacheStorage' => __DIR__ . '/../..' . '/packages/Caching/ValueObject/Storage/MemoryCacheStorage.php',
'Rector\\ChangesReporting\\Annotation\\AnnotationExtractor' => __DIR__ . '/../..' . '/packages/ChangesReporting/Annotation/AnnotationExtractor.php',
'Rector\\ChangesReporting\\Annotation\\RectorsChangelogResolver' => __DIR__ . '/../..' . '/packages/ChangesReporting/Annotation/RectorsChangelogResolver.php',
'Rector\\ChangesReporting\\Collector\\AffectedFilesCollector' => __DIR__ . '/../..' . '/packages/ChangesReporting/Collector/AffectedFilesCollector.php',
'Rector\\ChangesReporting\\Collector\\RectorChangeCollector' => __DIR__ . '/../..' . '/packages/ChangesReporting/Collector/RectorChangeCollector.php',
'Rector\\ChangesReporting\\Contract\\Output\\OutputFormatterInterface' => __DIR__ . '/../..' . '/packages/ChangesReporting/Contract/Output/OutputFormatterInterface.php',
'Rector\\ChangesReporting\\Output\\ConsoleOutputFormatter' => __DIR__ . '/../..' . '/packages/ChangesReporting/Output/ConsoleOutputFormatter.php',
@ -3044,9 +3043,9 @@ class ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5730c11f2cb3912e912af1fb76b9e818::$classMap;
}, null, ClassLoader::class);
}