octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit f45662a829357b0c98532611fce4c250459f54b7 

f45662a829 [Privatization] Skip parent class unknown on PrivatizeFinalClassMethodRector (#4671)
This commit is contained in:
Tomas Votruba 2023-08-06 09:53:01 +00:00
parent 890e81ed62
commit 57bd04e032
7 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rules/Privatization/Guard/OverrideByParentClassGuard.php Normal file
View File

@ -0,0 +1,35 @@
<?php
declare (strict_types=1);
namespace Rector\Privatization\Guard;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt\Class_;
use PHPStan\Reflection\ReflectionProvider;
/**
* Verify whether Class_'s method or property allowed to be overridden by verify class parent or implements exists
*/
final class OverrideByParentClassGuard
{
/**
* @readonly
* @var \PHPStan\Reflection\ReflectionProvider
*/
private $reflectionProvider;
public function __construct(ReflectionProvider $reflectionProvider)
{
$this->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;
}
}

12
rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php
View File

@ -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;

4
src/Application/VersionResolver.php
View File

@ -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
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -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',

10
vendor/composer/autoload_real.php vendored
View File

@ -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;

9
vendor/composer/autoload_static.php vendored
View File

@ -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);
}