Merge branch 'collection-macro-classes' of https://github.com/sebasti…

…aanluca/framework into sebastiaanluca-collection-macro-classes

src/Illuminate/Contracts/Support/Macro.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Illuminate\Contracts\Support;
+
+interface Macro
+{
+    /**
+     * Return the callable macro.
+     *
+     * @return  callable
+     */
+    public function handle();
+}

src/Illuminate/Support/Traits/Macroable.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use BadMethodCallException;
+use Illuminate\Contracts\Support\Macro;
 
 trait Macroable
 {
@@ -17,11 +18,12 @@ trait Macroable
     /**
      * Register a custom macro.
      *
-     * @param  string    $name
-     * @param  callable  $macro
+     * @param  string $name
+     * @param  \Illuminate\Contracts\Support\Macro|callable  $macro
+     *
      * @return void
      */
-    public static function macro($name, callable $macro)
+    public static function macro($name, $macro)
     {
         static::$macros[$name] = $macro;
     }
@@ -74,10 +76,16 @@ public function __call($method, $parameters)
             throw new BadMethodCallException("Method {$method} does not exist.");
         }
 
-        if (static::$macros[$method] instanceof Closure) {
-            return call_user_func_array(static::$macros[$method]->bindTo($this, static::class), $parameters);
+        $macro = static::$macros[$method];
+
+        if (is_string($macro) && is_a($macro, Macro::class, true)) {
+            $macro = (new $macro)->handle();
         }
 
-        return call_user_func_array(static::$macros[$method], $parameters);
+        if ($macro instanceof Closure) {
+            return call_user_func_array($macro->bindTo($this, static::class), $parameters);
+        }
+
+        return call_user_func_array($macro, $parameters);
     }
 }