Merge branch '7.x'

Author: GrahamCampbell

CHANGELOG-6.x.md

@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.18.17...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.18.18...6.x)
+
+
+## [v6.18.18 (2020-06-03)](https://github.com/laravel/framework/compare/v6.18.17...v6.18.18)
+
+### Fixed
+- Fixed `Illuminate\Database\Eloquent\Relations\MorphToMany::getCurrentlyAttachedPivots()` ([110b129](https://github.com/laravel/framework/commit/110b129531df172f03bf163f561c71123fac6296))
 
 
 ## [v6.18.17 (2020-06-02)](https://github.com/laravel/framework/compare/v6.18.16...v6.18.17)

CHANGELOG-7.x.md

@@ -1,10 +1,20 @@
 # Release Notes for 7.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v7.14.0...7.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v7.14.1...7.x)
+
+### Added
+- Added extendable relations for models ([#33025](https://github.com/laravel/framework/pull/33025))
+- Added `Illuminate\Foundation\Testing\Concerns\MakesHttpRequests::withToken()` ([#33075](https://github.com/laravel/framework/pull/33075), [79383a1](https://github.com/laravel/framework/commit/79383a129bf213177ff00ec1ba7c396da5d7749b))
+
+
+## [v7.14.1 (2020-06-03)](https://github.com/laravel/framework/compare/v7.14.0...v7.14.1)
 
 ### Added
 - Added missing `symfony/mime` suggest ([#33067](https://github.com/laravel/framework/pull/33067))
 
+### Fixed
+- Fixed `Illuminate\Database\Eloquent\Relations\MorphToMany::getCurrentlyAttachedPivots()` ([110b129](https://github.com/laravel/framework/commit/110b129531df172f03bf163f561c71123fac6296))
+
 
 ## [v7.14.0 (2020-06-02)](https://github.com/laravel/framework/compare/v7.13.0...v7.14.0)
 

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -166,7 +166,7 @@ public function when($value, $callback, $default = null)
      * Pass the query to a given callback.
      *
      * @param  callable  $callback
-     * @return \Illuminate\Database\Query\Builder
+     * @return $this
      */
     public function tap($callback)
     {

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -418,7 +418,8 @@ public function getRelationValue($key)
         // If the "attribute" exists as a method on the model, we will just assume
         // it is a relationship and will load and return results from the query
         // and hydrate the relationship's value on the "relationships" array.
-        if (method_exists($this, $key)) {
+        if (method_exists($this, $key) ||
+            (static::$relationResolvers[get_class($this)][$key] ?? null)) {
             return $this->getRelationshipFromMethod($key);
         }
     }

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
+use Closure;
 use Illuminate\Collections\Arr;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -44,6 +45,28 @@ trait HasRelationships
         'belongsToMany', 'morphToMany', 'morphedByMany',
     ];
 
+    /**
+     * The relation resolver callbacks.
+     *
+     * @var array
+     */
+    protected static $relationResolvers = [];
+
+    /**
+     * Define a dynamic relation resolver.
+     *
+     * @param  string  $name
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public static function resolveRelationUsing($name, Closure $callback)
+    {
+        static::$relationResolvers = array_replace_recursive(
+            static::$relationResolvers,
+            [static::class => [$name => $callback]]
+        );
+    }
+
     /**
      * Define a one-to-one relationship.
      *

src/Illuminate/Database/Eloquent/Model.php

@@ -1719,6 +1719,10 @@ public function __call($method, $parameters)
             return $this->$method(...$parameters);
         }
 
+        if ($resolver = (static::$relationResolvers[get_class($this)][$method] ?? null)) {
+            return $resolver($this);
+        }
+
         return $this->forwardCallTo($this->newQuery(), $method, $parameters);
     }
 

src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php

@@ -80,6 +80,18 @@ public function withHeader(string $name, string $value)
         return $this;
     }
 
+    /**
+     * Add an authorization token for the request.
+     *
+     * @param  string  $token
+     * @param  string  $type
+     * @return $this
+     */
+    public function withToken(string $token, string $type = 'Bearer')
+    {
+        return $this->withHeader('Authorization', $type.' '.$token);
+    }
+
     /**
      * Flush all the configured headers.
      *

tests/Database/DatabaseEloquentRelationTest.php

@@ -267,6 +267,20 @@ public function testMacroable()
         $result = $relation->foo();
         $this->assertSame('foo', $result);
     }
+
+    public function testRelationResolvers()
+    {
+        $model = new EloquentRelationResetModelStub;
+        $builder = m::mock(Builder::class);
+        $builder->shouldReceive('getModel')->andReturn($model);
+
+        EloquentRelationResetModelStub::resolveRelationUsing('customer', function ($model) use ($builder) {
+            return new EloquentResolverRelationStub($builder, $model);
+        });
+
+        $this->assertInstanceOf(EloquentResolverRelationStub::class, $model->customer());
+        $this->assertSame(['key' => 'value'], $model->customer);
+    }
 }
 
 class EloquentRelationResetModelStub extends Model
@@ -329,3 +343,11 @@ class EloquentNoTouchingAnotherModelStub extends Model
         'id' => 2,
     ];
 }
+
+class EloquentResolverRelationStub extends EloquentRelationStub
+{
+    public function getResults()
+    {
+        return ['key' => 'value'];
+    }
+}

tests/Foundation/Testing/Concerns/MakesHttpRequestsTest.php

@@ -14,6 +14,15 @@ public function testFromSetsHeaderAndSession()
         $this->assertSame('previous/url', $this->app['session']->previousUrl());
     }
 
+    public function testWithTokenSetsAuthorizationHeader()
+    {
+        $this->withToken('foobar');
+        $this->assertSame('Bearer foobar', $this->defaultHeaders['Authorization']);
+
+        $this->withToken('foobar', 'Basic');
+        $this->assertSame('Basic foobar', $this->defaultHeaders['Authorization']);
+    }
+
     public function testWithoutAndWithMiddleware()
     {
         $this->assertFalse($this->app->has('middleware.disable'));