diff --git a/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php index f3903ce338a..0f14523fc93 100644 --- a/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php +++ b/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php @@ -30,13 +30,6 @@ final class DoctrineTypeAnalyzer } return $arrayType instanceof ArrayType; } - private function isCollectionObjectType(Type $type) : bool - { - if (!$type instanceof TypeWithClassName) { - return \false; - } - return $type->getClassName() === 'Doctrine\\Common\\Collections\\Collection'; - } public function isInstanceOfCollectionType(Type $type) : bool { if (!$type instanceof ObjectType) { @@ -44,4 +37,11 @@ final class DoctrineTypeAnalyzer } return $type->isInstanceOf('Doctrine\\Common\\Collections\\Collection')->yes(); } + private function isCollectionObjectType(Type $type) : bool + { + if (!$type instanceof TypeWithClassName) { + return \false; + } + return $type->getClassName() === 'Doctrine\\Common\\Collections\\Collection'; + } } diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php index 95d4ef55d4e..0341782e76b 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php @@ -4,19 +4,14 @@ declare (strict_types=1); namespace Rector\TypeDeclaration\Rector\Property; use PhpParser\Node; -use PhpParser\Node\Expr; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Property; -use PhpParser\Node\Stmt\PropertyProperty; use PHPStan\Analyser\Scope; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\Php\PhpPropertyReflection; use PHPStan\Type\MixedType; -use PHPStan\Type\ObjectType; use PHPStan\Type\Type; -use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger; -use Rector\Core\Rector\AbstractRector; use Rector\Core\Rector\AbstractScopeAwareRector; use Rector\Core\Reflection\ReflectionResolver; use Rector\Core\ValueObject\MethodName; diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php index ff23a6bd75e..d3b584d3fb8 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php @@ -4,13 +4,10 @@ declare (strict_types=1); namespace Rector\TypeDeclaration\Rector\Property; use PhpParser\Node; -use PhpParser\Node\Expr; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; -use PhpParser\Node\Stmt\PropertyProperty; use PHPStan\Reflection\ClassReflection; use PHPStan\Type\MixedType; -use PHPStan\Type\ObjectType; use PHPStan\Type\Type; use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger; use Rector\Core\Rector\AbstractRector; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 34e0dc57b60..6cf0c9f7763 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 = '2afa47cd68086b61cb2363bcfb5553eb8767b50c'; + public const PACKAGE_VERSION = '079cd5116ab16585e9b656ad7cd6eef8417137ef'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-07-23 17:10:16'; + public const RELEASE_DATE = '2023-07-23 18:18:03'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index b440787a2d9..fd1059f3f04 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 ComposerAutoloaderInit824bd8621e72888629f212d328a62f9a::getLoader(); +return ComposerAutoloaderInit6b71eb074528dbe72b165cc55711cf9c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 9d0c4f6acd6..cc3d5e7733e 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit824bd8621e72888629f212d328a62f9a +class ComposerAutoloaderInit6b71eb074528dbe72b165cc55711cf9c { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit824bd8621e72888629f212d328a62f9a return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit824bd8621e72888629f212d328a62f9a', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit6b71eb074528dbe72b165cc55711cf9c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit824bd8621e72888629f212d328a62f9a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit6b71eb074528dbe72b165cc55711cf9c', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit824bd8621e72888629f212d328a62f9a::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit824bd8621e72888629f212d328a62f9a::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c::$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 edcf544c7d5..8802bf3b88c 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit824bd8621e72888629f212d328a62f9a +class ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3022,9 +3022,9 @@ class ComposerStaticInit824bd8621e72888629f212d328a62f9a public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit824bd8621e72888629f212d328a62f9a::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit824bd8621e72888629f212d328a62f9a::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit824bd8621e72888629f212d328a62f9a::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit6b71eb074528dbe72b165cc55711cf9c::$classMap; }, null, ClassLoader::class); }