Skip to content

Commit c2fef6b

Browse files
committed
Updated Rector to commit 1da22824edd107108e087d40233769817a2cbe25
rectorphp/rector-src@1da2282 [PostRector] Skip remove unused use on used as ConstFetchNode, eg: TypeKind::* (#3560)
1 parent a6db719 commit c2fef6b

File tree

6 files changed

+36
-12
lines changed

6 files changed

+36
-12
lines changed

packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
declare (strict_types=1);
44
namespace Rector\BetterPhpDocParser\PhpDocInfo;
55

6+
use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
67
use PHPStan\PhpDocParser\Ast\Node;
78
use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
89
use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
@@ -15,6 +16,7 @@
1516
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
1617
use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
1718
use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
19+
use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
1820
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
1921
use PHPStan\PhpDocParser\Lexer\Lexer;
2022
use PHPStan\Type\MixedType;
@@ -25,6 +27,7 @@
2527
use Rector\BetterPhpDocParser\PhpDocNodeFinder\PhpDocNodeByTypeFinder;
2628
use Rector\BetterPhpDocParser\PhpDocNodeVisitor\ChangedPhpDocNodeVisitor;
2729
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
30+
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
2831
use Rector\BetterPhpDocParser\ValueObject\Type\ShortenedIdentifierTypeNode;
2932
use Rector\ChangesReporting\Collector\RectorChangeCollector;
3033
use Rector\Core\Configuration\CurrentNodeProvider;
@@ -411,6 +414,25 @@ public function getAnnotationClassNames() : array
411414
}
412415
return $resolvedClasses;
413416
}
417+
/**
418+
* @return string[]
419+
*/
420+
public function getConstFetchNodeClassNames() : array
421+
{
422+
$phpDocNodeTraverser = new PhpDocNodeTraverser();
423+
$classNames = [];
424+
$phpDocNodeTraverser->traverseWithCallable($this->phpDocNode, '', static function (Node $node) use(&$classNames) : ?ConstTypeNode {
425+
if (!$node instanceof ConstTypeNode) {
426+
return null;
427+
}
428+
if (!$node->constExpr instanceof ConstFetchNode) {
429+
return null;
430+
}
431+
$classNames[] = $node->constExpr->getAttribute(PhpDocAttributeKey::RESOLVED_CLASS);
432+
return $node;
433+
});
434+
return $classNames;
435+
}
414436
private function resolveNameForPhpDocTagValueNode(PhpDocTagValueNode $phpDocTagValueNode) : ?string
415437
{
416438
foreach (self::TAGS_TYPES_TO_NAMES as $tagValueNodeType => $name) {

packages/PostRector/Rector/UnusedImportRemovingPostRector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ private function findNamesInDocBlocks($namespace) : array
141141
}
142142
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
143143
$names = \array_merge($names, $phpDocInfo->getAnnotationClassNames());
144+
$constFetchNodeNames = $phpDocInfo->getConstFetchNodeClassNames();
145+
$names = \array_merge($names, $constFetchNodeNames);
144146
});
145147
return $names;
146148
}

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 = '622e93f2aa7c4cdcfb8a32388d27ae43df95bb9a';
22+
public const PACKAGE_VERSION = '1da22824edd107108e087d40233769817a2cbe25';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-04-04 01:22:06';
27+
public const RELEASE_DATE = '2023-04-04 07:52:59';
2828
/**
2929
* @var int
3030
*/

vendor/autoload.php

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

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

25-
return ComposerAutoloaderInitbf34321edf24c05d9f6b115e015e4c7f::getLoader();
25+
return ComposerAutoloaderInit4fd1f544aa8f7722ab02524f353da142::getLoader();

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 ComposerAutoloaderInitbf34321edf24c05d9f6b115e015e4c7f
5+
class ComposerAutoloaderInit4fd1f544aa8f7722ab02524f353da142
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('ComposerAutoloaderInitbf34321edf24c05d9f6b115e015e4c7f', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit4fd1f544aa8f7722ab02524f353da142', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInitbf34321edf24c05d9f6b115e015e4c7f', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit4fd1f544aa8f7722ab02524f353da142', 'loadClassLoader'));
2828

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

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

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit4fd1f544aa8f7722ab02524f353da142::$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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f
7+
class ComposerStaticInit4fd1f544aa8f7722ab02524f353da142
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3131,9 +3131,9 @@ class ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f
31313131
public static function getInitializer(ClassLoader $loader)
31323132
{
31333133
return \Closure::bind(function () use ($loader) {
3134-
$loader->prefixLengthsPsr4 = ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f::$prefixLengthsPsr4;
3135-
$loader->prefixDirsPsr4 = ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f::$prefixDirsPsr4;
3136-
$loader->classMap = ComposerStaticInitbf34321edf24c05d9f6b115e015e4c7f::$classMap;
3134+
$loader->prefixLengthsPsr4 = ComposerStaticInit4fd1f544aa8f7722ab02524f353da142::$prefixLengthsPsr4;
3135+
$loader->prefixDirsPsr4 = ComposerStaticInit4fd1f544aa8f7722ab02524f353da142::$prefixDirsPsr4;
3136+
$loader->classMap = ComposerStaticInit4fd1f544aa8f7722ab02524f353da142::$classMap;
31373137

31383138
}, null, ClassLoader::class);
31393139
}

0 commit comments

Comments
 (0)