rectorphp · TomasVotruba · Aug 22, 2025 · Aug 21, 2025
diff --git a/...ConvertStaticPrivateConstantToSelfRector/ConvertStaticPrivateConstantToSelfRectorTest.php b/...ConvertStaticPrivateConstantToSelfRector/ConvertStaticPrivateConstantToSelfRectorTest.php
diff --git a/...ssConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/change-in-non-final.php.inc b/...ssConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/change-in-non-final.php.inc
diff --git a/...vertStaticPrivateConstantToSelfRector/Fixture/final_class_with_inherited_constant.php.inc b/...vertStaticPrivateConstantToSelfRector/Fixture/final_class_with_inherited_constant.php.inc
diff --git a/...r/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/on_final_class.php.inc b/...r/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/on_final_class.php.inc
diff --git a/...tch/ConvertStaticPrivateConstantToSelfRector/Fixture/private-constant-with-static.php.inc b/...tch/ConvertStaticPrivateConstantToSelfRector/Fixture/private-constant-with-static.php.inc
diff --git a/...Fetch/ConvertStaticPrivateConstantToSelfRector/Fixture/replace-in-private-methods.php.inc b/...Fetch/ConvertStaticPrivateConstantToSelfRector/Fixture/replace-in-private-methods.php.inc
diff --git a/...lassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-already-self.php.inc b/...lassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-already-self.php.inc
diff --git a/...h/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-constant-from-other-class.php.inc b/...h/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-constant-from-other-class.php.inc
diff --git a/...ConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-other-visibility.php.inc b/...ConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-other-visibility.php.inc
diff --git a/...ty/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Source/ParentClass.php b/...ty/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/Source/ParentClass.php
diff --git a/...Quality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/config/config.php b/...Quality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector/config/config.php
diff --git a/...taticMethodCallOnFinalClassRectorTest.php → ...fRector/ConvertStaticToSelfRectorTest.php b/...taticMethodCallOnFinalClassRectorTest.php → ...fRector/ConvertStaticToSelfRectorTest.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\CodeQuality\Rector\Class_\StaticToSelfStaticMethodCallOnFinalClassRector;
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class StaticToSelfStaticMethodCallOnFinalClassRectorTest extends AbstractRectorTestCase
+final class ConvertStaticToSelfRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void

diff --git a/...sts/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/final_class_basic.php.inc b/...sts/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/Fixture/final_class_basic.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+final class FinalClassBasic
+{
+    public const SUCCESS = 'success';
+
+    public static string $property = 'value';
+
+    public static function run(): void
+    {
+    }
+
+    public function execute()
+    {
+        static::run();
+        static::$property;
+        static::SUCCESS;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+final class FinalClassBasic
+{
+    public const SUCCESS = 'success';
+
+    public static string $property = 'value';
+
+    public static function run(): void
+    {
+    }
+
+    public function execute()
+    {
+        self::run();
+        self::$property;
+        self::SUCCESS;
+    }
+}
+
+?>
diff --git a/...ity/Rector/Class_/ConvertStaticToSelfRector/Fixture/final_class_inherited_members.php.inc b/...ity/Rector/Class_/ConvertStaticToSelfRector/Fixture/final_class_inherited_members.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Source\BaseClass;
+
+final class FinalClassInheritedMembers extends BaseClass
+{
+    public function run(): void
+    {
+        static::SUCCESS;
+        static::$parentProperty;
+        static::parentMethod();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Source\BaseClass;
+
+final class FinalClassInheritedMembers extends BaseClass
+{
+    public function run(): void
+    {
+        self::SUCCESS;
+        self::$parentProperty;
+        self::parentMethod();
+    }
+}
+
+?>
diff --git a/...ity/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc b/...ity/Rector/Class_/ConvertStaticToSelfRector/Fixture/non_final_class_final_members.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+class NonFinalClassFinalMembers
+{
+    final public const BAR = 1;
+
+    final public static string $privateProperty = 'test';
+
+    final public static function privateMethod(): void
+    {
+    }
+
+    public function run()
+    {
+        static::$privateProperty;
+        static::privateMethod();
+        static::BAR;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\ConvertStaticToSelfRector\Fixture;
+
+class NonFinalClassFinalMembers
+{
+    final public const BAR = 1;
+
+    final public static string $privateProperty = 'test';
+
+    final public static function privateMethod(): void
+    {
+    }
+
+    public function run()
+    {
+        self::$privateProperty;
+        self::privateMethod();
+        self::BAR;
+    }
+}
+
+?>