octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-10 21:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit e8e3bd5ed90bab56caef0c0fc5829e42efb9f9ba

Browse Source 
e8e3bd5ed9 [TypeDeclaration] Skip property names in TypedPropertyFromStrictConstructorRector (#3128)
This commit is contained in:
Tomas Votruba 2022-11-29 19:26:20 +00:00
parent ab712cfd9a
commit 2f473df977
5 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
View File

@ -6,6 +6,7 @@ namespace Rector\TypeDeclaration\Rector\Property;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Property;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
@ -56,7 +57,12 @@ final class TypedPropertyFromStrictConstructorRector extends AbstractRector impl
* @var \Rector\TypeDeclaration\Guard\PropertyTypeOverrideGuard
*/
private $propertyTypeOverrideGuard;
public function __construct(TrustedClassMethodPropertyTypeInferer $trustedClassMethodPropertyTypeInferer, VarTagRemover $varTagRemover, PhpDocTypeChanger $phpDocTypeChanger, ConstructorAssignDetector $constructorAssignDetector, PhpVersionProvider $phpVersionProvider, PropertyTypeOverrideGuard $propertyTypeOverrideGuard)
/**
* @readonly
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(TrustedClassMethodPropertyTypeInferer $trustedClassMethodPropertyTypeInferer, VarTagRemover $varTagRemover, PhpDocTypeChanger $phpDocTypeChanger, ConstructorAssignDetector $constructorAssignDetector, PhpVersionProvider $phpVersionProvider, PropertyTypeOverrideGuard $propertyTypeOverrideGuard, ReflectionProvider $reflectionProvider)
{
$this->trustedClassMethodPropertyTypeInferer = $trustedClassMethodPropertyTypeInferer;
$this->varTagRemover = $varTagRemover;
@ -64,6 +70,7 @@ final class TypedPropertyFromStrictConstructorRector extends AbstractRector impl
$this->constructorAssignDetector = $constructorAssignDetector;
$this->phpVersionProvider = $phpVersionProvider;
$this->propertyTypeOverrideGuard = $propertyTypeOverrideGuard;
$this->reflectionProvider = $reflectionProvider;
}
public function getRuleDefinition() : RuleDefinition
{
@ -103,7 +110,7 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if ($node->type !== null) {
if ($this->shouldSkip($node)) {
return null;
}
$propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($node, MethodName::CONSTRUCT);
@ -146,4 +153,39 @@ CODE_SAMPLE
{
return PhpVersionFeature::TYPED_PROPERTIES;
}
/**
* @return string[]
*/
private function resolveTraitPropertyNames(Class_ $class) : array
{
$traitPropertyNames = [];
foreach ($class->getTraitUses() as $traitUse) {
foreach ($traitUse->traits as $traitName) {
$traitNameString = $this->getName($traitName);
if (!$this->reflectionProvider->hasClass($traitNameString)) {
continue;
}
$traitClassReflection = $this->reflectionProvider->getClass($traitNameString);
$nativeReflection = $traitClassReflection->getNativeReflection();
foreach ($nativeReflection->getProperties() as $property) {
$traitPropertyNames[] = $property->getName();
}
}
}
return $traitPropertyNames;
}
private function shouldSkip(Property $property) : bool
{
if ($property->type !== null) {
return \true;
}
$class = $this->betterNodeFinder->findParentType($property, Class_::class);
if ($class instanceof Class_) {
$traitPropertyNames = $this->resolveTraitPropertyNames($class);
if ($this->isNames($property, $traitPropertyNames)) {
return \true;
}
}
return \false;
}
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '571a1e6067342b21c2baaa10976103915299b0c6';
public const PACKAGE_VERSION = 'e8e3bd5ed90bab56caef0c0fc5829e42efb9f9ba';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-11-29 17:05:58';
public const RELEASE_DATE = '2022-11-29 20:20:51';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603::getLoader();
return ComposerAutoloaderInitb88197d9e5bd8e8906c0e720de2adad2::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603
class ComposerAutoloaderInitb88197d9e5bd8e8906c0e720de2adad2
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb88197d9e5bd8e8906c0e720de2adad2', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb88197d9e5bd8e8906c0e720de2adad2', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit47947e900796eaf4c11aea39ed778603::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit47947e900796eaf4c11aea39ed778603::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire47947e900796eaf4c11aea39ed778603($fileIdentifier, $file);
composerRequireb88197d9e5bd8e8906c0e720de2adad2($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit47947e900796eaf4c11aea39ed778603
* @param string $file
* @return void
*/
function composerRequire47947e900796eaf4c11aea39ed778603($fileIdentifier, $file)
function composerRequireb88197d9e5bd8e8906c0e720de2adad2($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit47947e900796eaf4c11aea39ed778603
class ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3021,9 +3021,9 @@ class ComposerStaticInit47947e900796eaf4c11aea39ed778603
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit47947e900796eaf4c11aea39ed778603::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit47947e900796eaf4c11aea39ed778603::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit47947e900796eaf4c11aea39ed778603::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb88197d9e5bd8e8906c0e720de2adad2::$classMap;
}, null, ClassLoader::class);
}