Skip to content

Commit bfd8f1a

Browse files
committed
Updated Rector to commit bdc2fc99631f67eeb2d96e2cf0906279c2561c9a
rectorphp/rector-src@bdc2fc9 [NodeManipulator] Remove parent lookup on PropertyFetchAssignManipulator (#4037)
1 parent b655a25 commit bfd8f1a

7 files changed

Lines changed: 17 additions & 29 deletions

File tree

rules/Php81/Rector/Property/ReadOnlyPropertyRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private function refactorProperty(Class_ $class, Property $property, Scope $scop
162162
if ($this->propertyManipulator->isPropertyChangeableExceptConstructor($class, $property, $scope)) {
163163
return null;
164164
}
165-
if ($this->propertyFetchAssignManipulator->isAssignedMultipleTimesInConstructor($property)) {
165+
if ($this->propertyFetchAssignManipulator->isAssignedMultipleTimesInConstructor($class, $property)) {
166166
return null;
167167
}
168168
if ($this->shouldSkipInReadonlyClass($property)) {

src/Application/VersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '81e8c74b0ea2a107db681ee21c13925837b84abc';
22+
public const PACKAGE_VERSION = 'bdc2fc99631f67eeb2d96e2cf0906279c2561c9a';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-05-31 13:15:27';
27+
public const RELEASE_DATE = '2023-05-31 13:22:39';
2828
/**
2929
* @var int
3030
*/

src/Kernel/RectorKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ final class RectorKernel
1515
/**
1616
* @var string
1717
*/
18-
private const CACHE_KEY = 'v43';
18+
private const CACHE_KEY = 'v44';
1919
/**
2020
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
2121
*/

src/NodeManipulator/PropertyFetchAssignManipulator.php

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
use PhpParser\Node;
77
use PhpParser\Node\Expr\Assign;
88
use PhpParser\Node\Stmt\Class_;
9-
use PhpParser\Node\Stmt\ClassLike;
109
use PhpParser\Node\Stmt\ClassMethod;
1110
use PhpParser\Node\Stmt\Function_;
1211
use PhpParser\Node\Stmt\Property;
1312
use PhpParser\NodeTraverser;
1413
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
15-
use Rector\Core\PhpParser\Node\BetterNodeFinder;
1614
use Rector\Core\ValueObject\MethodName;
1715
use Rector\NodeNameResolver\NodeNameResolver;
1816
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
@@ -28,30 +26,20 @@ final class PropertyFetchAssignManipulator
2826
* @var \Rector\NodeNameResolver\NodeNameResolver
2927
*/
3028
private $nodeNameResolver;
31-
/**
32-
* @readonly
33-
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
34-
*/
35-
private $betterNodeFinder;
3629
/**
3730
* @readonly
3831
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
3932
*/
4033
private $propertyFetchAnalyzer;
41-
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, PropertyFetchAnalyzer $propertyFetchAnalyzer)
34+
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer)
4235
{
4336
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
4437
$this->nodeNameResolver = $nodeNameResolver;
45-
$this->betterNodeFinder = $betterNodeFinder;
4638
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
4739
}
48-
public function isAssignedMultipleTimesInConstructor(Property $property) : bool
40+
public function isAssignedMultipleTimesInConstructor(Class_ $class, Property $property) : bool
4941
{
50-
$classLike = $this->betterNodeFinder->findParentType($property, ClassLike::class);
51-
if (!$classLike instanceof ClassLike) {
52-
return \false;
53-
}
54-
$classMethod = $classLike->getMethod(MethodName::CONSTRUCT);
42+
$classMethod = $class->getMethod(MethodName::CONSTRUCT);
5543
if (!$classMethod instanceof ClassMethod) {
5644
return \false;
5745
}

vendor/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242::getLoader();
25+
return ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3::getLoader();

vendor/composer/autoload_real.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242
5+
class ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit79d6ac6df0b20288ba3e1e8745c6e242', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit36269e6cb2578ea9f157e3d6515171a3', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242
7+
class ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3062,9 +3062,9 @@ class ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242
30623062
public static function getInitializer(ClassLoader $loader)
30633063
{
30643064
return \Closure::bind(function () use ($loader) {
3065-
$loader->prefixLengthsPsr4 = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$prefixLengthsPsr4;
3066-
$loader->prefixDirsPsr4 = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$prefixDirsPsr4;
3067-
$loader->classMap = ComposerStaticInit79d6ac6df0b20288ba3e1e8745c6e242::$classMap;
3065+
$loader->prefixLengthsPsr4 = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$prefixLengthsPsr4;
3066+
$loader->prefixDirsPsr4 = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$prefixDirsPsr4;
3067+
$loader->classMap = ComposerStaticInit36269e6cb2578ea9f157e3d6515171a3::$classMap;
30683068

30693069
}, null, ClassLoader::class);
30703070
}

0 commit comments

Comments
 (0)