[5.4] Macroable relations (#17707)

* Make relation macroable * Add test for macroable relations
laravel · Feb 1, 2017 · 17a976a · 17a976a
1 parent b39d7e2
commit 17a976a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -5,12 +5,17 @@
 use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Eloquent\Collection;
 
 abstract class Relation
 {
+    use Macroable {
+        __call as macroCall;
+    }
+
     /**
      * The Eloquent query builder instance.
      *
@@ -328,6 +333,10 @@ protected static function buildMorphMapFromModels(array $models = null)
      */
     public function __call($method, $parameters)
     {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
         $result = call_user_func_array([$this->query, $method], $parameters);
 
         if ($result === $this->query) {

diff --git a/tests/Database/DatabaseEloquentRelationTest.php b/tests/Database/DatabaseEloquentRelationTest.php
@@ -64,6 +64,19 @@ public function testSettingMorphMapWithNumericKeys()
 
         Relation::morphMap([], false);
     }
+
+    public function testMacroable()
+    {
+        Relation::macro('foo', function () {
+            return 'foo';
+        });
+
+        $model = new EloquentRelationResetModelStub();
+        $relation = new EloquentRelationStub($model->newQuery(), $model);
+
+        $result = $relation->foo();
+        $this->assertEquals('foo', $result);
+    }
 }
 
 class EloquentRelationResetModelStub extends Model