mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-28 15:00:50 +00:00
Updated Rector to commit a911c0898e3bbee10a08bc9f62c36edb99d8310b
a911c0898e
[Transform] Skip transitional interface in AddInterfaceByTraitRector (#2898)
This commit is contained in:
parent
ba23046ced
commit
2532428013
|
@ -6,31 +6,22 @@ namespace Rector\Transform\Rector\Class_;
|
|||
use PhpParser\Node;
|
||||
use PhpParser\Node\Name\FullyQualified;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PHPStan\Analyser\Scope;
|
||||
use PHPStan\Reflection\ClassReflection;
|
||||
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\Core\Rector\AbstractScopeAwareRector;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
use RectorPrefix202209\Webmozart\Assert\Assert;
|
||||
/**
|
||||
* @see \Rector\Tests\Transform\Rector\Class_\AddInterfaceByTraitRector\AddInterfaceByTraitRectorTest
|
||||
*/
|
||||
final class AddInterfaceByTraitRector extends AbstractRector implements ConfigurableRectorInterface
|
||||
final class AddInterfaceByTraitRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
|
||||
{
|
||||
/**
|
||||
* @var array<string, string>
|
||||
*/
|
||||
private $interfaceByTrait = [];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
public function __construct(ReflectionResolver $reflectionResolver)
|
||||
{
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Add interface by used trait', [new ConfiguredCodeSample(<<<'CODE_SAMPLE'
|
||||
|
@ -57,9 +48,9 @@ CODE_SAMPLE
|
|||
/**
|
||||
* @param Class_ $node
|
||||
*/
|
||||
public function refactor(Node $node) : ?Node
|
||||
public function refactorWithScope(Node $node, Scope $scope) : ?Node
|
||||
{
|
||||
$classReflection = $this->reflectionResolver->resolveClassReflection($node);
|
||||
$classReflection = $scope->getClassReflection();
|
||||
if (!$classReflection instanceof ClassReflection) {
|
||||
return null;
|
||||
}
|
||||
|
@ -68,10 +59,8 @@ CODE_SAMPLE
|
|||
if (!$classReflection->hasTraitUse($traitName)) {
|
||||
continue;
|
||||
}
|
||||
foreach ($node->implements as $implement) {
|
||||
if ($this->isName($implement, $interfaceName)) {
|
||||
continue 2;
|
||||
}
|
||||
if ($classReflection->implementsInterface($interfaceName)) {
|
||||
continue;
|
||||
}
|
||||
$node->implements[] = new FullyQualified($interfaceName);
|
||||
$hasChanged = \true;
|
||||
|
@ -82,7 +71,6 @@ CODE_SAMPLE
|
|||
return $node;
|
||||
}
|
||||
/**
|
||||
* @todo complex configuration, introduce value object!
|
||||
* @param mixed[] $configuration
|
||||
*/
|
||||
public function configure(array $configuration) : void
|
||||
|
|
|
@ -17,12 +17,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'e9bcacc6c287d385c00dec783e1be8dafb680d99';
|
||||
public const PACKAGE_VERSION = 'a911c0898e3bbee10a08bc9f62c36edb99d8310b';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-09-02 20:44:10';
|
||||
public const RELEASE_DATE = '2022-09-02 20:58:58';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc::getLoader();
|
||||
return ComposerAutoloaderInit7617b9091f36edc070fa4a5bcdc46f59::getLoader();
|
||||
|
|
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc
|
||||
class ComposerAutoloaderInit7617b9091f36edc070fa4a5bcdc46f59
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,19 +22,19 @@ class ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit7617b9091f36edc070fa4a5bcdc46f59', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit7617b9091f36edc070fa4a5bcdc46f59', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInita367435135c5bde772560baf7f9db3cc::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInita367435135c5bde772560baf7f9db3cc::$files;
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59::$files;
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequirea367435135c5bde772560baf7f9db3cc($fileIdentifier, $file);
|
||||
composerRequire7617b9091f36edc070fa4a5bcdc46f59($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
|
@ -46,7 +46,7 @@ class ComposerAutoloaderInita367435135c5bde772560baf7f9db3cc
|
|||
* @param string $file
|
||||
* @return void
|
||||
*/
|
||||
function composerRequirea367435135c5bde772560baf7f9db3cc($fileIdentifier, $file)
|
||||
function composerRequire7617b9091f36edc070fa4a5bcdc46f59($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInita367435135c5bde772560baf7f9db3cc
|
||||
class ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3095,9 +3095,9 @@ class ComposerStaticInita367435135c5bde772560baf7f9db3cc
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInita367435135c5bde772560baf7f9db3cc::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInita367435135c5bde772560baf7f9db3cc::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInita367435135c5bde772560baf7f9db3cc::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit7617b9091f36edc070fa4a5bcdc46f59::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user