fix: skip rule when its overriding the method (#387)

Co-authored-by: Geni Jaho <[email protected]>

Author: canvural

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');
     }

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/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);
+    }
+}