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 bb8dedd178dd26c4b8d2653e9f97dae6da01c950

Browse Source 
bb8dedd178 [CodeQuality][TypeDeclaration] Handle default value from constructor removed on InlineConstructorDefaultToPropertyRector+TypedPropertyFromStrictConstructorRector (#3225)
This commit is contained in:
Tomas Votruba 2022-12-20 17:24:54 +00:00
parent 2adf37a5b5
commit a126aac35f
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rules/TypeDeclaration/AlreadyAssignDetector/ConstructorAssignDetector.php
View File

@ -13,8 +13,10 @@ use PhpParser\NodeTraverser;
use PHPStan\Type\ObjectType;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\ValueObject\MethodName;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
use Rector\PostRector\Collector\NodesToRemoveCollector;
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer;
final class ConstructorAssignDetector
@ -48,13 +50,19 @@ final class ConstructorAssignDetector
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(NodeTypeResolver $nodeTypeResolver, PropertyAssignMatcher $propertyAssignMatcher, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, PropertyFetchAnalyzer $propertyFetchAnalyzer)
/**
* @readonly
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
*/
private $nodesToRemoveCollector;
public function __construct(NodeTypeResolver $nodeTypeResolver, PropertyAssignMatcher $propertyAssignMatcher, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, PropertyFetchAnalyzer $propertyFetchAnalyzer, NodesToRemoveCollector $nodesToRemoveCollector)
{
$this->nodeTypeResolver = $nodeTypeResolver;
$this->propertyAssignMatcher = $propertyAssignMatcher;
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->autowiredClassMethodOrPropertyAnalyzer = $autowiredClassMethodOrPropertyAnalyzer;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
}
public function isPropertyAssigned(ClassLike $classLike, string $propertyName) : bool
{
@ -77,6 +85,10 @@ final class ConstructorAssignDetector
if ($isFirstLevelStatement !== \true) {
return null;
}
$parentNode = $assign->getAttribute(AttributeKey::PARENT_NODE);
if ($parentNode instanceof Expression && $this->nodesToRemoveCollector->isNodeRemoved($parentNode)) {
return null;
}
$isAssignedInConstructor = \true;
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
});

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '36fcdc14e0828486c7a7a3ce8df723d712aeb2d7';
public const PACKAGE_VERSION = 'bb8dedd178dd26c4b8d2653e9f97dae6da01c950';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-12-20 15:49:19';
public const RELEASE_DATE = '2022-12-20 18:20:39';
/**
* @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 ComposerAutoloaderInitf43d828e98ce5609e8cf788e91f15829::getLoader();
return ComposerAutoloaderInit4a66651f45dae8a72c7e870d59a2ced6::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitf43d828e98ce5609e8cf788e91f15829
class ComposerAutoloaderInit4a66651f45dae8a72c7e870d59a2ced6
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitf43d828e98ce5609e8cf788e91f15829
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitf43d828e98ce5609e8cf788e91f15829', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit4a66651f45dae8a72c7e870d59a2ced6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitf43d828e98ce5609e8cf788e91f15829', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit4a66651f45dae8a72c7e870d59a2ced6', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitf43d828e98ce5609e8cf788e91f15829::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitf43d828e98ce5609e8cf788e91f15829::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6::$files;
$requireFile = static function ($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 ComposerStaticInitf43d828e98ce5609e8cf788e91f15829
class ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3055,9 +3055,9 @@ class ComposerStaticInitf43d828e98ce5609e8cf788e91f15829
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf43d828e98ce5609e8cf788e91f15829::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf43d828e98ce5609e8cf788e91f15829::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf43d828e98ce5609e8cf788e91f15829::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4a66651f45dae8a72c7e870d59a2ced6::$classMap;
}, null, ClassLoader::class);
}