[12.x] Add NamedScope attribute

src/Illuminate/Database/Eloquent/Attributes/NamedScope.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Illuminate\Database\Eloquent\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+class NamedScoped
+{
+    /**
+     * Create a new attribute instance.
+     *
+     * @param  array|string  $classes
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+}

src/Illuminate/Database/Eloquent/Model.php

@@ -11,6 +11,7 @@
 use Illuminate\Contracts\Support\CanBeEscapedWhenCastToString;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
+use Illuminate\Database\Eloquent\Attributes\NamedScope;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
@@ -24,6 +25,7 @@
 use JsonException;
 use JsonSerializable;
 use LogicException;
+use ReflectionMethod;
 use Stringable;
 
 abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToString, HasBroadcastChannel, Jsonable, JsonSerializable, QueueableEntity, Stringable, UrlRoutable
@@ -1631,6 +1633,22 @@ public function newPivot(self $parent, array $attributes, $table, $exists, $usin
             : Pivot::fromAttributes($parent, $attributes, $table, $exists);
     }
 
+    protected function getAttributedNamedScope(string $scope): ?string
+    {
+        if (! method_exists($this, $scope)) {
+            return null;
+        }
+
+        $method = new ReflectionMethod($this, $scope);
+        $attribute = $method->getAttributes(NamedScope::class);
+
+        if ($attribute === []) {
+            return null;
+        }
+
+        return $method->name;
+    }
+
     /**
      * Determine if the model has a given scope.
      *
@@ -1639,7 +1657,7 @@ public function newPivot(self $parent, array $attributes, $table, $exists, $usin
      */
     public function hasNamedScope($scope)
     {
-        return method_exists($this, 'scope'.ucfirst($scope));
+        return method_exists($this, 'scope'.ucfirst($scope)) || $this->getAttributedNamedScope($scope) !== null;
     }
 
     /**
@@ -1651,6 +1669,10 @@ public function hasNamedScope($scope)
      */
     public function callNamedScope($scope, array $parameters = [])
     {
+        if (($method = $this->getAttributedNamedScope($scope)) !== null) {
+            return $this->{$method}(...$parameters);
+        }
+
         return $this->{'scope'.ucfirst($scope)}(...$parameters);
     }
 

tests/Integration/Database/EloquentModelScopeTest.php

@@ -2,6 +2,8 @@
 
 namespace Illuminate\Tests\Integration\Database;
 
+use Illuminate\Contracts\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Attributes\NamedScope;
 use Illuminate\Database\Eloquent\Model;
 
 class EloquentModelScopeTest extends DatabaseTestCase
@@ -19,12 +21,25 @@ public function testModelDoesNotHaveScope()
 
         $this->assertFalse($model->hasNamedScope('doesNotExist'));
     }
+
+    public function testModelHasAttributedScope()
+    {
+        $model = new TestScopeModel1;
+
+        $this->assertTrue($model->hasNamedScope('existsAsWell'));
+    }
 }
 
 class TestScopeModel1 extends Model
 {
-    public function scopeExists()
+    public function scopeExists(Builder $builder)
+    {
+        return $builder;
+    }
+
+    #[NamedScope]
+    protected function existsAsWell(Builder $builder)
     {
-        return true;
+        return $builder;
     }
 }