diff --git a/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php b/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php index 2579602faa9..d9ee4dbad24 100644 --- a/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php +++ b/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php @@ -5,7 +5,6 @@ namespace Rector\CodingStyle\Rector\ClassConst; use PhpParser\Node; use PhpParser\Node\Stmt\Class_; -use PhpParser\Node\Stmt\ClassConst; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\Privatization\NodeManipulator\VisibilityManipulator; @@ -49,19 +48,25 @@ CODE_SAMPLE */ public function getNodeTypes() : array { - return [ClassConst::class]; + return [Class_::class]; } /** - * @param ClassConst $node + * @param Class_ $node */ public function refactor(Node $node) : ?Node { - $parentClass = $this->betterNodeFinder->findParentType($node, Class_::class); - if (!$parentClass instanceof Class_) { + if (!$node->isFinal()) { return null; } - if ($parentClass->isFinal() && $node->isFinal()) { - $this->visibilityManipulator->removeFinal($node); + $hasChanged = \false; + foreach ($node->getConstants() as $classConst) { + if (!$classConst->isFinal()) { + continue; + } + $this->visibilityManipulator->removeFinal($classConst); + $hasChanged = \true; + } + if ($hasChanged) { return $node; } return null; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index adb7bb083b0..7422c35d1b6 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 = '0d5169dd77c909421aa1de31aac7bdcd502d66aa'; + public const PACKAGE_VERSION = '34ff3246d3d5f040ca66f30a1eb883923962aecd'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-03-29 22:28:57'; + public const RELEASE_DATE = '2023-03-29 22:30:08'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index ea82704a6fa..9c96f5d90f4 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 ComposerAutoloaderInit10835d73b373da3083af67a4caf9798d::getLoader(); +return ComposerAutoloaderInita7d370a842b121167f5f9172589f907a::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 7a25c1b5047..6d899a5414c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit10835d73b373da3083af67a4caf9798d +class ComposerAutoloaderInita7d370a842b121167f5f9172589f907a { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit10835d73b373da3083af67a4caf9798d return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit10835d73b373da3083af67a4caf9798d', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInita7d370a842b121167f5f9172589f907a', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit10835d73b373da3083af67a4caf9798d', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInita7d370a842b121167f5f9172589f907a', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit10835d73b373da3083af67a4caf9798d::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInita7d370a842b121167f5f9172589f907a::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit10835d73b373da3083af67a4caf9798d::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInita7d370a842b121167f5f9172589f907a::$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 9b693be9e68..76bdf8af6d1 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit10835d73b373da3083af67a4caf9798d +class ComposerStaticInita7d370a842b121167f5f9172589f907a { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3129,9 +3129,9 @@ class ComposerStaticInit10835d73b373da3083af67a4caf9798d public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit10835d73b373da3083af67a4caf9798d::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit10835d73b373da3083af67a4caf9798d::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit10835d73b373da3083af67a4caf9798d::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInita7d370a842b121167f5f9172589f907a::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInita7d370a842b121167f5f9172589f907a::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInita7d370a842b121167f5f9172589f907a::$classMap; }, null, ClassLoader::class); }