13.x-scopedby-inheritence

ensure it works with inheritence

Author: jackbayliss

src/Illuminate/Database/Eloquent/Concerns/HasGlobalScopes.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Database\Eloquent\Attributes\ScopedBy;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -38,8 +39,15 @@ public static function resolveGlobalScopeAttributes()
             $attributes->push(...$trait->getAttributes(ScopedBy::class, ReflectionAttribute::IS_INSTANCEOF));
         }
 
+        $isEloquentGrandchild = is_subclass_of(static::class, Model::class)
+            && get_parent_class(static::class) !== Model::class;
+
         return $attributes->map(fn ($attribute) => $attribute->getArguments())
             ->flatten()
+            ->when($isEloquentGrandchild, function (Collection $attributes) {
+                return (new Collection(get_parent_class(static::class)::resolveGlobalScopeAttributes()))
+                    ->merge($attributes);
+            })
             ->all();
     }
 

tests/Database/DatabaseEloquentGlobalScopesTest.php

@@ -68,6 +68,14 @@ public function testGlobalScopeInInheritedAttributeIsApplied()
         $this->assertEquals([1], $query->getBindings());
     }
 
+    public function testGlobalScopeInParentClassAttributeIsApplied()
+    {
+        $model = new EloquentGlobalScopeInAttributeChildTestModel;
+        $query = $model->newQuery();
+        $this->assertSame('select * from "table" where "active" = ?', $query->toSql());
+        $this->assertEquals([1], $query->getBindings());
+    }
+
     public function testClosureGlobalScopeIsApplied()
     {
         $model = new EloquentClosureGlobalScopesTestModel;
@@ -325,3 +333,14 @@ class EloquentGlobalScopeInInheritedAttributeTestModel extends Model
 
     protected $table = 'table';
 }
+
+#[ScopedBy(ActiveScope::class)]
+class EloquentGlobalScopeInAttributeParentTestModel extends Model
+{
+    protected $table = 'table';
+}
+
+class EloquentGlobalScopeInAttributeChildTestModel extends EloquentGlobalScopeInAttributeParentTestModel
+{
+    //
+}