[ci] fail on missed final class

Author: TomasVotruba

.github/workflows/code_analysis.yaml

@@ -50,7 +50,7 @@ jobs:
 
                     -
                         name: 'Finalize classes'
-                        run: vendor/bin/swiss-knife finalize-classes src tests
+                        run: vendor/bin/swiss-knife finalize-classes src tests --dry-run
 
                     -
                         name: 'Detect composer dependency issues'

rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeFromTryCatchTypeRector/config/configured_rule_with_treat_classes_as_final.php

@@ -101,16 +101,16 @@ public function configure(array $configuration): void
         $this->arrayDimFetchToMethodCalls = $configuration;
     }
 
-    private function handleIsset(Isset_ $node): Expr|int|null
+    private function handleIsset(Isset_ $isset): Expr|int|null
     {
         $issets = [];
         $exprs = [];
 
-        foreach ($node->vars as $var) {
+        foreach ($isset->vars as $var) {
             if ($var instanceof ArrayDimFetch) {
                 $methodCall = $this->getMethodCall($var, 'exists');
 
-                if ($methodCall !== null) {
+                if ($methodCall instanceof MethodCall) {
                     $exprs[] = $methodCall;
                     continue;
                 }
@@ -124,30 +124,30 @@ private function handleIsset(Isset_ $node): Expr|int|null
         }
 
         if ($issets !== []) {
-            $node->vars = $issets;
-            array_unshift($exprs, $node);
+            $isset->vars = $issets;
+            array_unshift($exprs, $isset);
         }
 
         return array_reduce(
             $exprs,
-            fn (?Expr $carry, Expr $expr) => $carry === null ? $expr : new BooleanAnd($carry, $expr),
+            fn (?Expr $carry, Expr $expr): Isset_|MethodCall|BooleanAnd => $carry instanceof Expr ? new BooleanAnd($carry, $expr) : $expr,
             null,
         );
     }
 
     /**
      * @return Stmt[]|int
      */
-    private function handleUnset(Unset_ $node): array|int
+    private function handleUnset(Unset_ $unset): array|int
     {
         $unsets = [];
         $stmts = [];
 
-        foreach ($node->vars as $var) {
+        foreach ($unset->vars as $var) {
             if ($var instanceof ArrayDimFetch) {
                 $methodCall = $this->getMethodCall($var, 'unset');
 
-                if ($methodCall !== null) {
+                if ($methodCall instanceof MethodCall) {
                     $stmts[] = new Expression($methodCall);
                     continue;
                 }
@@ -161,8 +161,8 @@ private function handleUnset(Unset_ $node): array|int
         }
 
         if ($unsets !== []) {
-            $node->vars = $unsets;
-            array_unshift($stmts, $node);
+            $unset->vars = $unsets;
+            array_unshift($stmts, $unset);
         }
 
         return $stmts;
@@ -171,14 +171,14 @@ private function handleUnset(Unset_ $node): array|int
     /**
      * @param 'get'|'set'|'exists'|'unset' $action
      */
-    private function getMethodCall(ArrayDimFetch $fetch, string $action, ?Expr $value = null): ?MethodCall
+    private function getMethodCall(ArrayDimFetch $arrayDimFetch, string $action, ?Expr $expr = null): ?MethodCall
     {
-        if (!$fetch->dim instanceof Node) {
+        if (!$arrayDimFetch->dim instanceof Node) {
             return null;
         }
 
         foreach ($this->arrayDimFetchToMethodCalls as $arrayDimFetchToMethodCall) {
-            if (!$this->isObjectType($fetch->var, $arrayDimFetchToMethodCall->getObjectType())) {
+            if (!$this->isObjectType($arrayDimFetch->var, $arrayDimFetchToMethodCall->getObjectType())) {
                 continue;
             }
 
@@ -193,13 +193,13 @@ private function getMethodCall(ArrayDimFetch $fetch, string $action, ?Expr $valu
                 continue;
             }
 
-            $args = [new Arg($fetch->dim)];
+            $args = [new Arg($arrayDimFetch->dim)];
 
-            if ($value instanceof Expr) {
-                $args[] = new Arg($value);
+            if ($expr instanceof Expr) {
+                $args[] = new Arg($expr);
             }
 
-            return new MethodCall($fetch->var, $method, $args);
+            return new MethodCall($arrayDimFetch->var, $method, $args);
         }
 
         return null;

rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeFromTryCatchTypeRector/config/intersection_config.php

@@ -160,7 +160,7 @@ private function matchReturnType(TryCatch|Catch_ $tryOrCatch): ?Type
                 continue;
             }
 
-            return $this->nodeTypeResolver->getType($stmt->expr);
+            return $this->nodeTypeResolver->getNativeType($stmt->expr);
         }
 
         return null;