From 57bd04e032353e232c4f56fb9d32811ee3ca7af7 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 6 Aug 2023 09:53:01 +0000 Subject: [PATCH] Updated Rector to commit f45662a829357b0c98532611fce4c250459f54b7 https://github.com/rectorphp/rector-src/commit/f45662a829357b0c98532611fce4c250459f54b7 [Privatization] Skip parent class unknown on PrivatizeFinalClassMethodRector (#4671) --- .../Guard/OverrideByParentClassGuard.php | 35 +++++++++++++++++++ .../PrivatizeFinalClassMethodRector.php | 12 ++++++- src/Application/VersionResolver.php | 4 +-- vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_real.php | 10 +++--- vendor/composer/autoload_static.php | 9 ++--- 7 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 rules/Privatization/Guard/OverrideByParentClassGuard.php diff --git a/rules/Privatization/Guard/OverrideByParentClassGuard.php b/rules/Privatization/Guard/OverrideByParentClassGuard.php new file mode 100644 index 00000000000..b5515543957 --- /dev/null +++ b/rules/Privatization/Guard/OverrideByParentClassGuard.php @@ -0,0 +1,35 @@ +reflectionProvider = $reflectionProvider; + } + public function isLegal(Class_ $class) : bool + { + if ($class->extends instanceof FullyQualified && !$this->reflectionProvider->hasClass($class->extends->toString())) { + return \false; + } + foreach ($class->implements as $implement) { + if (!$this->reflectionProvider->hasClass($implement->toString())) { + return \false; + } + } + return \true; + } +} diff --git a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php index a7043dedc08..42d43043d25 100644 --- a/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php +++ b/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php @@ -9,6 +9,7 @@ use PhpParser\Node\Stmt\ClassMethod; use PHPStan\Analyser\Scope; use PHPStan\Reflection\ClassReflection; use Rector\Core\Rector\AbstractScopeAwareRector; +use Rector\Privatization\Guard\OverrideByParentClassGuard; use Rector\Privatization\NodeManipulator\VisibilityManipulator; use Rector\Privatization\VisibilityGuard\ClassMethodVisibilityGuard; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; @@ -28,10 +29,16 @@ final class PrivatizeFinalClassMethodRector extends AbstractScopeAwareRector * @var \Rector\Privatization\NodeManipulator\VisibilityManipulator */ private $visibilityManipulator; - public function __construct(ClassMethodVisibilityGuard $classMethodVisibilityGuard, VisibilityManipulator $visibilityManipulator) + /** + * @readonly + * @var \Rector\Privatization\Guard\OverrideByParentClassGuard + */ + private $overrideByParentClassGuard; + public function __construct(ClassMethodVisibilityGuard $classMethodVisibilityGuard, VisibilityManipulator $visibilityManipulator, OverrideByParentClassGuard $overrideByParentClassGuard) { $this->classMethodVisibilityGuard = $classMethodVisibilityGuard; $this->visibilityManipulator = $visibilityManipulator; + $this->overrideByParentClassGuard = $overrideByParentClassGuard; } public function getRuleDefinition() : RuleDefinition { @@ -68,6 +75,9 @@ CODE_SAMPLE if (!$node->isFinal()) { return null; } + if (!$this->overrideByParentClassGuard->isLegal($node)) { + return null; + } $classReflection = $scope->getClassReflection(); if (!$classReflection instanceof ClassReflection) { return null; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 6bdc327f329..6be0af19035 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '625fcccc475c8a6b3bde49e5e64e66354ed4299a'; + public const PACKAGE_VERSION = 'f45662a829357b0c98532611fce4c250459f54b7'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-08-06 08:57:51'; + public const RELEASE_DATE = '2023-08-06 10:49:19'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 8c115b892f2..aa49244021f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitb9b33c3ba49d49362eabb6d91c22f79d::getLoader(); +return ComposerAutoloaderInit011026bb5f861ca634fae446ca89548c::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 195c7e32c37..2e64c289c0c 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -2316,6 +2316,7 @@ return array( 'Rector\\PostRector\\Rector\\UnusedImportRemovingPostRector' => $baseDir . '/packages/PostRector/Rector/UnusedImportRemovingPostRector.php', 'Rector\\PostRector\\Rector\\UseAddingPostRector' => $baseDir . '/packages/PostRector/Rector/UseAddingPostRector.php', 'Rector\\PostRector\\ValueObject\\PropertyMetadata' => $baseDir . '/packages/PostRector/ValueObject/PropertyMetadata.php', + 'Rector\\Privatization\\Guard\\OverrideByParentClassGuard' => $baseDir . '/rules/Privatization/Guard/OverrideByParentClassGuard.php', 'Rector\\Privatization\\Guard\\ParentPropertyLookupGuard' => $baseDir . '/rules/Privatization/Guard/ParentPropertyLookupGuard.php', 'Rector\\Privatization\\NodeManipulator\\VisibilityManipulator' => $baseDir . '/rules/Privatization/NodeManipulator/VisibilityManipulator.php', 'Rector\\Privatization\\Rector\\ClassMethod\\PrivatizeFinalClassMethodRector' => $baseDir . '/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 978ef4d6070..b495af4ecb1 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitb9b33c3ba49d49362eabb6d91c22f79d +class ComposerAutoloaderInit011026bb5f861ca634fae446ca89548c { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInitb9b33c3ba49d49362eabb6d91c22f79d return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitb9b33c3ba49d49362eabb6d91c22f79d', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit011026bb5f861ca634fae446ca89548c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitb9b33c3ba49d49362eabb6d91c22f79d', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit011026bb5f861ca634fae446ca89548c', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit011026bb5f861ca634fae446ca89548c::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit011026bb5f861ca634fae446ca89548c::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 75411a4636f..fab6815c209 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d +class ComposerStaticInit011026bb5f861ca634fae446ca89548c { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -2570,6 +2570,7 @@ class ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d 'Rector\\PostRector\\Rector\\UnusedImportRemovingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/UnusedImportRemovingPostRector.php', 'Rector\\PostRector\\Rector\\UseAddingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/UseAddingPostRector.php', 'Rector\\PostRector\\ValueObject\\PropertyMetadata' => __DIR__ . '/../..' . '/packages/PostRector/ValueObject/PropertyMetadata.php', + 'Rector\\Privatization\\Guard\\OverrideByParentClassGuard' => __DIR__ . '/../..' . '/rules/Privatization/Guard/OverrideByParentClassGuard.php', 'Rector\\Privatization\\Guard\\ParentPropertyLookupGuard' => __DIR__ . '/../..' . '/rules/Privatization/Guard/ParentPropertyLookupGuard.php', 'Rector\\Privatization\\NodeManipulator\\VisibilityManipulator' => __DIR__ . '/../..' . '/rules/Privatization/NodeManipulator/VisibilityManipulator.php', 'Rector\\Privatization\\Rector\\ClassMethod\\PrivatizeFinalClassMethodRector' => __DIR__ . '/../..' . '/rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php', @@ -3011,9 +3012,9 @@ class ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitb9b33c3ba49d49362eabb6d91c22f79d::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit011026bb5f861ca634fae446ca89548c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit011026bb5f861ca634fae446ca89548c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit011026bb5f861ca634fae446ca89548c::$classMap; }, null, ClassLoader::class); }