mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-14 04:22:17 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit a95f628548976913ef6dd480c8f07897ec4140c4

Browse Source 
a95f628548 [NodeTypeResolver] Remove #[Required] on NameTypeResolver ()
This commit is contained in:
Tomas Votruba 2023-08-07 04:29:55 +00:00
parent 50dd6616d2
commit 820a69e070
5 changed files with 27 additions and 27 deletions
packages/NodeTypeResolver/NodeTypeResolver
NameTypeResolver.php
src/Application
VersionResolver.php
vendor
autoload.php
composer
autoload_real.phpautoload_static.php

30
packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php

@ -3,6 +3,7 @@
declare (strict_types=1);
namespace Rector\NodeTypeResolver\NodeTypeResolver;
use PHPStan\Analyser\Scope;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
@ -13,9 +14,8 @@ use PHPStan\Type\ObjectType;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
use RectorPrefix202308\Symfony\Contracts\Service\Attribute\Required;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
* @see \Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\NameTypeResolver\NameTypeResolverTest
*
@ -23,17 +23,6 @@ use RectorPrefix202308\Symfony\Contracts\Service\Attribute\Required;
*/
final class NameTypeResolver implements NodeTypeResolverInterface
{
/**
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
/**
* @required
*/
public function autowire(ReflectionResolver $reflectionResolver) : void
{
$this->reflectionResolver = $reflectionResolver;
}
/**
* @return array<class-string<Node>>
*/
@ -41,6 +30,17 @@ final class NameTypeResolver implements NodeTypeResolverInterface
{
return [Name::class, FullyQualified::class];
}
/**
* @param \PhpParser\Node\Name|\PhpParser\Node\Name\FullyQualified $node
*/
private function resolveClassReflection($node) : ?ClassReflection
{
$scope = $node->getAttribute(AttributeKey::SCOPE);
if (!$scope instanceof Scope) {
return null;
}
return $scope->getClassReflection();
}
/**
* @param Name $node
*/
@ -60,7 +60,7 @@ final class NameTypeResolver implements NodeTypeResolverInterface
*/
private function resolveParent(Name $name)
{
$classReflection = $this->reflectionResolver->resolveClassReflection($name);
$classReflection = $this->resolveClassReflection($name);
if (!$classReflection instanceof ClassReflection || !$classReflection->isClass()) {
return new MixedType();
}
@ -83,7 +83,7 @@ final class NameTypeResolver implements NodeTypeResolverInterface
{
$nameValue = $name->toString();
if (\in_array($nameValue, [ObjectReference::SELF, ObjectReference::STATIC, 'this'], \true)) {
$classReflection = $this->reflectionResolver->resolveClassReflection($name);
$classReflection = $this->resolveClassReflection($name);
if (!$classReflection instanceof ClassReflection || $classReflection->isAnonymous()) {
return $name->toString();
}

4
src/Application/VersionResolver.php

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '0f15b99a2c4b942273a848947ea342c4651e12bf';
public const PACKAGE_VERSION = 'a95f628548976913ef6dd480c8f07897ec4140c4';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-07 11:13:22';
public const RELEASE_DATE = '2023-08-07 11:26:25';
/**
* @var int
*/

2
vendor/autoload.php vendored

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237::getLoader();
return ComposerAutoloaderInit0969bc93ad809140cc9963cbbc3d8fc5::getLoader();

10
vendor/composer/autoload_real.php vendored

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237
class ComposerAutoloaderInit0969bc93ad809140cc9963cbbc3d8fc5
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0969bc93ad809140cc9963cbbc3d8fc5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit32b91b48d18de5efb155bac2bbe9e237', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0969bc93ad809140cc9963cbbc3d8fc5', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237
class ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3010,9 +3010,9 @@ class ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit32b91b48d18de5efb155bac2bbe9e237::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0969bc93ad809140cc9963cbbc3d8fc5::$classMap;
}, null, ClassLoader::class);
}