diff --git a/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php index 25e50798bf6..f712f770d47 100644 --- a/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php +++ b/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php @@ -95,6 +95,10 @@ final class VarTagRemover if ($type instanceof \Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode && $this->isArrayOfClass($node, $type)) { return \true; } + // keep generic types + if ($type instanceof \PHPStan\PhpDocParser\Ast\Type\GenericTypeNode) { + return \true; + } } } if (!$this->isArrayTypeNode($varTagValueNode)) { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index b12b762e67e..5ae1efebc57 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '0315a82d57436e6c7ae4b73766708ad814059b74'; + public const PACKAGE_VERSION = '74386d2bf051645eb8908b66c8a2ebf37bf33d93'; /** * @var string */ - public const RELEASE_DATE = '2021-09-17 04:45:44'; + public const RELEASE_DATE = '2021-09-17 04:55:20'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210916\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index f554a6e30a7..8dfd5f81f81 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c::getLoader(); +return ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index d9c07a6bd70..ab1a55a9aef 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c +class ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitb067206d38ddfa96abce841571aa9038::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitb067206d38ddfa96abce841571aa9038::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire670ccafa4b3c6d48d6b501e5bc540f1c($fileIdentifier, $file); + composerRequireb067206d38ddfa96abce841571aa9038($fileIdentifier, $file); } return $loader; } } -function composerRequire670ccafa4b3c6d48d6b501e5bc540f1c($fileIdentifier, $file) +function composerRequireb067206d38ddfa96abce841571aa9038($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 6aef81440fa..3f3eadd4858 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c +class ComposerStaticInitb067206d38ddfa96abce841571aa9038 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3858,9 +3858,9 @@ class ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit670ccafa4b3c6d48d6b501e5bc540f1c::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitb067206d38ddfa96abce841571aa9038::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitb067206d38ddfa96abce841571aa9038::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitb067206d38ddfa96abce841571aa9038::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index c6124c581f2..94ab2248211 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php'; if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) { spl_autoload_call('RectorPrefix20210916\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c', false) && !interface_exists('ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c', false) && !trait_exists('ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c', false)) { - spl_autoload_call('RectorPrefix20210916\ComposerAutoloaderInit670ccafa4b3c6d48d6b501e5bc540f1c'); +if (!class_exists('ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038', false) && !interface_exists('ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038', false) && !trait_exists('ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038', false)) { + spl_autoload_call('RectorPrefix20210916\ComposerAutoloaderInitb067206d38ddfa96abce841571aa9038'); } if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) { spl_autoload_call('RectorPrefix20210916\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -3311,9 +3311,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210916\print_node(...func_get_args()); } } -if (!function_exists('composerRequire670ccafa4b3c6d48d6b501e5bc540f1c')) { - function composerRequire670ccafa4b3c6d48d6b501e5bc540f1c() { - return \RectorPrefix20210916\composerRequire670ccafa4b3c6d48d6b501e5bc540f1c(...func_get_args()); +if (!function_exists('composerRequireb067206d38ddfa96abce841571aa9038')) { + function composerRequireb067206d38ddfa96abce841571aa9038() { + return \RectorPrefix20210916\composerRequireb067206d38ddfa96abce841571aa9038(...func_get_args()); } } if (!function_exists('parseArgs')) {