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

Updated Rector to commit 85a01836afa3c4a1617e91dfb1d7f365adfb77f1

Browse Source 
85a01836af [Php55] Allow alias name on StringClassNameToClassConstantRector (#2931)
This commit is contained in:
Tomas Votruba 2022-09-17 07:19:59 +00:00
parent 39cbc1f731
commit 079d3637b2
6 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php
View File

@ -8,6 +8,7 @@ use PhpParser\Node\Arg;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\ClassConst;
@ -15,6 +16,7 @@ use PHPStan\Reflection\ReflectionProvider;
use Rector\Core\Contract\Rector\AllowEmptyConfigurableRectorInterface;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Naming\Naming\AliasNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@ -40,9 +42,15 @@ final class StringClassNameToClassConstantRector extends AbstractRector implemen
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(ReflectionProvider $reflectionProvider)
/**
* @readonly
* @var \Rector\Naming\Naming\AliasNameResolver
*/
private $aliasNameResolver;
public function __construct(ReflectionProvider $reflectionProvider, AliasNameResolver $aliasNameResolver)
{
$this->reflectionProvider = $reflectionProvider;
$this->aliasNameResolver = $aliasNameResolver;
}
public function getRuleDefinition() : RuleDefinition
{
@ -96,13 +104,17 @@ CODE_SAMPLE
return null;
}
$fullyQualified = new FullyQualified($classLikeName);
$name = clone $fullyQualified;
$name->setAttribute(AttributeKey::PARENT_NODE, $node->getAttribute(AttributeKey::PARENT_NODE));
$aliasName = $this->aliasNameResolver->resolveByName($name);
$fullyQualifiedOrAliasName = \is_string($aliasName) ? new Name($aliasName) : $fullyQualified;
if ($classLikeName !== $node->value) {
$preSlashCount = \strlen($node->value) - \strlen($classLikeName);
$preSlash = \str_repeat('\\', $preSlashCount);
$string = new String_($preSlash);
return new Concat($string, new ClassConstFetch($fullyQualified, 'class'));
return new Concat($string, new ClassConstFetch($fullyQualifiedOrAliasName, 'class'));
}
return new ClassConstFetch($fullyQualified, 'class');
return new ClassConstFetch($fullyQualifiedOrAliasName, 'class');
}
/**
* @param mixed[] $configuration

4
rules/Privatization/NodeManipulator/VisibilityManipulator.php
View File

@ -50,11 +50,11 @@ final class VisibilityManipulator
}
/**
* @api
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Class_ $node
*/
public function makeNonAbstract($node) : void
{
if (!$node instanceof ClassMethod || !$node->isAbstract()) {
if (!$node->isAbstract()) {
return;
}
$node->flags -= Class_::MODIFIER_ABSTRACT;

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'c119bba7b1d7332fa79859d66b51f9b4f287dc6d';
public const PACKAGE_VERSION = '85a01836afa3c4a1617e91dfb1d7f365adfb77f1';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-09-16 19:57:25';
public const RELEASE_DATE = '2022-09-17 09:15:34';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitaddd94f80f7d62eec0469dd7b2684861
class ComposerAutoloaderInit8a91979a260e943f6ee7492dd636daeb
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitaddd94f80f7d62eec0469dd7b2684861
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitaddd94f80f7d62eec0469dd7b2684861', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit8a91979a260e943f6ee7492dd636daeb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitaddd94f80f7d62eec0469dd7b2684861', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit8a91979a260e943f6ee7492dd636daeb', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit8a91979a260e943f6ee7492dd636daeb::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit8a91979a260e943f6ee7492dd636daeb::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireaddd94f80f7d62eec0469dd7b2684861($fileIdentifier, $file);
composerRequire8a91979a260e943f6ee7492dd636daeb($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitaddd94f80f7d62eec0469dd7b2684861
* @param string $file
* @return void
*/
function composerRequireaddd94f80f7d62eec0469dd7b2684861($fileIdentifier, $file)
function composerRequire8a91979a260e943f6ee7492dd636daeb($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 ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861
class ComposerStaticInit8a91979a260e943f6ee7492dd636daeb
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3094,9 +3094,9 @@ class ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitaddd94f80f7d62eec0469dd7b2684861::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit8a91979a260e943f6ee7492dd636daeb::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8a91979a260e943f6ee7492dd636daeb::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8a91979a260e943f6ee7492dd636daeb::$classMap;
}, null, ClassLoader::class);
}