diff --git a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php index ee1a9e8cc36..76d2fe8ad0b 100644 --- a/packages/PostRector/Rector/UnusedImportRemovingPostRector.php +++ b/packages/PostRector/Rector/UnusedImportRemovingPostRector.php @@ -3,8 +3,10 @@ declare (strict_types=1); namespace Rector\PostRector\Rector; +use RectorPrefix202302\Nette\Utils\Strings; use PhpParser\Node; use PhpParser\Node\Name; +use PhpParser\Node\Name\FullyQualified; use PhpParser\Node\Stmt\Namespace_; use PhpParser\Node\Stmt\Use_; use PhpParser\NodeTraverser; @@ -111,6 +113,13 @@ CODE_SAMPLE return null; } $names[] = $node->toString(); + if ($node instanceof FullyQualified) { + $originalName = $node->getAttribute(AttributeKey::ORIGINAL_NAME); + if ($originalName instanceof Name) { + // collect original Name as well to cover namespaced used + $names[] = $originalName->toString(); + } + } return $node; }); return $names; @@ -147,11 +156,15 @@ CODE_SAMPLE if (\in_array($comparedName, $names, \true)) { return \true; } + $namespacedPrefix = Strings::after($comparedName, '\\', -1) . '\\'; // match partial import foreach ($names as $name) { if (\substr_compare($comparedName, $name, -\strlen($name)) === 0) { return \true; } + if (\strncmp($name, $namespacedPrefix, \strlen($namespacedPrefix)) === 0) { + return \true; + } } return \false; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index c25e36bb141..63dd1bf0be9 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'd762bcedae5f4b8472dd70532566755b83701e88'; + public const PACKAGE_VERSION = '9807d95c6b83a852c60d103e148cca123fd7ca01'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-02-08 15:48:22'; + public const RELEASE_DATE = '2023-02-08 17:07:17'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index b06e524e585..d8dd45f530e 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit66a45b2cda7f76f052177681ccd9572c::getLoader(); +return ComposerAutoloaderInit4d48978043fb9a6d4fd0cbc7afecf708::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 45ab76ef3f8..9765447cf00 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit66a45b2cda7f76f052177681ccd9572c +class ComposerAutoloaderInit4d48978043fb9a6d4fd0cbc7afecf708 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit66a45b2cda7f76f052177681ccd9572c return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit66a45b2cda7f76f052177681ccd9572c', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4d48978043fb9a6d4fd0cbc7afecf708', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit66a45b2cda7f76f052177681ccd9572c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4d48978043fb9a6d4fd0cbc7afecf708', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit66a45b2cda7f76f052177681ccd9572c::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit66a45b2cda7f76f052177681ccd9572c::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d559d251096..f6c4a924dcf 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit66a45b2cda7f76f052177681ccd9572c +class ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3098,9 +3098,9 @@ class ComposerStaticInit66a45b2cda7f76f052177681ccd9572c public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit66a45b2cda7f76f052177681ccd9572c::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit66a45b2cda7f76f052177681ccd9572c::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit66a45b2cda7f76f052177681ccd9572c::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit4d48978043fb9a6d4fd0cbc7afecf708::$classMap; }, null, ClassLoader::class); }