Merge branch '8.x' into 9.x

Author: GrahamCampbell

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

@@ -500,6 +500,10 @@ public function getRelationValue($key)
      */
     public function isRelation($key)
     {
+        if ($this->hasAttributeMutator($key)) {
+            return false;
+        }
+
         return method_exists($this, $key) ||
             (static::$relationResolvers[get_class($this)][$key] ?? null);
     }

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -67,11 +67,11 @@ public function bootstrap(Application $app)
      */
     public function handleError($level, $message, $file = '', $line = 0, $context = [])
     {
-        if (error_reporting() & $level) {
-            if ($this->isDeprecation($level)) {
-                return $this->handleDeprecation($message, $file, $line);
-            }
+        if ($this->isDeprecation($level)) {
+            return $this->handleDeprecation($message, $file, $line);
+        }
 
+        if (error_reporting() & $level) {
             throw new ErrorException($message, 0, $level, $file, $line);
         }
     }

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

@@ -38,7 +38,7 @@ protected function withoutDeprecationHandling()
     {
         if ($this->originalDeprecationHandler == null) {
             $this->originalDeprecationHandler = set_error_handler(function ($level, $message, $file = '', $line = 0) {
-                if (error_reporting() & $level) {
+                if (in_array($level, [E_DEPRECATED, E_USER_DEPRECATED]) || (error_reporting() & $level)) {
                     throw new ErrorException($message, 0, $level, $file, $line);
                 }
             });

src/Illuminate/Http/Client/PendingRequest.php

@@ -11,6 +11,7 @@
 use Illuminate\Http\Client\Events\ConnectionFailed;
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Http\Client\Events\ResponseReceived;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Conditionable;
@@ -155,6 +156,20 @@ class PendingRequest
      */
     protected $request;
 
+    /**
+     * The Guzzle request options that are mergable via array_merge_recursive.
+     *
+     * @var array
+     */
+    protected $mergableOptions = [
+        'cookies',
+        'form_params',
+        'headers',
+        'json',
+        'multipart',
+        'query',
+    ];
+
     /**
      * Create a new HTTP Client instance.
      *
@@ -488,15 +503,18 @@ public function retry(int $times, int $sleep = 0, ?callable $when = null, bool $
     }
 
     /**
-     * Merge new options into the client.
+     * Replace the specified options on the request.
      *
      * @param  array  $options
      * @return $this
      */
     public function withOptions(array $options)
     {
         return tap($this, function ($request) use ($options) {
-            return $this->options = array_merge_recursive($this->options, $options);
+            return $this->options = array_replace_recursive(
+                array_merge_recursive($this->options, Arr::only($options, $this->mergableOptions)),
+                $options
+            );
         });
     }
 
@@ -1018,14 +1036,17 @@ public function runBeforeSendingCallbacks($request, array $options)
     }
 
     /**
-     * Merge the given options with the current request options.
+     * Replace the given options with the current request options.
      *
      * @param  array  $options
      * @return array
      */
     public function mergeOptions(...$options)
     {
-        return array_merge_recursive($this->options, ...$options);
+        return array_replace_recursive(
+            array_merge_recursive($this->options, Arr::only($options, $this->mergableOptions)),
+            ...$options
+        );
     }
 
     /**
@@ -1131,4 +1152,14 @@ public function setHandler($handler)
 
         return $this;
     }
+
+    /**
+     * Get the pending request options.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 }

tests/Database/DatabaseEloquentRelationTest.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -281,6 +282,14 @@ public function testRelationResolvers()
         $this->assertInstanceOf(EloquentResolverRelationStub::class, $model->customer());
         $this->assertSame(['key' => 'value'], $model->customer);
     }
+
+    public function testIsRelationIgnoresAttribute()
+    {
+        $model = new EloquentRelationAndAtrributeModelStub;
+
+        $this->assertTrue($model->isRelation('parent'));
+        $this->assertFalse($model->isRelation('field'));
+    }
 }
 
 class EloquentRelationResetModelStub extends Model
@@ -351,3 +360,25 @@ public function getResults()
         return ['key' => 'value'];
     }
 }
+
+class EloquentRelationAndAtrributeModelStub extends Model
+{
+    protected $table = 'one_more_table';
+
+    public function field(): Attribute
+    {
+        return new Attribute(
+            function ($value) {
+                return $value;
+            },
+            function ($value) {
+                return $value;
+            },
+        );
+    }
+
+    public function parent()
+    {
+        return $this->belongsTo(self::class);
+    }
+}

tests/Http/HttpClientTest.php

@@ -971,6 +971,19 @@ public function testClientCanBeSet()
         $this->assertSame($client, $request->buildClient());
     }
 
+    public function testRequestsCanReplaceOptions()
+    {
+        $request = new PendingRequest($this->factory);
+
+        $request = $request->withOptions(['http_errors' => true, 'connect_timeout' => 10]);
+
+        $this->assertSame(['http_errors' => true, 'connect_timeout' => 10], $request->getOptions());
+
+        $request = $request->withOptions(['connect_timeout' => 20]);
+
+        $this->assertSame(['http_errors' => true, 'connect_timeout' => 20], $request->getOptions());
+    }
+
     public function testMultipleRequestsAreSentInThePool()
     {
         $this->factory->fake([

tests/Integration/Database/EloquentBelongsToManyTest.php

@@ -46,6 +46,7 @@ protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
         });
 
         Schema::create('users_posts', function (Blueprint $table) {
+            $table->increments('id');
             $table->string('user_uuid');
             $table->string('post_uuid');
             $table->tinyInteger('is_draft')->default(1);
@@ -1014,6 +1015,33 @@ public function testOrderByPivotMethod()
         $relationTag2 = $post->tagsWithCustomExtraPivot()->orderByPivot('flag', 'desc')->first();
         $this->assertEquals($relationTag2->getAttributes(), $tag3->getAttributes());
     }
+
+    public function testFirstOrMethod()
+    {
+        $user1 = User::create(['name' => Str::random()]);
+        $user2 = User::create(['name' => Str::random()]);
+        $user3 = User::create(['name' => Str::random()]);
+        $post1 = Post::create(['title' => Str::random()]);
+        $post2 = Post::create(['title' => Str::random()]);
+        $post3 = Post::create(['title' => Str::random()]);
+
+        $user1->posts()->sync([$post1->uuid, $post2->uuid]);
+        $user2->posts()->sync([$post1->uuid, $post2->uuid]);
+
+        $this->assertEquals(
+            $post1->id,
+            $user2->posts()->firstOr(function () {
+                return Post::create(['title' => Str::random()]);
+            })->id
+        );
+
+        $this->assertEquals(
+            $post3->id,
+            $user3->posts()->firstOr(function () use ($post3) {
+                return $post3;
+            })->id
+        );
+    }
 }
 
 class User extends Model
@@ -1031,6 +1059,13 @@ protected static function boot()
         });
     }
 
+    public function posts()
+    {
+        return $this->belongsToMany(Post::class, 'users_posts', 'user_uuid', 'post_uuid', 'uuid', 'uuid')
+            ->withPivot('is_draft')
+            ->withTimestamps();
+    }
+
     public function postsWithCustomPivot()
     {
         return $this->belongsToMany(Post::class, 'users_posts', 'user_uuid', 'post_uuid', 'uuid', 'uuid')
@@ -1056,6 +1091,13 @@ protected static function boot()
         });
     }
 
+    public function users()
+    {
+        return $this->belongsToMany(User::class, 'users_posts', 'post_uuid', 'user_uuid', 'uuid', 'uuid')
+            ->withPivot('is_draft')
+            ->withTimestamps();
+    }
+
     public function tags()
     {
         return $this->belongsToMany(Tag::class, 'posts_tags', 'post_id', 'tag_id')