rework into mixins

src/Illuminate/Support/Traits/Macroable.php

@@ -3,6 +3,8 @@
 namespace Illuminate\Support\Traits;
 
 use Closure;
+use ReflectionClass;
+use ReflectionMethod;
 use BadMethodCallException;
 use Illuminate\Contracts\Support\Macro;
 
@@ -19,7 +21,7 @@ trait Macroable
      * Register a custom macro.
      *
      * @param  string $name
-     * @param  \Illuminate\Contracts\Support\Macro|callable  $macro
+     * @param  object|callable  $macro
      *
      * @return void
      */
@@ -28,6 +30,25 @@ public static function macro($name, $macro)
         static::$macros[$name] = $macro;
     }
 
+    /**
+     * Mix another object into the class.
+     *
+     * @param  object  $mixin
+     * @return void
+     */
+    public static function mixin($mixin)
+    {
+        $methods = (new ReflectionClass($mixin))->getMethods(
+            ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
+        );
+
+        foreach ($methods as $method) {
+            $method->setAccessible(true);
+
+            static::macro($method->name, $method->invoke($mixin));
+        }
+    }
+
     /**
      * Checks if macro is registered.
      *
@@ -78,10 +99,6 @@ public function __call($method, $parameters)
 
         $macro = static::$macros[$method];
 
-        if (is_string($macro) && is_a($macro, Macro::class, true)) {
-            $macro = (new $macro)->handle();
-        }
-
         if ($macro instanceof Closure) {
             return call_user_func_array($macro->bindTo($this, static::class), $parameters);
         }

tests/Support/SupportMacroableTest.php

@@ -53,6 +53,13 @@ public function testWhenCallingMacroClosureIsBoundToObject()
         $result = TestMacroable::tryStatic();
         $this->assertEquals('static', $result);
     }
+
+    public function testClassBasedMacros()
+    {
+        TestMacroable::mixin(new TestMixin);
+        $instance = new TestMacroable;
+        $this->assertEquals('instance-Adam', $instance->methodOne('Adam'));
+    }
 }
 
 class TestMacroable
@@ -66,3 +73,20 @@ protected static function getProtectedStatic()
         return 'static';
     }
 }
+
+class TestMixin
+{
+    public function methodOne()
+    {
+        return function ($value) {
+            return $this->methodTwo($value);
+        };
+    }
+
+    protected function methodTwo()
+    {
+        return function ($value) {
+            return $this->protectedVariable.'-'.$value;
+        };
+    }
+}