[11.x] Add parameter typing for closure to addGlobalScope method (#54677)

* Add parameter typing for closure to addGlobalScope method

* Add type for getGlobalScope as well

Author: jnoordsij

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

@@ -40,8 +40,8 @@ public static function resolveGlobalScopeAttributes()
     /**
      * Register a new global scope on the model.
      *
-     * @param  \Illuminate\Database\Eloquent\Scope|\Closure|string  $scope
-     * @param  \Illuminate\Database\Eloquent\Scope|\Closure|null  $implementation
+     * @param  \Illuminate\Database\Eloquent\Scope|(\Closure(\Illuminate\Database\Eloquent\Builder<static>): mixed)|string  $scope
+     * @param  \Illuminate\Database\Eloquent\Scope|(\Closure(\Illuminate\Database\Eloquent\Builder<static>): mixed)|null  $implementation
      * @return mixed
      *
      * @throws \InvalidArgumentException
@@ -93,7 +93,7 @@ public static function hasGlobalScope($scope)
      * Get a global scope registered with the model.
      *
      * @param  \Illuminate\Database\Eloquent\Scope|string  $scope
-     * @return \Illuminate\Database\Eloquent\Scope|\Closure|null
+     * @return \Illuminate\Database\Eloquent\Scope|(\Closure(\Illuminate\Database\Eloquent\Builder<static>): mixed)|null
      */
     public static function getGlobalScope($scope)
     {

types/Database/Eloquent/Model.php

@@ -25,6 +25,12 @@ function test(User $user, Post $post, Comment $comment, Article $article): void
         return ['string' => 'string'];
     }));
 
+    User::addGlobalScope('ancient', function ($builder) {
+        assertType('Illuminate\Database\Eloquent\Builder<User>', $builder);
+
+        $builder->where('created_at', '<', now()->subYears(2000));
+    });
+
     assertType('Illuminate\Database\Eloquent\Builder<User>', User::query());
     assertType('Illuminate\Database\Eloquent\Builder<User>', $user->newQuery());
     assertType('Illuminate\Database\Eloquent\Builder<User>', $user->withTrashed());