Merge branch 'master' into temporal-columns-improvements

.travis.yml

@@ -7,9 +7,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.0.21
-    - php: 7.0.21
-      env: setup=lowest
     - php: 7.1
     - php: 7.1
       env: setup=lowest

CHANGELOG-5.6.md

@@ -0,0 +1,32 @@
+# Release Notes for 5.6.x
+
+## [Unreleased]
+
+### General
+- ⚠️ Added `runningUnitTests()` to `Application` contract ([#21034](https://github.com/laravel/framework/pull/21034))
+- ⚠️ Upgraded `cron-expression` to `2.x` ([#21637](https://github.com/laravel/framework/pull/21637))
+
+### Arrays
+- ⚠️ Arr::wrap(null) will now return an empty array instead of wrapping the null value ([#21745](https://github.com/laravel/framework/pull/21745))
+
+### Artisan Console
+- ⚠️ Removed deprecated `optimize` command ([#20851](https://github.com/laravel/framework/pull/20851))
+- Show job id in `queue:work` output ([#21204](https://github.com/laravel/framework/pull/21204))
+- Show batch number in `migrate:status` output ([#21391](https://github.com/laravel/framework/pull/21391))
+
+### Database
+- ⚠️ Swap the index order of morph type and id ([#21693](https://github.com/laravel/framework/pull/21693))
+
+### Eloquent
+- Serialize relationships ([#21229](https://github.com/laravel/framework/pull/21229))
+- Allow setting custom owner key on polymorphic relationships ([#21310](https://github.com/laravel/framework/pull/21310))
+
+### Queues
+- ⚠️ Added `payload()` and `getJobId()` to `Job` contract ([#21303](https://github.com/laravel/framework/pull/21303))
+
+### Responses
+- Added missing `$raw` and `$sameSite` parameters to `Cookie\Factory` methods ([#21553](https://github.com/laravel/framework/pull/21553))
+- ⚠️ Return `201` status of Model was recently created ([#21625](https://github.com/laravel/framework/pull/21625))
+
+### Validation
+- ⚠️ Ignore SVGs in `validateDimensions()` ([#21390](https://github.com/laravel/framework/pull/21390))

composer.json

@@ -15,14 +15,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.1.3",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "doctrine/inflector": "~1.1",
         "erusev/parsedown": "~1.6",
         "league/flysystem": "~1.0",
         "monolog/monolog": "~1.12",
-        "mtdowling/cron-expression": "~1.0",
+        "dragonmantank/cron-expression": "~2.0",
         "nesbot/carbon": "~1.20",
         "psr/container": "~1.0",
         "psr/simple-cache": "^1.0",
@@ -75,7 +75,7 @@
         "doctrine/dbal": "~2.5",
         "filp/whoops": "^2.1.4",
         "mockery/mockery": "~1.0",
-        "orchestra/testbench-core": "3.5.*",
+        "orchestra/testbench-core": "3.6.*",
         "pda/pheanstalk": "~3.0",
         "phpunit/phpunit": "~6.0",
         "predis/predis": "^1.1.1",
@@ -101,7 +101,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "suggest": {

src/Illuminate/Auth/composer.json

@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/http": "5.5.*",
-        "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/http": "5.6.*",
+        "illuminate/queue": "5.6.*",
+        "illuminate/support": "5.6.*"
     },
     "autoload": {
         "psr-4": {
@@ -27,13 +27,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the auth:clear-resets command (5.5.*).",
-        "illuminate/queue": "Required to fire login / logout events (5.5.*).",
-        "illuminate/session": "Required to use the session based guard (5.5.*)."
+        "illuminate/console": "Required to use the auth:clear-resets command (5.6.*).",
+        "illuminate/queue": "Required to fire login / logout events (5.6.*).",
+        "illuminate/session": "Required to use the session based guard (5.6.*)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Broadcasting/composer.json

@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.1.3",
         "psr/log": "~1.0",
-        "illuminate/bus": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "illuminate/bus": "5.6.*",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/queue": "5.6.*",
+        "illuminate/support": "5.6.*"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "suggest": {

src/Illuminate/Bus/composer.json

@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/pipeline": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/pipeline": "5.6.*",
+        "illuminate/support": "5.6.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "config": {

src/Illuminate/Cache/composer.json

@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/support": "5.6.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,13 +25,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "suggest": {
-        "illuminate/database": "Required to use the database cache driver (5.5.*).",
-        "illuminate/filesystem": "Required to use the file cache driver (5.5.*).",
-        "illuminate/redis": "Required to use the redis cache driver (5.5.*)."
+        "illuminate/database": "Required to use the database cache driver (5.6.*).",
+        "illuminate/filesystem": "Required to use the file cache driver (5.6.*).",
+        "illuminate/redis": "Required to use the redis cache driver (5.6.*)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Config/composer.json

@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/support": "5.6.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "config": {

src/Illuminate/Console/Scheduling/Event.php

@@ -27,7 +27,7 @@ class Event
      *
      * @var string
      */
-    public $expression = '* * * * * *';
+    public $expression = '* * * * *';
 
     /**
      * The timezone the date should be evaluated on.

src/Illuminate/Console/composer.json

@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
+        "illuminate/support": "5.6.*",
         "symfony/console": "~3.3"
     },
     "autoload": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "suggest": {

src/Illuminate/Container/Container.php

@@ -271,13 +271,28 @@ public function hasMethodBinding($method)
     /**
      * Bind a callback to resolve with Container::call.
      *
-     * @param  string  $method
+     * @param  array|string  $method
      * @param  \Closure  $callback
      * @return void
      */
     public function bindMethod($method, $callback)
     {
-        $this->methodBindings[$method] = $callback;
+        $this->methodBindings[$this->parseBindMethod($method)] = $callback;
+    }
+
+    /**
+     * Get the method to be bound in class@method format.
+     *
+     * @param  array|string $method
+     * @return string
+     */
+    protected function parseBindMethod($method)
+    {
+        if (is_array($method)) {
+            return $method[0].'@'.$method[1];
+        }
+
+        return $method;
     }
 
     /**

src/Illuminate/Container/composer.json

@@ -14,8 +14,8 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.6.*",
         "psr/container": "~1.0"
     },
     "autoload": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.6-dev"
         }
     },
     "config": {

src/Illuminate/Contracts/Cookie/Factory.php

@@ -14,9 +14,11 @@ interface Factory
      * @param  string  $domain
      * @param  bool    $secure
      * @param  bool    $httpOnly
+     * @param  bool         $raw
+     * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true);
+    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null);
 
     /**
      * Create a cookie that lasts "forever" (five years).
@@ -27,9 +29,11 @@ public function make($name, $value, $minutes = 0, $path = null, $domain = null,
      * @param  string  $domain
      * @param  bool    $secure
      * @param  bool    $httpOnly
+     * @param  bool         $raw
+     * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true);
+    public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null);
 
     /**
      * Expire the given cookie.

src/Illuminate/Contracts/Database/ModelIdentifier.php

@@ -20,6 +20,13 @@ class ModelIdentifier
      */
     public $id;
 
+    /**
+     * The relationships loaded on the model.
+     *
+     * @var array
+     */
+    public $relations;
+
     /**
      * The connection name of the model.
      *
@@ -32,13 +39,15 @@ class ModelIdentifier
      *
      * @param  string  $class
      * @param  mixed  $id
+     * @param  array  $relations
      * @param  mixed  $connection
      * @return void
      */
-    public function __construct($class, $id, $connection)
+    public function __construct($class, $id, array $relations, $connection)
     {
         $this->id = $id;
         $this->class = $class;
+        $this->relations = $relations;
         $this->connection = $connection;
     }
 }

src/Illuminate/Contracts/Foundation/Application.php

@@ -28,12 +28,19 @@ public function basePath();
     public function environment();
 
     /**
-     * Determine if we are running in the console.
+     * Determine if the application is running in the console.
      *
      * @return bool
      */
     public function runningInConsole();
 
+    /**
+     * Determine if the application is running unit tests.
+     *
+     * @return bool
+     */
+    public function runningUnitTests();
+
     /**
      * Determine if the application is currently down for maintenance.
      *

src/Illuminate/Contracts/Queue/Job.php

@@ -4,6 +4,20 @@
 
 interface Job
 {
+    /**
+     * Get the job identifier.
+     *
+     * @return string
+     */
+    public function getJobId();
+
+    /**
+     * Get the decoded body of the job.
+     *
+     * @return array
+     */
+    public function payload();
+
     /**
      * Fire the job.
      *