diff --git a/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php b/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php index 81e9271a8e9..b89dbb638b8 100644 --- a/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php +++ b/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php @@ -37,7 +37,7 @@ final class ArrayItemNode implements PhpDocTagValueNode $value .= $singleValue; } } elseif ($this->value instanceof \Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode) { - $value .= (string) $this->value->identifierTypeNode . $this->value; + $value .= $this->value->identifierTypeNode . $this->value; } else { $value .= $this->value; } diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php index 05d6d55126e..a059c0bead0 100644 --- a/packages/PostRector/Rector/NameImportingPostRector.php +++ b/packages/PostRector/Rector/NameImportingPostRector.php @@ -13,7 +13,6 @@ use PhpParser\Node\Stmt\GroupUse; use PhpParser\Node\Stmt\InlineHTML; use PhpParser\Node\Stmt\Namespace_; use PhpParser\Node\Stmt\Use_; -use PHPStan\Reflection\ReflectionProvider; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipper; @@ -50,11 +49,6 @@ final class NameImportingPostRector extends \Rector\PostRector\Rector\AbstractPo * @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory */ private $phpDocInfoFactory; - /** - * @readonly - * @var \PHPStan\Reflection\ReflectionProvider - */ - private $reflectionProvider; /** * @readonly * @var \Rector\Core\Provider\CurrentFileProvider @@ -75,13 +69,12 @@ final class NameImportingPostRector extends \Rector\PostRector\Rector\AbstractPo * @var \Rector\Comments\NodeDocBlock\DocBlockUpdater */ private $docBlockUpdater; - public function __construct(NameImporter $nameImporter, DocBlockNameImporter $docBlockNameImporter, ClassNameImportSkipper $classNameImportSkipper, PhpDocInfoFactory $phpDocInfoFactory, ReflectionProvider $reflectionProvider, CurrentFileProvider $currentFileProvider, UseImportsResolver $useImportsResolver, AliasNameResolver $aliasNameResolver, DocBlockUpdater $docBlockUpdater) + public function __construct(NameImporter $nameImporter, DocBlockNameImporter $docBlockNameImporter, ClassNameImportSkipper $classNameImportSkipper, PhpDocInfoFactory $phpDocInfoFactory, CurrentFileProvider $currentFileProvider, UseImportsResolver $useImportsResolver, AliasNameResolver $aliasNameResolver, DocBlockUpdater $docBlockUpdater) { $this->nameImporter = $nameImporter; $this->docBlockNameImporter = $docBlockNameImporter; $this->classNameImportSkipper = $classNameImportSkipper; $this->phpDocInfoFactory = $phpDocInfoFactory; - $this->reflectionProvider = $reflectionProvider; $this->currentFileProvider = $currentFileProvider; $this->useImportsResolver = $useImportsResolver; $this->aliasNameResolver = $aliasNameResolver; @@ -216,9 +209,6 @@ final class NameImportingPostRector extends \Rector\PostRector\Rector\AbstractPo if (!$this->classNameImportSkipper->isFoundInUse($name, $currentUses)) { return \true; } - if ($this->classNameImportSkipper->isAlreadyImported($name, $currentUses)) { - return \true; - } - return $this->reflectionProvider->hasFunction(new Name($name->getLast()), null); + return $this->classNameImportSkipper->isAlreadyImported($name, $currentUses); } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 795f366ce34..2e2b30cbe98 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 = '50e589ca482e73daea8d2d4949c9ec9869fa59a3'; + public const PACKAGE_VERSION = '50eb9efa1098d832343761d0af398449c726caf9'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-09-26 22:40:27'; + public const RELEASE_DATE = '2023-09-27 04:38:31'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index d2676754757..f745d034dd6 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 ComposerAutoloaderInit616e44b0c32c6966b483f7db34ba7f70::getLoader(); +return ComposerAutoloaderInitb162e75f886a28fea974bd7eef5a3de5::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 6e9a13983e9..ce5e05549cc 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit616e44b0c32c6966b483f7db34ba7f70 +class ComposerAutoloaderInitb162e75f886a28fea974bd7eef5a3de5 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit616e44b0c32c6966b483f7db34ba7f70 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit616e44b0c32c6966b483f7db34ba7f70', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb162e75f886a28fea974bd7eef5a3de5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit616e44b0c32c6966b483f7db34ba7f70', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb162e75f886a28fea974bd7eef5a3de5', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5::$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 049d389c713..a33dc6807fd 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70 +class ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2601,9 +2601,9 @@ class ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit616e44b0c32c6966b483f7db34ba7f70::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb162e75f886a28fea974bd7eef5a3de5::$classMap; }, null, ClassLoader::class); }