mirror of https://github.com/rectorphp/rector.git
Updated Rector to commit bdc2fc99631f67eeb2d96e2cf0906279c2561c9a
bdc2fc9963
[NodeManipulator] Remove parent lookup on PropertyFetchAssignManipulator (#4037)
This commit is contained in:
parent
b655a25951
commit
bfd8f1a220
|
@ -162,7 +162,7 @@ CODE_SAMPLE
|
||||||
if ($this->propertyManipulator->isPropertyChangeableExceptConstructor($class, $property, $scope)) {
|
if ($this->propertyManipulator->isPropertyChangeableExceptConstructor($class, $property, $scope)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if ($this->propertyFetchAssignManipulator->isAssignedMultipleTimesInConstructor($property)) {
|
if ($this->propertyFetchAssignManipulator->isAssignedMultipleTimesInConstructor($class, $property)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if ($this->shouldSkipInReadonlyClass($property)) {
|
if ($this->shouldSkipInReadonlyClass($property)) {
|
||||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
||||||
* @api
|
* @api
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public const PACKAGE_VERSION = '81e8c74b0ea2a107db681ee21c13925837b84abc';
|
public const PACKAGE_VERSION = 'bdc2fc99631f67eeb2d96e2cf0906279c2561c9a';
|
||||||
/**
|
/**
|
||||||
* @api
|
* @api
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public const RELEASE_DATE = '2023-05-31 13:15:27';
|
public const RELEASE_DATE = '2023-05-31 13:22:39';
|
||||||
/**
|
/**
|
||||||
* @var int
|
* @var int
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -15,7 +15,7 @@ final class RectorKernel
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
private const CACHE_KEY = 'v43';
|
private const CACHE_KEY = 'v44';
|
||||||
/**
|
/**
|
||||||
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
|
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -6,13 +6,11 @@ namespace Rector\Core\NodeManipulator;
|
||||||
use PhpParser\Node;
|
use PhpParser\Node;
|
||||||
use PhpParser\Node\Expr\Assign;
|
use PhpParser\Node\Expr\Assign;
|
||||||
use PhpParser\Node\Stmt\Class_;
|
use PhpParser\Node\Stmt\Class_;
|
||||||
use PhpParser\Node\Stmt\ClassLike;
|
|
||||||
use PhpParser\Node\Stmt\ClassMethod;
|
use PhpParser\Node\Stmt\ClassMethod;
|
||||||
use PhpParser\Node\Stmt\Function_;
|
use PhpParser\Node\Stmt\Function_;
|
||||||
use PhpParser\Node\Stmt\Property;
|
use PhpParser\Node\Stmt\Property;
|
||||||
use PhpParser\NodeTraverser;
|
use PhpParser\NodeTraverser;
|
||||||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
|
||||||
use Rector\Core\ValueObject\MethodName;
|
use Rector\Core\ValueObject\MethodName;
|
||||||
use Rector\NodeNameResolver\NodeNameResolver;
|
use Rector\NodeNameResolver\NodeNameResolver;
|
||||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||||
|
@ -28,30 +26,20 @@ final class PropertyFetchAssignManipulator
|
||||||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||||
*/
|
*/
|
||||||
private $nodeNameResolver;
|
private $nodeNameResolver;
|
||||||
/**
|
|
||||||
* @readonly
|
|
||||||
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
|
|
||||||
*/
|
|
||||||
private $betterNodeFinder;
|
|
||||||
/**
|
/**
|
||||||
* @readonly
|
* @readonly
|
||||||
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
|
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
|
||||||
*/
|
*/
|
||||||
private $propertyFetchAnalyzer;
|
private $propertyFetchAnalyzer;
|
||||||
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, PropertyFetchAnalyzer $propertyFetchAnalyzer)
|
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer)
|
||||||
{
|
{
|
||||||
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
|
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
|
||||||
$this->nodeNameResolver = $nodeNameResolver;
|
$this->nodeNameResolver = $nodeNameResolver;
|
||||||
$this->betterNodeFinder = $betterNodeFinder;
|
|
||||||
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
|
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
|
||||||
}
|
}
|
||||||
public function isAssignedMultipleTimesInConstructor(Property $property) : bool
|
public function isAssignedMultipleTimesInConstructor(Class_ $class, Property $property) : bool
|
||||||
{
|
{
|
||||||
$classLike = $this->betterNodeFinder->findParentType($property, ClassLike::class);
|
$classMethod = $class->getMethod(MethodName::CONSTRUCT);
|
||||||
if (!$classLike instanceof ClassLike) {
|
|
||||||
return \false;
|
|
||||||
}
|
|
||||||
$classMethod = $classLike->getMethod(MethodName::CONSTRUCT);
|
|
||||||
if (!$classMethod instanceof ClassMethod) {
|
if (!$classMethod instanceof ClassMethod) {
|
||||||
return \false;
|
return \false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
||||||
|
|
||||||
require_once __DIR__ . '/composer/autoload_real.php';
|
require_once __DIR__ . '/composer/autoload_real.php';
|
||||||
|
|
||||||
return ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242::getLoader();
|
return ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3::getLoader();
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
// autoload_real.php @generated by Composer
|
// autoload_real.php @generated by Composer
|
||||||
|
|
||||||
class ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242
|
class ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3
|
||||||
{
|
{
|
||||||
private static $loader;
|
private static $loader;
|
||||||
|
|
||||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242
|
||||||
return self::$loader;
|
return self::$loader;
|
||||||
}
|
}
|
||||||
|
|
||||||
spl_autoload_register(array('ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242', 'loadClassLoader'), true, true);
|
spl_autoload_register(array('ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3', 'loadClassLoader'), true, true);
|
||||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||||
spl_autoload_unregister(array('ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242', 'loadClassLoader'));
|
spl_autoload_unregister(array('ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3', 'loadClassLoader'));
|
||||||
|
|
||||||
require __DIR__ . '/autoload_static.php';
|
require __DIR__ . '/autoload_static.php';
|
||||||
call_user_func(\Composer\Autoload\ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::getInitializer($loader));
|
call_user_func(\Composer\Autoload\ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::getInitializer($loader));
|
||||||
|
|
||||||
$loader->setClassMapAuthoritative(true);
|
$loader->setClassMapAuthoritative(true);
|
||||||
$loader->register(true);
|
$loader->register(true);
|
||||||
|
|
||||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$files;
|
$filesToLoad = \Composer\Autoload\ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$files;
|
||||||
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
|
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
|
||||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
namespace Composer\Autoload;
|
namespace Composer\Autoload;
|
||||||
|
|
||||||
class ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242
|
class ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3
|
||||||
{
|
{
|
||||||
public static $files = array (
|
public static $files = array (
|
||||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||||
|
@ -3062,9 +3062,9 @@ class ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242
|
||||||
public static function getInitializer(ClassLoader $loader)
|
public static function getInitializer(ClassLoader $loader)
|
||||||
{
|
{
|
||||||
return \Closure::bind(function () use ($loader) {
|
return \Closure::bind(function () use ($loader) {
|
||||||
$loader->prefixLengthsPsr4 = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$prefixLengthsPsr4;
|
$loader->prefixLengthsPsr4 = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$prefixLengthsPsr4;
|
||||||
$loader->prefixDirsPsr4 = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$prefixDirsPsr4;
|
$loader->prefixDirsPsr4 = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$prefixDirsPsr4;
|
||||||
$loader->classMap = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$classMap;
|
$loader->classMap = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$classMap;
|
||||||
|
|
||||||
}, null, ClassLoader::class);
|
}, null, ClassLoader::class);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue