Merge branch 'driftingly:main' into feat/array-to-data_get-rule

Author: MrPunyapal

src/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector.php

@@ -113,6 +113,14 @@ private function shouldSkipNode(ClassMethod $classMethod, Scope $scope): bool
             return true;
         }
 
+        if (
+            $classReflection->getParentClass() instanceof ClassReflection &&
+            $classReflection->getParentClass()->hasMethod($this->getName($classMethod)) &&
+            $classReflection->getParentClass()->getMethod($this->getName($classMethod), $scope)->isPublic()
+        ) {
+            return true;
+        }
+
         return ! $classReflection->isTrait()
             && ! $classReflection->is('Illuminate\Database\Eloquent\Model');
     }
@@ -136,7 +144,7 @@ private function isScopeMethod(ClassMethod $classMethod): bool
     {
         $name = $this->getName($classMethod);
 
-        if (str_starts_with((string) $name, 'scope')) {
+        if ((bool) preg_match('/^scope.+$/', $name)) {
             return true;
         }
 

src/Rector/MethodCall/ContainerBindConcreteWithClosureOnlyRector.php

@@ -6,6 +6,7 @@
 use PhpParser\Node\Const_;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
@@ -74,6 +75,10 @@ public function refactor(Node $node): ?MethodCall
         $classString = $node->getArgs()[0]->value;
         $concreteNode = $node->getArgs()[1]->value;
 
+        if ($classString instanceof Variable) {
+            return null;
+        }
+
         if (! $concreteNode instanceof Closure) {
             return null;
         }

src/Rector/MethodCall/ConvertEnumerableToArrayToAllRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Identifier;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TypeCombinator;
+use Rector\PHPStan\ScopeFetcher;
 use RectorLaravel\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -62,7 +63,12 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $type = TypeCombinator::removeNull($this->getType($node->var));
+        $scope = ScopeFetcher::fetch($node);
+        $type = TypeCombinator::removeNull(
+            // This HAS to use the $scope->getType() as opposed to $this->getType()
+            // because it's not getting the proper type from the Larastan extensions
+            $scope->getType($node->var)
+        );
         $valueType = $type->getTemplateType('Illuminate\Support\Enumerable', 'TValue');
 
         if (! (new ObjectType('Illuminate\Contracts\Support\Arrayable'))->isSuperTypeOf($valueType)->no()) {

tests/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector/Fixture/skip-child-class.php.inc

@@ -0,0 +1,22 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ClassMethod\MakeModelAttributesAndScopesProtectedRector\Fixture;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Builder;
+use RectorLaravel\Tests\Rector\ClassMethod\MakeModelAttributesAndScopesProtectedRector\Source\ParentUser;
+
+class User extends ParentUser
+{
+    protected function firstName(): Attribute
+    {
+        return Attribute::get(fn () => ucfirst($this->first_name));
+    }
+
+    public function scopeActive(Builder $query): Builder
+    {
+        return $query->where('active', true);
+    }
+}
+
+?>

tests/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector/Fixture/skip_scope_method_not_scope.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ClassMethod\MakeModelAttributesAndScopesProtectedRector\Fixture;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SkipScopeMethodNotScope extends Model
+{
+    public function scope(): string
+    {
+        return 'foo';
+    }
+}
+
+?>

tests/Rector/ClassMethod/MakeModelAttributesAndScopesProtectedRector/Source/ParentUser.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ClassMethod\MakeModelAttributesAndScopesProtectedRector\Source;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+class ParentUser extends Model
+{
+    public function scopeActive(Builder $query): Builder
+    {
+        return $query->where('active', true);
+    }
+}

tests/Rector/MethodCall/ContainerBindConcreteWithClosureOnlyRector/Fixture/fixture.php.inc

@@ -19,6 +19,12 @@ $app->singleton(SomeInterface::class, function () {
     return new SomeClass();
 });
 
+foreach ([SomeClass::class] as $item) {
+    $app->singleton($item, function () use ($item) {
+        return new $item();
+    });
+}
+
 ?>
 -----
 <?php
@@ -42,4 +48,10 @@ $app->singleton(function (): \RectorLaravel\Tests\Rector\MethodCall\ContainerBin
     return new SomeClass();
 });
 
+foreach ([SomeClass::class] as $item) {
+    $app->singleton($item, function () use ($item) {
+        return new $item();
+    });
+}
+
 ?>