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

Updated Rector to commit b34ff8ca13

Browse Source 
b34ff8ca13 [Defluent] Skip clone uses trait on DefluentReturnMethodCallRector (#558)
This commit is contained in:
Tomas Votruba 2021-08-01 17:00:37 +00:00
parent e3437ec57c
commit 90467ad594
7 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php
View File

@ -9,9 +9,9 @@ use PhpParser\Node\Stmt\Property;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
use Rector\NodeCollector\NodeCollector\NodeRepository;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class PropertyUsageAnalyzer
@ -29,15 +29,15 @@ final class PropertyUsageAnalyzer
*/
private $nodeNameResolver;
/**
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
* @var \Rector\Core\PhpParser\AstResolver
*/
private $nodeRepository;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer $familyRelationsAnalyzer, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository)
private $astResolver;
public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer $familyRelationsAnalyzer, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\PhpParser\AstResolver $astResolver)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->familyRelationsAnalyzer = $familyRelationsAnalyzer;
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeRepository = $nodeRepository;
$this->astResolver = $astResolver;
}
public function isPropertyFetchedInChildClass(\PhpParser\Node\Stmt\Property $property) : bool
{
@ -59,7 +59,7 @@ final class PropertyUsageAnalyzer
$propertyName = $this->nodeNameResolver->getName($property);
$childrenClassReflections = $this->familyRelationsAnalyzer->getChildrenOfClassReflection($classReflection);
foreach ($childrenClassReflections as $childClassReflection) {
$childClass = $this->nodeRepository->findClass($childClassReflection->getName());
$childClass = $this->astResolver->resolveClassFromName($childClassReflection->getName());
if (!$childClass instanceof \PhpParser\Node\Stmt\Class_) {
continue;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '6ad6595d75bbeb49dc315aee508d5775cd724a3e';
public const PACKAGE_VERSION = 'b34ff8ca1311c8819a0dab972c1864c771daca2f';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-01 18:49:08';
public const RELEASE_DATE = '2021-08-01 18:50:05';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210801\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

17
src/PhpParser/AstResolver.php
View File

@ -212,7 +212,11 @@ final class AstResolver
if (!$methodReflection instanceof \PHPStan\Reflection\MethodReflection) {
return null;
}
return $this->resolveClassMethodFromMethodReflection($methodReflection);
$classMethod = $this->resolveClassMethodFromMethodReflection($methodReflection);
if (!$classMethod instanceof \PhpParser\Node\Stmt\ClassMethod) {
return $this->locateClassMethodInTrait($methodName, $methodReflection);
}
return $classMethod;
}
public function resolveClassMethodFromMethodCall(\PhpParser\Node\Expr\MethodCall $methodCall) : ?\PhpParser\Node\Stmt\ClassMethod
{
@ -327,6 +331,17 @@ final class AstResolver
// promoted property
return $this->findPromotedPropertyByName($nodes, $desiredPropertyName);
}
private function locateClassMethodInTrait(string $methodName, \PHPStan\Reflection\MethodReflection $methodReflection) : ?\PhpParser\Node\Stmt\ClassMethod
{
$classReflection = $methodReflection->getDeclaringClass();
$traits = $this->parseClassReflectionTraits($classReflection);
/** @var ClassMethod|null $classMethod */
$classMethod = $this->betterNodeFinder->findFirst($traits, function (\PhpParser\Node $node) use($methodName) : bool {
return $node instanceof \PhpParser\Node\Stmt\ClassMethod && $this->nodeNameResolver->isName($node, $methodName);
});
$this->classMethodsByClassAndMethod[$classReflection->getName()][$methodName] = $classMethod;
return $classMethod;
}
/**
* @return Stmt[]|null
*/

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542::getLoader();
return ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542
class ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit4885d420898181e894c9e8e9d6f24542::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit60b66ce146abf451da7d8756830b4da8::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit60b66ce146abf451da7d8756830b4da8::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire4885d420898181e894c9e8e9d6f24542($fileIdentifier, $file);
composerRequire60b66ce146abf451da7d8756830b4da8($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire4885d420898181e894c9e8e9d6f24542($fileIdentifier, $file)
function composerRequire60b66ce146abf451da7d8756830b4da8($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit4885d420898181e894c9e8e9d6f24542
class ComposerStaticInit60b66ce146abf451da7d8756830b4da8
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3850,9 +3850,9 @@ class ComposerStaticInit4885d420898181e894c9e8e9d6f24542
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit60b66ce146abf451da7d8756830b4da8::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit60b66ce146abf451da7d8756830b4da8::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit60b66ce146abf451da7d8756830b4da8::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210801\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false) && !interface_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false) && !trait_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542');
if (!class_exists('ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8', false) && !interface_exists('ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8', false) && !trait_exists('ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit60b66ce146abf451da7d8756830b4da8');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210801\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210801\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire4885d420898181e894c9e8e9d6f24542')) {
function composerRequire4885d420898181e894c9e8e9d6f24542() {
return \RectorPrefix20210801\composerRequire4885d420898181e894c9e8e9d6f24542(...func_get_args());
if (!function_exists('composerRequire60b66ce146abf451da7d8756830b4da8')) {
function composerRequire60b66ce146abf451da7d8756830b4da8() {
return \RectorPrefix20210801\composerRequire60b66ce146abf451da7d8756830b4da8(...func_get_args());
}
}
if (!function_exists('parseArgs')) {