Merge branch 'main' into main

Author: GeniJaho

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# 87 Rules Overview
+# 88 Rules Overview
 
 ## AbortIfRector
 

src/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector.php

@@ -10,7 +10,6 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
 use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
-use Rector\Php81\NodeManipulator\AttributeGroupNewLiner;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
 use RectorLaravel\AbstractRector;
@@ -24,8 +23,7 @@ class MakeModelAttributesAndScopesProtectedRector extends AbstractRector
 {
     public function __construct(
         private readonly VisibilityManipulator $visibilityManipulator,
-        private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
-        private readonly AttributeGroupNewLiner $attributeGroupNewLiner,
+        private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer
     ) {}
 
     public function getRuleDefinition(): RuleDefinition
@@ -90,10 +88,6 @@ public function refactor(Node $node): ?Node
 
         $this->visibilityManipulator->makeProtected($node);
 
-        if ($node->attrGroups !== []) {
-            $this->attributeGroupNewLiner->newLine($this->file, $node);
-        }
-
         return $node;
     }
 

src/Rector/Expr/AppEnvironmentComparisonToParameterRector.php

@@ -113,7 +113,7 @@ private function handleBinaryOp(BinaryOp $binaryOp): array
         $methodCall = array_values(
             array_filter(
                 [$binaryOp->left, $binaryOp->right],
-                fn ($node) => $this->validMethodCall($node),
+                $this->validMethodCall(...),
             )
         )[0] ?? null;
 

src/Rector/StaticCall/DispatchToHelperFunctionsRector.php

@@ -3,7 +3,6 @@
 namespace RectorLaravel\Rector\StaticCall;
 
 use PhpParser\Node;
-use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
@@ -137,11 +136,13 @@ private function createDispatchableCall(StaticCall $staticCall, string $method):
             return null;
         }
 
-        return new FuncCall(
-            new Name($method),
-            [
-                new Arg(new New_(new FullyQualified($class), $staticCall->args)),
-            ],
+        $className = $class->isSpecialClassName()
+            ? $class
+            : new FullyQualified($class);
+
+        return $this->nodeFactory->createFuncCall(
+            $method,
+            [new New_($className, $staticCall->args)],
         );
     }
 }

tests/Rector/StaticCall/DispatchToHelperFunctionsRector/Fixture/bus_dispatchable_within_self.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Fixture;
+
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class BusDispatchableWithinSelf
+{
+    use Dispatchable;
+
+    public function handle()
+    {
+        self::dispatch();
+    }
+}
+-----
+<?php
+
+namespace RectorLaravel\Tests\Rector\StaticCall\DispatchToHelperFunctionsRector\Fixture;
+
+use Illuminate\Foundation\Bus\Dispatchable;
+
+class BusDispatchableWithinSelf
+{
+    use Dispatchable;
+
+    public function handle()
+    {
+        dispatch(new self());
+    }
+}