Merge branch 'main' of github.com:rectorphp/rector-src into scoper-patch

Author: samsonasik

rules-tests/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/final_class_with_inherited_constant.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Source\ParentClass;
+
+final class FinalClassWithInheritedConstant extends ParentClass
+{
+    public function run(): void
+    {
+        return static::FAILURE;
+        return static::SUCCESS;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Source\ParentClass;
+
+final class FinalClassWithInheritedConstant extends ParentClass
+{
+    public function run(): void
+    {
+        return self::FAILURE;
+        return self::SUCCESS;
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Source/ParentClass.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Source;
+
+class ParentClass
+{
+    public const FAILURE = 1;
+    protected const SUCCESS = 0;
+}

rules-tests/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector/Fixture/parent_static_method.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\Source\BaseClass;
+
+final class ParentStaticMethod extends BaseClass
+{
+    public function test(): string
+    {
+        return static::parentMethod();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\Source\BaseClass;
+
+final class ParentStaticMethod extends BaseClass
+{
+    public function test(): string
+    {
+        return self::parentMethod();
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector/Source/BaseClass.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\Source;
+
+class BaseClass
+{
+    protected static function parentMethod(): string
+    {
+        return 'parent method';
+    }
+}

rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php

@@ -17,36 +17,41 @@
  * @see \Rector\Tests\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\ConvertStaticPrivateConstantToSelfRectorTest
  *
  * @see https://3v4l.org/8Y0ba
+ * @see https://3v4l.org/ZIeA1
  * @see https://phpstan.org/r/11d4c850-1a40-4fae-b665-291f96104d11
  */
 final class ConvertStaticPrivateConstantToSelfRector extends AbstractRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Replaces static::* access to private constants with self::*',
+            'Replaces static::* constant access with self::* for private constants and in final classes.',
             [
                 new CodeSample(
                     <<<'CODE_SAMPLE'
-final class Foo
+class Foo
 {
     private const BAR = 'bar';
+    public const BAZ = 'baz';
 
     public function run()
     {
         $bar = static::BAR;
+        $baz = static::BAZ;
     }
 }
 CODE_SAMPLE
                     ,
                     <<<'CODE_SAMPLE'
-final class Foo
+class Foo
 {
     private const BAR = 'bar';
+    public const BAZ = 'baz';
 
     public function run()
     {
         $bar = self::BAR;
+        $baz = static::BAZ;
     }
 }
 CODE_SAMPLE
@@ -68,7 +73,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Class_
     {
-        if ($node->getConstants() === []) {
+        if ($node->getConstants() === [] && ! $node->isFinal()) {
             return null;
         }
 

rules/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector.php

@@ -9,14 +9,16 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Reflection\ClassReflection;
 use Rector\Configuration\Parameter\FeatureFlags;
 use Rector\Enum\ObjectReference;
+use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
+ * @see https://3v4l.org/VbcrN
  * @see \Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector\StaticToSelfStaticMethodCallOnFinalClassRectorTest
  */
 final class StaticToSelfStaticMethodCallOnFinalClassRector extends AbstractRector
@@ -76,8 +78,14 @@ public function refactor(Node $node): ?Class_
         }
 
         $hasChanged = false;
+        $scope = ScopeFetcher::fetch($node);
+        $classReflection = $scope->getClassReflection();
 
-        $this->traverseNodesWithCallable($node->stmts, function (Node $subNode) use (&$hasChanged, $node): ?StaticCall {
+        if (! $classReflection instanceof ClassReflection) {
+            return null;
+        }
+
+        $this->traverseNodesWithCallable($node->stmts, function (Node $subNode) use (&$hasChanged, $classReflection): ?StaticCall {
             if (! $subNode instanceof StaticCall) {
                 return null;
             }
@@ -92,15 +100,15 @@ public function refactor(Node $node): ?Class_
             }
 
             $methodName = (string) $this->getName($subNode->name);
-            $targetClassMethod = $node->getMethod($methodName);
 
-            // skip call non-existing method from current class to ensure transformation is safe
-            if (! $targetClassMethod instanceof ClassMethod) {
+            if (! $classReflection->hasNativeMethod($methodName)) {
                 return null;
             }
 
+            $methodReflection = $classReflection->getNativeMethod($methodName);
+
             // avoid overlapped change
-            if (! $targetClassMethod->isStatic()) {
+            if (! $methodReflection->isStatic()) {
                 return null;
             }