Merge branch '8.x'

Author: GrahamCampbell

src/Illuminate/Database/ClassMorphViolationException.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Illuminate\Database;
+
+use RuntimeException;
+
+class ClassMorphViolationException extends RuntimeException
+{
+    /**
+     * The name of the affected Eloquent model.
+     *
+     * @var string
+     */
+    public $model;
+
+    /**
+     * Create a new exception instance.
+     *
+     * @param  object  $model
+     */
+    public function __construct($model)
+    {
+        $class = get_class($model);
+
+        parent::__construct("No morph map defined for model [{$class}].");
+
+        $this->model = $class;
+    }
+}

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

@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Eloquent\Concerns;
 
 use Closure;
+use Illuminate\Database\ClassMorphViolationException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
@@ -731,6 +732,10 @@ public function getMorphClass()
             return array_search(static::class, $morphMap, true);
         }
 
+        if (Relation::requiresMorphMap()) {
+            throw new ClassMorphViolationException($this);
+        }
+
         return static::class;
     }
 

src/Illuminate/Database/Eloquent/Relations/Relation.php

@@ -56,6 +56,13 @@ abstract class Relation implements BuilderContract
      */
     public static $morphMap = [];
 
+    /**
+     * Prevents morph relationships without a morph map.
+     *
+     * @var bool
+     */
+    protected static $requireMorphMap = false;
+
     /**
      * The count of self joins.
      *
@@ -387,6 +394,41 @@ protected function whereInMethod(Model $model, $key)
                         : 'whereIn';
     }
 
+    /**
+     * Prevent polymorphic relationships from being used without model mappings.
+     *
+     * @param  bool  $requireMorphMap
+     * @return void
+     */
+    public static function requireMorphMap($requireMorphMap = true)
+    {
+        static::$requireMorphMap = $requireMorphMap;
+    }
+
+    /**
+     * Determine if polymorphic relationships require explicit model mapping.
+     *
+     * @return bool
+     */
+    public static function requiresMorphMap()
+    {
+        return static::$requireMorphMap;
+    }
+
+    /**
+     * Define the morph map for polymorphic relations and require all morphed models to be explicitly mapped.
+     *
+     * @param  array|null  $map
+     * @param  bool  $merge
+     * @return array
+     */
+    public static function enforceMorphMap(array $map, $merge = true)
+    {
+        static::requireMorphMap();
+
+        return static::morphMap($map, $merge);
+    }
+
     /**
      * Set or get the morph map for polymorphic relations.
      *

src/Illuminate/Http/Client/PendingRequest.php

@@ -798,6 +798,28 @@ protected function populateResponse(Response $response)
      * @return \GuzzleHttp\Client
      */
     public function buildClient()
+    {
+        return $this->requestsReusableClient()
+               ? $this->getReusableClient()
+               : $this->createClient($this->buildHandlerStack());
+    }
+
+    /**
+     * Determine if a reusable client is required.
+     *
+     * @return bool
+     */
+    protected function requestsReusableClient()
+    {
+        return ! is_null($this->client) || $this->async;
+    }
+
+    /**
+     * Retrieve a reusable Guzzle client.
+     *
+     * @return \GuzzleHttp\Client
+     */
+    protected function getReusableClient()
     {
         return $this->client = $this->client ?: $this->createClient($this->buildHandlerStack());
     }

src/Illuminate/Http/Client/Request.php

@@ -120,9 +120,7 @@ public function header($key)
      */
     public function headers()
     {
-        return collect($this->request->getHeaders())->mapWithKeys(function ($values, $header) {
-            return [$header => $values];
-        })->all();
+        return $this->request->getHeaders();
     }
 
     /**

src/Illuminate/Http/Client/Response.php

@@ -107,9 +107,7 @@ public function header(string $header)
      */
     public function headers()
     {
-        return collect($this->response->getHeaders())->mapWithKeys(function ($v, $k) {
-            return [$k => $v];
-        })->all();
+        return $this->response->getHeaders();
     }
 
     /**

src/Illuminate/Support/Facades/View.php

@@ -6,6 +6,7 @@
  * @method static \Illuminate\Contracts\View\Factory addNamespace(string $namespace, string|array $hints)
  * @method static \Illuminate\Contracts\View\View first(array $views, \Illuminate\Contracts\Support\Arrayable|array $data = [], array $mergeData = [])
  * @method static \Illuminate\Contracts\View\Factory replaceNamespace(string $namespace, string|array $hints)
+ * @method static \Illuminate\Contracts\View\Factory addExtension(string $extension, string $engine, \Closure|null $resolver = null)
  * @method static \Illuminate\Contracts\View\View file(string $path, array $data = [], array $mergeData = [])
  * @method static \Illuminate\Contracts\View\View make(string $view, array $data = [], array $mergeData = [])
  * @method static array composer(array|string $views, \Closure|string $callback)

src/Illuminate/Support/ValidatedInput.php

@@ -68,6 +68,17 @@ public function except($keys)
         return $results;
     }
 
+    /**
+     * Merge the validated input with the given array of additional data.
+     *
+     * @param  array  $items
+     * @return static
+     */
+    public function merge(array $items)
+    {
+        return new static(array_merge($this->input, $items));
+    }
+
     /**
      * Get the input as a collection.
      *

src/Illuminate/Testing/AssertableJsonString.php

@@ -96,7 +96,10 @@ public function assertExact(array $data)
 
         $expected = $this->reorderAssocKeys($data);
 
-        PHPUnit::assertEquals(json_encode($expected), json_encode($actual));
+        PHPUnit::assertEquals(
+            json_encode($expected, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES),
+            json_encode($actual, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+        );
 
         return $this;
     }

src/Illuminate/Testing/Fluent/AssertableJson.php

@@ -117,6 +117,32 @@ public function first(Closure $callback): self
         return $this->scope($key, $callback);
     }
 
+    /**
+     * Instantiate a new "scope" on each child element.
+     *
+     * @param  \Closure  $callback
+     * @return $this
+     */
+    public function each(Closure $callback): self
+    {
+        $props = $this->prop();
+
+        $path = $this->dotPath();
+
+        PHPUnit::assertNotEmpty($props, $path === ''
+            ? 'Cannot scope directly onto each element of the root level because it is empty.'
+            : sprintf('Cannot scope directly onto each element of property [%s] because it is empty.', $path)
+        );
+
+        foreach (array_keys($props) as $key) {
+            $this->interactsWith($key);
+
+            $this->scope($key, $callback);
+        }
+
+        return $this;
+    }
+
     /**
      * Create a new instance from an array.
      *