Rebind $this for static closure macros

laravel · Aug 13, 2019 · f3b4512 · f3b4512
1 parent 11b6941
commit f3b4512
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Illuminate/Support/Traits/Macroable.php b/src/Illuminate/Support/Traits/Macroable.php
@@ -5,6 +5,7 @@
 use Closure;
 use ReflectionClass;
 use ReflectionMethod;
+use ReflectionFunction;
 use BadMethodCallException;
 
 trait Macroable
@@ -80,11 +81,15 @@ public static function __callStatic($method, $parameters)
             ));
         }
 
-        if (static::$macros[$method] instanceof Closure) {
-            return call_user_func_array(Closure::bind(static::$macros[$method], null, static::class), $parameters);
+        $macro = static::$macros[$method];
+
+        if ($macro instanceof Closure) {
+            $newThis = (new ReflectionFunction($macro))->getClosureThis();
+
+            return call_user_func_array($macro->bindTo($newThis), $parameters);
         }
 
-        return call_user_func_array(static::$macros[$method], $parameters);
+        return call_user_func_array($macro, $parameters);
     }
 
     /**