Skip to content

Commit 36e3754

Browse files
committed
Updated Rector to commit 25db9f043626160037f9ec484e74d618dad78f8f
rectorphp/rector-src@25db9f0 [remove] Remove deprecated StmtsAwareInterface (#7978)
1 parent 22ff749 commit 36e3754

27 files changed

Lines changed: 30 additions & 151 deletions

preload.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ function isPHPStanTestPreloaded(): bool
2626
}
2727

2828
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node.php';
29-
require_once __DIR__ . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php';
3029
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php';
3130
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php';
3231
require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor.php';

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 = '62e8d0627f61ba9e7e36e1e94344cd71abd349fa';
22+
public const PACKAGE_VERSION = '25db9f043626160037f9ec484e74d618dad78f8f';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2026-05-02 21:03:20';
27+
public const RELEASE_DATE = '2026-05-02 23:58:31';
2828
/**
2929
* @var int
3030
*/

src/Contract/PhpParser/Node/StmtsAwareInterface.php

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

src/PhpParser/Node/CustomNode/FileWithoutNamespace.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
namespace Rector\PhpParser\Node\CustomNode;
55

66
use Override;
7-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
87
use Rector\PhpParser\Node\FileNode;
98
/**
109
* @deprecated Use @see \Rector\PhpParser\Node\FileNode instead
1110
* @api
1211
*
1312
* Inspired by https://github.com/phpstan/phpstan-src/commit/ed81c3ad0b9877e6122c79b4afda9d10f3994092
1413
*/
15-
final class FileWithoutNamespace extends FileNode implements StmtsAwareInterface
14+
final class FileWithoutNamespace extends FileNode
1615
{
1716
#[Override]
1817
public function getType(): string

src/Reporting/DeprecatedRulesReporter.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
77
use Rector\Configuration\Option;
88
use Rector\Configuration\Parameter\SimpleParameterProvider;
9-
use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
109
use Rector\Contract\Rector\RectorInterface;
11-
use Rector\PhpParser\Enum\NodeGroup;
1210
use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
1311
use Rector\PhpParser\Node\FileNode;
1412
use ReflectionMethod;
@@ -79,15 +77,11 @@ public function reportDeprecatedNodeTypes(): void
7977
$this->reportDeprecatedFileWithoutNamespace($rector);
8078
continue;
8179
}
82-
if (!in_array(StmtsAwareInterface::class, $rector->getNodeTypes())) {
83-
continue;
84-
}
8580
// already reported, skip
8681
if (in_array(get_class($rector), $reportedClasses, \true)) {
8782
continue;
8883
}
8984
$reportedClasses[] = get_class($rector);
90-
$this->symfonyStyle->warning(sprintf('Rector rule "%s" uses StmtsAwareInterface that is now deprecated.%sUse "%s::%s" instead.%sSee %s for more', get_class($rector), \PHP_EOL, NodeGroup::class, 'STMTS_AWARE', \PHP_EOL . \PHP_EOL, 'https://github.com/rectorphp/rector-src/pull/7679'));
9185
}
9286
}
9387
private function reportDeprecatedFileWithoutNamespace(RectorInterface $rector): void

vendor/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

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

22-
return ComposerAutoloaderInit25e4f3f35f336bb6b0e300b37167c850::getLoader();
22+
return ComposerAutoloaderInit2692dc3e95802212d68a3d3c48ff7f9c::getLoader();

vendor/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,6 @@
13751375
'Rector\\Contract\\DependencyInjection\\RelatedConfigInterface' => $baseDir . '/src/Contract/DependencyInjection/RelatedConfigInterface.php',
13761376
'Rector\\Contract\\DependencyInjection\\ResettableInterface' => $baseDir . '/src/Contract/DependencyInjection/ResettableInterface.php',
13771377
'Rector\\Contract\\PhpParser\\DecoratingNodeVisitorInterface' => $baseDir . '/src/Contract/PhpParser/DecoratingNodeVisitorInterface.php',
1378-
'Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => $baseDir . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php',
13791378
'Rector\\Contract\\Rector\\ConfigurableRectorInterface' => $baseDir . '/src/Contract/Rector/ConfigurableRectorInterface.php',
13801379
'Rector\\Contract\\Rector\\HTMLAverseRectorInterface' => $baseDir . '/src/Contract/Rector/HTMLAverseRectorInterface.php',
13811380
'Rector\\Contract\\Rector\\RectorInterface' => $baseDir . '/src/Contract/Rector/RectorInterface.php',

vendor/composer/autoload_real.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit25e4f3f35f336bb6b0e300b37167c850
5+
class ComposerAutoloaderInit2692dc3e95802212d68a3d3c48ff7f9c
66
{
77
private static $loader;
88

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

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

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

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

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850
7+
class ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c
88
{
99
public static $files = array (
1010
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
@@ -1635,7 +1635,6 @@ class ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850
16351635
'Rector\\Contract\\DependencyInjection\\RelatedConfigInterface' => __DIR__ . '/../..' . '/src/Contract/DependencyInjection/RelatedConfigInterface.php',
16361636
'Rector\\Contract\\DependencyInjection\\ResettableInterface' => __DIR__ . '/../..' . '/src/Contract/DependencyInjection/ResettableInterface.php',
16371637
'Rector\\Contract\\PhpParser\\DecoratingNodeVisitorInterface' => __DIR__ . '/../..' . '/src/Contract/PhpParser/DecoratingNodeVisitorInterface.php',
1638-
'Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => __DIR__ . '/../..' . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php',
16391638
'Rector\\Contract\\Rector\\ConfigurableRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ConfigurableRectorInterface.php',
16401639
'Rector\\Contract\\Rector\\HTMLAverseRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/HTMLAverseRectorInterface.php',
16411640
'Rector\\Contract\\Rector\\RectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/RectorInterface.php',
@@ -3277,9 +3276,9 @@ class ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850
32773276
public static function getInitializer(ClassLoader $loader)
32783277
{
32793278
return \Closure::bind(function () use ($loader) {
3280-
$loader->prefixLengthsPsr4 = ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850::$prefixLengthsPsr4;
3281-
$loader->prefixDirsPsr4 = ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850::$prefixDirsPsr4;
3282-
$loader->classMap = ComposerStaticInit25e4f3f35f336bb6b0e300b37167c850::$classMap;
3279+
$loader->prefixLengthsPsr4 = ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c::$prefixLengthsPsr4;
3280+
$loader->prefixDirsPsr4 = ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c::$prefixDirsPsr4;
3281+
$loader->classMap = ComposerStaticInit2692dc3e95802212d68a3d3c48ff7f9c::$classMap;
32833282

32843283
}, null, ClassLoader::class);
32853284
}

vendor/composer/installed.json

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -750,24 +750,7 @@
750750
"extra": {
751751
"branch-alias": {
752752
"dev-master": "5.x-dev"
753-
},
754-
"patches_applied": [
755-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-expr-closure-php.patch",
756-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-finally-php.patch",
757-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-function-php.patch",
758-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-do-php.patch",
759-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-catch-php.patch",
760-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-trycatch-php.patch",
761-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-for-php.patch",
762-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-classmethod-php.patch",
763-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-else-php.patch",
764-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-while-php.patch",
765-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-foreach-php.patch",
766-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-if-php.patch",
767-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-case-php.patch",
768-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-elseif-php.patch",
769-
"https:\/\/raw.githubusercontent.com\/rectorphp\/vendor-patches\/main\/patches\/nikic-php-parser-lib-phpparser-node-stmt-namespace-php.patch"
770-
]
753+
}
771754
},
772755
"installation-source": "dist",
773756
"autoload": {

0 commit comments

Comments
 (0)