[9.x] Allow using static closures as callable for macros (#43589)

* [9.x] Allow using static closures as callable for macros * Update Macroable.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
laravel · Aug 8, 2022 · 93090dc · 93090dc
1 parent 56c6314
commit 93090dc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Illuminate/Macroable/Traits/Macroable.php b/src/Illuminate/Macroable/Traits/Macroable.php
@@ -5,6 +5,7 @@
 use BadMethodCallException;
 use Closure;
 use ReflectionClass;
+use ReflectionFunction;
 use ReflectionMethod;
 
 trait Macroable
@@ -118,7 +119,15 @@ public function __call($method, $parameters)
         $macro = static::$macros[$method];
 
         if ($macro instanceof Closure) {
-            $macro = $macro->bindTo($this, static::class);
+            $reflection = new ReflectionFunction($macro);
+
+            $bindable = $reflection->getClosureScopeClass() === null || $reflection->getClosureThis() !== null;
+
+            if ($bindable) {
+                $macro = $macro->bindTo($this, static::class);
+            } else {
+                $macro = $macro->bindTo(null, static::class);
+            }
         }
 
         return $macro(...$parameters);

diff --git a/tests/Support/SupportMacroableTest.php b/tests/Support/SupportMacroableTest.php
@@ -75,6 +75,18 @@ public function testClassBasedMacrosNoReplace()
         $this->assertSame('foo', $instance->methodThree());
     }
 
+    public function testSettingMacroUsingStaticClosures()
+    {
+        TestMacroable::macro('staticFn', static function () {
+            return 'I am unbound.';
+        });
+        TestMacroable::macro('speed', static fn () => 'I am speed.');
+        $instance = new TestMacroable;
+
+        $this->assertSame('I am unbound.', $instance->staticFn());
+        $this->assertSame('I am speed.', $instance->speed());
+    }
+
     public function testFlushMacros()
     {
         TestMacroable::macro('flushMethod', function () {