Merge pull request #357 from laravel/laravel-12-scope-attributes

Support for Laravel 12 scope attributes

Author: joetannenbaum

package-lock.json

@@ -3,7 +3,7 @@
     "publisher": "laravel",
     "displayName": "Laravel",
     "description": "Official VS Code extension for Laravel",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "engines": {
         "vscode": "^1.89.0"
     },

package.json

@@ -155,7 +155,7 @@ protected function getInfo($className)
             ->toArray();
 
         $data['scopes'] = collect($reflection->getMethods())
-            ->filter(fn($method) => $method->isPublic() && !$method->isStatic() && str_starts_with($method->name, 'scope'))
+            ->filter(fn($method) =>!$method->isStatic() && ($method->getAttributes(\Illuminate\Database\Eloquent\Attributes\Scope::class) || ($method->isPublic() && str_starts_with($method->name, 'scope'))))
             ->map(fn($method) => str($method->name)->replace('scope', '')->lcfirst()->toString())
             ->values()
             ->toArray();
@@ -175,8 +175,8 @@ public function methods()
     {
         $reflection = new \ReflectionClass(\Illuminate\Database\Query\Builder::class);
 
-        return collect($reflection->getMethods(\ReflectionMethod::IS_PUBLIC))
-            ->filter(fn(ReflectionMethod $method) => !str_starts_with($method->getName(), "__"))
+        return collect($reflection->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED))
+            ->filter(fn(ReflectionMethod $method) => !str_starts_with($method->getName(), "__") || (!$method->isPublic() && empty($method->getAttributes(\Illuminate\Database\Eloquent\Attributes\Scope::class))))
             ->map(fn(\ReflectionMethod $method) => $this->getMethodInfo($method))
             ->filter()
             ->values();

php-templates/models.php

@@ -155,7 +155,7 @@ $models = new class($factory) {
             ->toArray();
 
         $data['scopes'] = collect($reflection->getMethods())
-            ->filter(fn($method) => $method->isPublic() && !$method->isStatic() && str_starts_with($method->name, 'scope'))
+            ->filter(fn($method) =>!$method->isStatic() && ($method->getAttributes(\\Illuminate\\Database\\Eloquent\\Attributes\\Scope::class) || ($method->isPublic() && str_starts_with($method->name, 'scope'))))
             ->map(fn($method) => str($method->name)->replace('scope', '')->lcfirst()->toString())
             ->values()
             ->toArray();
@@ -175,8 +175,8 @@ $builder = new class($docblocks) {
     {
         $reflection = new \\ReflectionClass(\\Illuminate\\Database\\Query\\Builder::class);
 
-        return collect($reflection->getMethods(\\ReflectionMethod::IS_PUBLIC))
-            ->filter(fn(ReflectionMethod $method) => !str_starts_with($method->getName(), "__"))
+        return collect($reflection->getMethods(\\ReflectionMethod::IS_PUBLIC | \\ReflectionMethod::IS_PROTECTED))
+            ->filter(fn(ReflectionMethod $method) => !str_starts_with($method->getName(), "__") || (!$method->isPublic() && empty($method->getAttributes(\\Illuminate\\Database\\Eloquent\\Attributes\\Scope::class))))
             ->map(fn(\\ReflectionMethod $method) => $this->getMethodInfo($method))
             ->filter()
             ->values();