[ci] Cleanup + finalise classes (#6248)

* cleanup * [ci] add finalize check + finalise
rectorphp · Aug 22, 2024 · be50454 · be50454
1 parent 8aaee5e
commit be50454
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -42,18 +42,17 @@ jobs:
                         run: |
                             vendor/bin/class-leak check bin config src rules utils \
                                 --skip-suffix "Rector" \
-                                --skip-type="Rector\\Set\\Contract\\SetProviderInterface" \
                                 --skip-type="Rector\\Utils\\Compiler\\Unprefixer" \
-                                --skip-type="Rector\\NodeTypeResolver\\PHPStan\\Scope\\Contract\\NodeVisitor\\ScopeResolverNodeVisitorInterface" \
-                                --skip-type="Rector\\PhpDocParser\\PhpParser\\SmartPhpParserFactory" \
-                                --skip-type="Rector\\BetterPhpDocParser\\Contract\\BasePhpDocNodeVisitorInterface" \
-                                --skip-type="Rector\\BetterPhpDocParser\\Contract\\PhpDocParser\\PhpDocNodeDecoratorInterface" \
-                                --skip-type="Rector\\BetterPhpDocParser\\ValueObject\\Type\\FullyQualifiedIdentifierTypeNode"
+                                --skip-type="Rector\\PhpDocParser\\PhpParser\\SmartPhpParserFactory"
 
                     -
                         name: 'Compatible PHPStan versions'
                         run: php bin/validate-phpstan-version.php
 
+                    -
+                        name: 'Finalize classes'
+                        run: vendor/bin/swiss-knife finalize-classes src tests
+
                     -
                         name: 'Detect composer dependency issues'
                         run: vendor/bin/composer-dependency-analyser

diff --git a/bin/add-phpstan-self-replace.php b/bin/add-phpstan-self-replace.php
@@ -4,17 +4,17 @@
 
 declare(strict_types=1);
 
-use PackageVersions\Versions;
 use Nette\Utils\FileSystem;
 use Nette\Utils\Json;
+use PackageVersions\Versions;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $composerJsonFileContents = FileSystem::read(__DIR__ . '/../composer.json');
 
 $composerJson = Json::decode($composerJsonFileContents, forceArrays: true);
 // result output is like: // 1.0.0@0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
-[$phpstanVersion, ] = explode('@', Versions::getVersion('phpstan/phpstan'));
+[$phpstanVersion] = explode('@', Versions::getVersion('phpstan/phpstan'));
 $composerJson['replace']['phpstan/phpstan'] = $phpstanVersion;
 
 $modifiedComposerJsonFileContents = Json::encode($composerJson, pretty: true);

diff --git a/src/PostRector/Guard/AddUseStatementGuard.php b/src/PostRector/Guard/AddUseStatementGuard.php
@@ -9,7 +9,7 @@
 use PhpParser\Node\Stmt\Namespace_;
 use Rector\PhpParser\Node\BetterNodeFinder;
 
-class AddUseStatementGuard
+final class AddUseStatementGuard
 {
     /**
      * @var array<string, bool>
@@ -45,6 +45,9 @@ public function shouldTraverse(array $stmts, string $filePath): bool
             }
         }
 
-        return $this->shouldTraverseOnFiles[$filePath] = ! $this->betterNodeFinder->hasInstancesOf($stmts, [InlineHTML::class]);
+        return $this->shouldTraverseOnFiles[$filePath] = ! $this->betterNodeFinder->hasInstancesOf(
+            $stmts,
+            [InlineHTML::class]
+        );
     }
 }
diff --git a/tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/Source/RoutePropertyClass.php b/tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfoPrinter/Source/RoutePropertyClass.php
@@ -6,7 +6,7 @@
 
 use Symfony\Component\Routing\Annotation\Route;
 
-class RoutePropertyClass
+final class RoutePropertyClass
 {
     /**
      * @Route(

diff --git a/...erPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/SiblingClass.php b/...erPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Fixture/ExistingClass/SiblingClass.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher\Fixture\ExistingClass;
 
-class SiblingClass
+final class SiblingClass
 {
 
 }
diff --git a/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Source/KnownClass.php b/tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/Source/KnownClass.php
@@ -2,6 +2,6 @@
 
 namespace Rector\Tests\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher\Source;
 
-class KnownClass
+final class KnownClass
 {
 }
diff --git a/tests/BetterPhpDocParser/PhpDocParser/TagValueNodeReprint/Source/ApiFilter.php b/tests/BetterPhpDocParser/PhpDocParser/TagValueNodeReprint/Source/ApiFilter.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target({"PROPERTY", "CLASS"})
  */
-class ApiFilter
+final class ApiFilter
 {
     public function __construct($options = [])
     {

diff --git a/tests/Issues/AutoImport/Source/Annotation/SomeEnum.php b/tests/Issues/AutoImport/Source/Annotation/SomeEnum.php
@@ -10,7 +10,7 @@
  * @Annotation
  * @Target({"METHOD"})
  */
-class SomeEnum
+final class SomeEnum
 {
 
 }
diff --git a/tests/Issues/AutoImport/Source/Annotation/SomeEnum2.php b/tests/Issues/AutoImport/Source/Annotation/SomeEnum2.php
@@ -10,7 +10,7 @@
  * @Annotation
  * @Target({"METHOD"})
  */
-class SomeEnum2
+final class SomeEnum2
 {
 
 }
diff --git a/tests/Issues/AutoImport/Source/SomeClass.php b/tests/Issues/AutoImport/Source/SomeClass.php
@@ -4,7 +4,7 @@
 
 namespace Rector\Tests\Issues\AutoImport\Source;
 
-class SomeClass
+final class SomeClass
 {
     public static function zero(): int
     {

diff --git a/tests/Issues/AutoImport/Source/stdClass.php b/tests/Issues/AutoImport/Source/stdClass.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\Issues\AutoImport\Source;
 
-class stdClass
+final class stdClass
 {
 }
diff --git a/tests/Issues/AutoImportShortName/Source/DateTime.php b/tests/Issues/AutoImportShortName/Source/DateTime.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\Issues\AutoImportShortName\Source;
 
-class DateTime
+final class DateTime
 {
 }
diff --git a/tests/Issues/DeadInstanceFlip/Source/SomeEvent.php b/tests/Issues/DeadInstanceFlip/Source/SomeEvent.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Issues\DeadInstanceFlip\Source;
 
-class SomeEvent
+final class SomeEvent
 {
     public function getSomeType(): SomeEventType
     {

diff --git a/tests/Issues/EmptyLongArraySyntax/Source/ParentWithEmptyLongArray.php b/tests/Issues/EmptyLongArraySyntax/Source/ParentWithEmptyLongArray.php
@@ -4,7 +4,7 @@
 
 namespace Rector\Tests\Issues\EmptyLongArraySyntax\Source;
 
-class ParentWithEmptyLongArray
+final class ParentWithEmptyLongArray
 {
     public function run($default = array())
     {

diff --git a/tests/Issues/Issue7099/Source/Document.php b/tests/Issues/Issue7099/Source/Document.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Issues\Issue7099\Source;
 
-class Document
+final class Document
 {
 
 }
diff --git a/tests/Issues/IssueAnnotation/Source/SomeAttributes.php b/tests/Issues/IssueAnnotation/Source/SomeAttributes.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Issues\IssueAnnotation\Source;
 
-class SomeAttributes
+final class SomeAttributes
 {
     public function __construct(array $tags)
     {

diff --git a/tests/Issues/NamespacedUse/Source/SomeClass.php b/tests/Issues/NamespacedUse/Source/SomeClass.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\Issues\NamespacedUse\Source;
 
-class SomeClass
+final class SomeClass
 {
 }
diff --git a/tests/Issues/NamespacedUseAutoImport/Source/SomeClass.php b/tests/Issues/NamespacedUseAutoImport/Source/SomeClass.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\Issues\NamespacedUseAutoImport\Source;
 
-class SomeClass
+final class SomeClass
 {
 }
diff --git a/tests/Issues/NoNamespaced/Source/SomeClass.php b/tests/Issues/NoNamespaced/Source/SomeClass.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\Issues\NoNamespaced\Source;
 
-class SomeClass
+final class SomeClass
 {
 }
diff --git a/tests/Issues/PlainValueParser/Source/CustomAnnotation.php b/tests/Issues/PlainValueParser/Source/CustomAnnotation.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Issues\PlainValueParser\Source;
 
-class CustomAnnotation
+final class CustomAnnotation
 {
     public function __construct(public string $description)
     {

diff --git a/tests/Issues/ReplaceStmtToExpr/Source/SomeUser.php b/tests/Issues/ReplaceStmtToExpr/Source/SomeUser.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Issues\ReplaceStmtToExpr\Source;
 
-class SomeUser
+final class SomeUser
 {
 
 }
diff --git a/...esolver/PerNodeTypeResolver/ClassAndInterfaceTypeResolver/Source/ClassWithParentTrait.php b/...esolver/PerNodeTypeResolver/ClassAndInterfaceTypeResolver/Source/ClassWithParentTrait.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\ClassAndInterfaceTypeResolver\Source;
 
-class ClassWithParentTrait extends ClassWithTrait
+final class ClassWithParentTrait extends ClassWithTrait
 {
 }
diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/NameTypeResolver/Source/ParentCall.php b/tests/NodeTypeResolver/PerNodeTypeResolver/NameTypeResolver/Source/ParentCall.php
@@ -4,7 +4,7 @@
 
 use Rector\Tests\NodeTypeResolver\Source\AnotherClass;
 
-class ParentCall extends AnotherClass
+final class ParentCall extends AnotherClass
 {
     public function getParameters()
     {

diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/NewTypeResolver/Source/NewDynamicNew.php b/tests/NodeTypeResolver/PerNodeTypeResolver/NewTypeResolver/Source/NewDynamicNew.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\NewTypeResolver\Source;
 
-class NewDynamicNew
+final class NewDynamicNew
 {
     public function run($class)
     {

diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/NewTypeResolver/Source/NewDynamicNewExtends.php b/tests/NodeTypeResolver/PerNodeTypeResolver/NewTypeResolver/Source/NewDynamicNewExtends.php
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\NewTypeResolver\Source;
 
-class NewDynamicNewExtends
+final class NewDynamicNewExtends
 {
     public function run()
     {

diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyFetchTypeResolver/Source/Abc.php b/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyFetchTypeResolver/Source/Abc.php
@@ -4,6 +4,6 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\PropertyFetchTypeResolver\Source;
 
-class Abc
+final class Abc
 {
 }
diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/ActionClass.php b/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/ActionClass.php
@@ -4,7 +4,7 @@
 
 use Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\PropertyTypeResolver\Source\SomeChild;
 
-class ActionClass
+final class ActionClass
 {
     /**
      * @var SomeChild|null

diff --git a/...NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/ClassThatExtendsHtml.php b/...NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/ClassThatExtendsHtml.php
@@ -4,7 +4,7 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\PropertyTypeResolver\Source;
 
-class ClassThatExtendsHtml extends Html
+final class ClassThatExtendsHtml extends Html
 {
 
 }
diff --git a/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/Enum.php b/tests/NodeTypeResolver/PerNodeTypeResolver/PropertyTypeResolver/Source/Enum.php
@@ -4,7 +4,7 @@
 
 namespace Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\PropertyTypeResolver\Source;
 
-class Enum
+final class Enum
 {
     const MODE_ADD = 'add';
     const MODE_EDIT = 'edit';