octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-31 16:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 6ad6595d75

Browse Source 
6ad6595d75 [Autodiscovery] Using AstResolver->resolveClassFromName() on ValueObjectClassAnalyzer (#560)
This commit is contained in:
Tomas Votruba 2021-08-01 17:00:01 +00:00
parent b0f145ae07
commit e3437ec57c
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rules/Autodiscovery/Analyzer/ValueObjectClassAnalyzer.php
View File

@ -8,8 +8,8 @@ use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Type\ObjectType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\ValueObject\MethodName;
use Rector\NodeCollector\NodeCollector\NodeRepository;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
final class ValueObjectClassAnalyzer
@ -31,19 +31,19 @@ final class ValueObjectClassAnalyzer
*/
private $phpDocInfoFactory;
/**
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
* @var \Rector\Core\PhpParser\AstResolver
*/
private $nodeRepository;
private $astResolver;
/**
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository, \Rector\Core\NodeAnalyzer\ClassAnalyzer $classAnalyzer)
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Core\PhpParser\AstResolver $astResolver, \Rector\Core\NodeAnalyzer\ClassAnalyzer $classAnalyzer)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->nodeRepository = $nodeRepository;
$this->astResolver = $astResolver;
$this->classAnalyzer = $classAnalyzer;
}
public function isValueObjectClass(\PhpParser\Node\Stmt\Class_ $class) : bool
@ -68,7 +68,7 @@ final class ValueObjectClassAnalyzer
}
// awesome!
// is it services or value object?
$paramTypeClass = $this->nodeRepository->findClass($paramType->getClassName());
$paramTypeClass = $this->astResolver->resolveClassFromName($paramType->getClassName());
if (!$paramTypeClass instanceof \PhpParser\Node\Stmt\Class_) {
// not sure :/
continue;

4
src/Application/VersionResolver.php
View File

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

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b
class ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', '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\ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit4885d420898181e894c9e8e9d6f24542::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree1c07f26c3e751a7d1dd1280d800dd4b($fileIdentifier, $file);
composerRequire4885d420898181e894c9e8e9d6f24542($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiree1c07f26c3e751a7d1dd1280d800dd4b($fileIdentifier, $file)
function composerRequire4885d420898181e894c9e8e9d6f24542($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 ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b
class ComposerStaticInit4885d420898181e894c9e8e9d6f24542
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3850,9 +3850,9 @@ class ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite1c07f26c3e751a7d1dd1280d800dd4b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4885d420898181e894c9e8e9d6f24542::$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('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false) && !interface_exists('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false) && !trait_exists('ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInite1c07f26c3e751a7d1dd1280d800dd4b');
if (!class_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false) && !interface_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false) && !trait_exists('ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542', false)) {
spl_autoload_call('RectorPrefix20210801\ComposerAutoloaderInit4885d420898181e894c9e8e9d6f24542');
}
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('composerRequiree1c07f26c3e751a7d1dd1280d800dd4b')) {
function composerRequiree1c07f26c3e751a7d1dd1280d800dd4b() {
return \RectorPrefix20210801\composerRequiree1c07f26c3e751a7d1dd1280d800dd4b(...func_get_args());
if (!function_exists('composerRequire4885d420898181e894c9e8e9d6f24542')) {
function composerRequire4885d420898181e894c9e8e9d6f24542() {
return \RectorPrefix20210801\composerRequire4885d420898181e894c9e8e9d6f24542(...func_get_args());
}
}
if (!function_exists('parseArgs')) {