Skip to content

Commit 069959c

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 13f68e51a9b5ee0e9f066d71b5f10778cd335c17
rectorphp/rector-src@13f68e5 [remove] Remove deprecated FileWithoutNamespace and ScopeResolverNodeVisitorInterface (#7980)
1 parent 4bc6af0 commit 069959c

12 files changed

Lines changed: 8 additions & 87 deletions

File tree

‎src/Application/VersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = 'adb24d01a629b3754abcf967254fe55e7dfa5a3e';
22+
public const PACKAGE_VERSION = '13f68e51a9b5ee0e9f066d71b5f10778cd335c17';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2026-05-03 08:12:20';
27+
public const RELEASE_DATE = '2026-05-03 08:34:44';
2828
/**
2929
* @var int
3030
*/

‎src/Configuration/RectorConfigBuilder.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
use Rector\Doctrine\Set\DoctrineSetList;
2626
use Rector\Enum\Config\Defaults;
2727
use Rector\Exception\Configuration\InvalidConfigurationException;
28-
use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;
2928
use Rector\Php\PhpVersionResolver\ComposerJsonPhpVersionResolver;
3029
use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
3130
use Rector\Php80\ValueObject\AnnotationToAttribute;
@@ -854,10 +853,6 @@ public function withTreatClassesAsFinal(bool $isTreatClassesAsFinal = \true): se
854853
}
855854
public function registerService(string $className, ?string $alias = null, ?string $tag = null): self
856855
{
857-
// BC layer since 2.2.9
858-
if ($tag === ScopeResolverNodeVisitorInterface::class) {
859-
$tag = DecoratingNodeVisitorInterface::class;
860-
}
861856
$this->registerServices[] = new RegisteredService($className, $alias, $tag);
862857
return $this;
863858
}

‎src/Console/Command/ProcessCommand.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
190190
// 4. Deprecations reporter
191191
$this->deprecatedRulesReporter->reportDeprecatedRules();
192192
$this->deprecatedRulesReporter->reportDeprecatedSkippedRules();
193-
$this->deprecatedRulesReporter->reportDeprecatedNodeTypes();
194193
$this->deprecatedRulesReporter->reportDeprecatedRectorUnsupportedMethods();
195194
$this->missConfigurationReporter->reportSkippedNeverRegisteredRules();
196195
return $this->resolveReturnCode($processResult, $configuration);

‎src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/PhpParser/Node/CustomNode/FileWithoutNamespace.php‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/PhpParser/NodeTraverser/RectorNodeTraverser.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
use Rector\Configuration\ConfigurationRuleFilter;
1313
use Rector\Contract\Rector\RectorInterface;
1414
use Rector\Exception\ShouldNotHappenException;
15-
use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
16-
use Rector\PhpParser\Node\FileNode;
1715
use Rector\VersionBonding\ComposerPackageConstraintFilter;
1816
use Rector\VersionBonding\PhpVersionedFilter;
1917
use RectorPrefix202605\Webmozart\Assert\Assert;
@@ -124,11 +122,6 @@ public function getVisitorsForNode(Node $node): array
124122
/** @var RectorInterface $visitor */
125123
foreach ($this->visitors as $visitor) {
126124
foreach ($visitor->getNodeTypes() as $nodeType) {
127-
// BC layer matching
128-
if ($nodeType === FileWithoutNamespace::class && $nodeClass === FileNode::class) {
129-
$this->visitorsPerNodeClass[$nodeClass][] = $visitor;
130-
continue;
131-
}
132125
if (is_a($nodeClass, $nodeType, \true)) {
133126
$this->visitorsPerNodeClass[$nodeClass][] = $visitor;
134127
continue 2;

‎src/Reporting/DeprecatedRulesReporter.php‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Rector\Configuration\Option;
88
use Rector\Configuration\Parameter\SimpleParameterProvider;
99
use Rector\Contract\Rector\RectorInterface;
10-
use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
1110
use Rector\PhpParser\Node\FileNode;
1211
use ReflectionMethod;
1312
use RectorPrefix202605\Symfony\Component\Console\Style\SymfonyStyle;
@@ -68,24 +67,4 @@ public function reportDeprecatedRectorUnsupportedMethods(): void
6867
}
6968
}
7069
}
71-
public function reportDeprecatedNodeTypes(): void
72-
{
73-
// helper property to avoid reporting multiple times
74-
static $reportedClasses = [];
75-
foreach ($this->rectors as $rector) {
76-
if (in_array(FileWithoutNamespace::class, $rector->getNodeTypes(), \true)) {
77-
$this->reportDeprecatedFileWithoutNamespace($rector);
78-
continue;
79-
}
80-
// already reported, skip
81-
if (in_array(get_class($rector), $reportedClasses, \true)) {
82-
continue;
83-
}
84-
$reportedClasses[] = get_class($rector);
85-
}
86-
}
87-
private function reportDeprecatedFileWithoutNamespace(RectorInterface $rector): void
88-
{
89-
$this->symfonyStyle->warning(sprintf('Node type "%s" is deprecated and will be removed. Use "%s" in the "%s" rule instead instead.%sSee %s for upgrade path', FileWithoutNamespace::class, FileNode::class, get_class($rector), \PHP_EOL . \PHP_EOL, 'https://github.com/rectorphp/rector-src/blob/main/UPGRADING.md'));
90-
}
9170
}

‎vendor/composer/autoload_classmap.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,6 @@
18751875
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => $baseDir . '/src/NodeTypeResolver/Node/AttributeKey.php',
18761876
'Rector\\NodeTypeResolver\\PHPStan\\ObjectWithoutClassTypeWithParentTypes' => $baseDir . '/src/NodeTypeResolver/PHPStan/ObjectWithoutClassTypeWithParentTypes.php',
18771877
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => $baseDir . '/src/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
1878-
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\Contract\\NodeVisitor\\ScopeResolverNodeVisitorInterface' => $baseDir . '/src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php',
18791878
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => $baseDir . '/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',
18801879
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\RectorNodeScopeResolver' => $baseDir . '/src/NodeTypeResolver/PHPStan/Scope/RectorNodeScopeResolver.php',
18811880
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\ScopeFactory' => $baseDir . '/src/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php',
@@ -2365,7 +2364,6 @@
23652364
'Rector\\PhpParser\\NodeVisitor\\SymfonyClosureNodeVisitor' => $baseDir . '/src/PhpParser/NodeVisitor/SymfonyClosureNodeVisitor.php',
23662365
'Rector\\PhpParser\\Node\\AssignAndBinaryMap' => $baseDir . '/src/PhpParser/Node/AssignAndBinaryMap.php',
23672366
'Rector\\PhpParser\\Node\\BetterNodeFinder' => $baseDir . '/src/PhpParser/Node/BetterNodeFinder.php',
2368-
'Rector\\PhpParser\\Node\\CustomNode\\FileWithoutNamespace' => $baseDir . '/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php',
23692367
'Rector\\PhpParser\\Node\\FileNode' => $baseDir . '/src/PhpParser/Node/FileNode.php',
23702368
'Rector\\PhpParser\\Node\\NodeFactory' => $baseDir . '/src/PhpParser/Node/NodeFactory.php',
23712369
'Rector\\PhpParser\\Node\\Value\\ValueResolver' => $baseDir . '/src/PhpParser/Node/Value/ValueResolver.php',

‎vendor/composer/autoload_static.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,7 +2135,6 @@ class ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c
21352135
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => __DIR__ . '/../..' . '/src/NodeTypeResolver/Node/AttributeKey.php',
21362136
'Rector\\NodeTypeResolver\\PHPStan\\ObjectWithoutClassTypeWithParentTypes' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/ObjectWithoutClassTypeWithParentTypes.php',
21372137
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
2138-
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\Contract\\NodeVisitor\\ScopeResolverNodeVisitorInterface' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php',
21392138
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',
21402139
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\RectorNodeScopeResolver' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/Scope/RectorNodeScopeResolver.php',
21412140
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\ScopeFactory' => __DIR__ . '/../..' . '/src/NodeTypeResolver/PHPStan/Scope/ScopeFactory.php',
@@ -2625,7 +2624,6 @@ class ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c
26252624
'Rector\\PhpParser\\NodeVisitor\\SymfonyClosureNodeVisitor' => __DIR__ . '/../..' . '/src/PhpParser/NodeVisitor/SymfonyClosureNodeVisitor.php',
26262625
'Rector\\PhpParser\\Node\\AssignAndBinaryMap' => __DIR__ . '/../..' . '/src/PhpParser/Node/AssignAndBinaryMap.php',
26272626
'Rector\\PhpParser\\Node\\BetterNodeFinder' => __DIR__ . '/../..' . '/src/PhpParser/Node/BetterNodeFinder.php',
2628-
'Rector\\PhpParser\\Node\\CustomNode\\FileWithoutNamespace' => __DIR__ . '/../..' . '/src/PhpParser/Node/CustomNode/FileWithoutNamespace.php',
26292627
'Rector\\PhpParser\\Node\\FileNode' => __DIR__ . '/../..' . '/src/PhpParser/Node/FileNode.php',
26302628
'Rector\\PhpParser\\Node\\NodeFactory' => __DIR__ . '/../..' . '/src/PhpParser/Node/NodeFactory.php',
26312629
'Rector\\PhpParser\\Node\\Value\\ValueResolver' => __DIR__ . '/../..' . '/src/PhpParser/Node/Value/ValueResolver.php',

‎vendor/composer/installed.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,12 +1742,12 @@
17421742
"source": {
17431743
"type": "git",
17441744
"url": "https:\/\/github.com\/rectorphp\/rector-downgrade-php.git",
1745-
"reference": "adbdd710186891c36cf7976baca3466dd1ae49fa"
1745+
"reference": "e49e4c82164e4c43582c420d9710567643b9deb4"
17461746
},
17471747
"dist": {
17481748
"type": "zip",
1749-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/adbdd710186891c36cf7976baca3466dd1ae49fa",
1750-
"reference": "adbdd710186891c36cf7976baca3466dd1ae49fa",
1749+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/e49e4c82164e4c43582c420d9710567643b9deb4",
1750+
"reference": "e49e4c82164e4c43582c420d9710567643b9deb4",
17511751
"shasum": ""
17521752
},
17531753
"require": {
@@ -1771,7 +1771,7 @@
17711771
"tomasvotruba\/unused-public": "^2.2",
17721772
"tracy\/tracy": "^2.11"
17731773
},
1774-
"time": "2026-05-01T09:08:49+00:00",
1774+
"time": "2026-05-03T06:26:54+00:00",
17751775
"default-branch": true,
17761776
"type": "rector-extension",
17771777
"extra": {

0 commit comments

Comments
 (0)