Merge remote-tracking branch 'upstream/master'

Author: golubkovden

CHANGELOG-5.5.md

@@ -9,14 +9,16 @@
 - Removed `build` scripts ([7c16b15](https://github.com/laravel/framework/pull/17048/commits/7c16b154ede10ff9a37756e32d7dddf317524634))
 - Removed usages of the `with()` helper ([#17888](https://github.com/laravel/framework/pull/17888))
 - Support callable/invokable objects in `Pipeline` ([#18264](https://github.com/laravel/framework/pull/18264))
+- ⚠️ Prevent access to protected properties using array access on `Model` and `Fluent` ([#18403](https://github.com/laravel/framework/pull/18403))
+- Show custom 500 error page for all exception types when not in debug mode ([#18481](https://github.com/laravel/framework/pull/18481), [3cb7b0f](https://github.com/laravel/framework/commit/3cb7b0f4304274f209ed0f776ef70ccd4f9fe5dd))
 
 ### Console
 - Add interactive prompt to `vendor:publish` ([#18230](https://github.com/laravel/framework/pull/18230))
 
 ### Eloquent
 - ⚠️ Indicate soft deleted models as existing ([#17613](https://github.com/laravel/framework/pull/17613))
 - ⚠️ Added `$localKey` parameter to `HasRelationships::belongsToMany()` and `BelongsToMany` ([#17903](https://github.com/laravel/framework/pull/17903), [7c7c3bc](https://github.com/laravel/framework/commit/7c7c3bc4be3052afe0889fe323230dfd92f81000))
-- Renamed `$parent` property to `$pivotParent` in `Pivot` class ([#17933](https://github.com/laravel/framework/pull/17933), [#18150](https://github.com/laravel/framework/pull/18150))
+- ⚠️ Renamed `$parent` property to `$pivotParent` in `Pivot` class ([#17933](https://github.com/laravel/framework/pull/17933), [#18150](https://github.com/laravel/framework/pull/18150))
 - ⚠️ Don't add `_count` suffix to column name when using `withCount()` with an alias ([#17871](https://github.com/laravel/framework/pull/17871))
 - ⚠️ Renamed `$events` to `$dispatchesEvents` ([#17961](https://github.com/laravel/framework/pull/17961), [b6472bf](https://github.com/laravel/framework/commit/b6472bf6fec1af6e76604aaf3f7fed665440ac66), [3dbe12f](https://github.com/laravel/framework/commit/3dbe12f16f470e3bca868576d517d57876bc50af))
 - ⚠️ Added `$parentKey` parameter to `belongsToMany()`, `BelongsToMany` and `MorphToMany` ([#17915](https://github.com/laravel/framework/pull/17915), [#18380](https://github.com/laravel/framework/pull/18380))
@@ -50,7 +52,8 @@
 ### Testing
 - ⚠️ Switched to PHPUnit 6 ([#17755](https://github.com/laravel/framework/pull/17755), [#17864](https://github.com/laravel/framework/pull/17864))
 - ⚠️ Renamed authentication assertion methods ([#17924](https://github.com/laravel/framework/pull/17924), [494a177](https://github.com/laravel/framework/commit/494a1774f217f0cd6b4efade63e200e3ac65f201))
-- Added POC of integration testing the framework itself ([182027d](https://github.com/laravel/framework/commit/182027d3290e9a2e1bd9e2d52c125177ef6c6af6))
+- Added POC of integration testing the framework itself ([182027d](https://github.com/laravel/framework/commit/182027d3290e9a2e1bd9e2d52c125177ef6c6af6), [#18438](https://github.com/laravel/framework/pull/18438))
 
 ### Views
 - ⚠️ Camel case variables names passed to views ([#18083](https://github.com/laravel/framework/pull/18083))
+- Added pagination template for Semantic UI ([#18463](https://github.com/laravel/framework/pull/18463))

src/Illuminate/Console/Scheduling/CacheMutex.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+use Illuminate\Contracts\Cache\Repository as Cache;
+
+class CacheMutex implements Mutex
+{
+    /**
+     * The cache repository implementation.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    public $cache;
+
+    /**
+     * Create a new overlapping strategy.
+     *
+     * @param  \Illuminate\Contracts\Cache\Repository  $cache
+     * @return void
+     */
+    public function __construct(Cache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Attempt to obtain a mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function create(Event $event)
+    {
+        return $this->cache->add($event->mutexName(), true, 1440);
+    }
+
+    /**
+     * Determine if a mutex exists for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function exists(Event $event)
+    {
+        return $this->cache->has($event->mutexName());
+    }
+
+    /**
+     * Clear the mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return void
+     */
+    public function forget(Event $event)
+    {
+        $this->cache->forget($event->mutexName());
+    }
+}

src/Illuminate/Console/Scheduling/CallbackEvent.php

@@ -5,7 +5,6 @@
 use LogicException;
 use InvalidArgumentException;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Cache\Repository as Cache;
 
 class CallbackEvent extends Event
 {
@@ -26,22 +25,22 @@ class CallbackEvent extends Event
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Contracts\Cache\Repository  $cache
+     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
      * @param  string  $callback
      * @param  array  $parameters
      * @return void
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(Cache $cache, $callback, array $parameters = [])
+    public function __construct(Mutex $mutex, $callback, array $parameters = [])
     {
         if (! is_string($callback) && ! is_callable($callback)) {
             throw new InvalidArgumentException(
                 'Invalid scheduled callback event. Must be a string or callable.'
             );
         }
 
-        $this->cache = $cache;
+        $this->mutex = $mutex;
         $this->callback = $callback;
         $this->parameters = $parameters;
     }
@@ -57,7 +56,7 @@ public function __construct(Cache $cache, $callback, array $parameters = [])
     public function run(Container $container)
     {
         if ($this->description) {
-            $this->cache->put($this->mutexName(), true, 1440);
+            $this->mutex->create($this);
         }
 
         try {
@@ -79,7 +78,7 @@ public function run(Container $container)
     protected function removeMutex()
     {
         if ($this->description) {
-            $this->cache->forget($this->mutexName());
+            $this->mutex->forget($this);
         }
     }
 
@@ -99,7 +98,7 @@ public function withoutOverlapping()
         }
 
         return $this->skip(function () {
-            return $this->cache->has($this->mutexName());
+            return $this->mutex->exists($this);
         });
     }
 

src/Illuminate/Console/Scheduling/Event.php

@@ -10,19 +10,11 @@
 use Symfony\Component\Process\Process;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Cache\Repository as Cache;
 
 class Event
 {
     use Macroable, ManagesFrequencies;
 
-    /**
-     * The cache store implementation.
-     *
-     * @var \Illuminate\Contracts\Cache\Repository
-     */
-    protected $cache;
-
     /**
      * The command string.
      *
@@ -128,16 +120,23 @@ class Event
      */
     public $description;
 
+    /**
+     * The mutex implementation.
+     *
+     * @var \Illuminate\Console\Scheduling\Mutex
+     */
+    public $mutex;
+
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Contracts\Cache\Repository  $cache
+     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
      * @param  string  $command
      * @return void
      */
-    public function __construct(Cache $cache, $command)
+    public function __construct(Mutex $mutex, $command)
     {
-        $this->cache = $cache;
+        $this->mutex = $mutex;
         $this->command = $command;
         $this->output = $this->getDefaultOutput();
     }
@@ -161,7 +160,7 @@ public function getDefaultOutput()
     public function run(Container $container)
     {
         if ($this->withoutOverlapping &&
-            ! $this->cache->add($this->mutexName(), true, 1440)) {
+            ! $this->mutex->create($this)) {
             return;
         }
 
@@ -517,9 +516,9 @@ public function withoutOverlapping()
         $this->withoutOverlapping = true;
 
         return $this->then(function () {
-            $this->cache->forget($this->mutexName());
+            $this->mutex->forget($this);
         })->skip(function () {
-            return $this->cache->has($this->mutexName());
+            return $this->mutex->exists($this);
         });
     }
 
@@ -633,4 +632,17 @@ public function getExpression()
     {
         return $this->expression;
     }
+
+    /**
+     * Set the mutex implementation to be used.
+     *
+     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
+     * @return $this
+     */
+    public function preventOverlapsUsing(Mutex $mutex)
+    {
+        $this->mutex = $mutex;
+
+        return $this;
+    }
 }

src/Illuminate/Console/Scheduling/Mutex.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+interface Mutex
+{
+    /**
+     * Attempt to obtain a mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function create(Event $event);
+
+    /**
+     * Determine if a mutex exists for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function exists(Event $event);
+
+    /**
+     * Clear the mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return void
+     */
+    public function forget(Event $event);
+}

src/Illuminate/Console/Scheduling/Schedule.php

@@ -5,33 +5,35 @@
 use Illuminate\Console\Application;
 use Illuminate\Container\Container;
 use Symfony\Component\Process\ProcessUtils;
-use Illuminate\Contracts\Cache\Repository as Cache;
 
 class Schedule
 {
     /**
-     * The cache store implementation.
+     * All of the events on the schedule.
      *
-     * @var \Illuminate\Contracts\Cache\Repository
+     * @var array
      */
-    protected $cache;
+    protected $events = [];
 
     /**
-     * All of the events on the schedule.
+     * The mutex implementation.
      *
-     * @var array
+     * @var \Illuminate\Console\Scheduling\Mutex
      */
-    protected $events = [];
+    protected $mutex;
 
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Contracts\Cache\Repository  $cache
      * @return void
      */
-    public function __construct(Cache $cache)
+    public function __construct()
     {
-        $this->cache = $cache;
+        $container = Container::getInstance();
+
+        $this->mutex = $container->bound(Mutex::class)
+                                ? $container->make(Mutex::class)
+                                : $container->make(CacheMutex::class);
     }
 
     /**
@@ -43,7 +45,9 @@ public function __construct(Cache $cache)
      */
     public function call($callback, array $parameters = [])
     {
-        $this->events[] = $event = new CallbackEvent($this->cache, $callback, $parameters);
+        $this->events[] = $event = new CallbackEvent(
+            $this->mutex, $callback, $parameters
+        );
 
         return $event;
     }
@@ -92,7 +96,7 @@ public function exec($command, array $parameters = [])
             $command .= ' '.$this->compileParameters($parameters);
         }
 
-        $this->events[] = $event = new Event($this->cache, $command);
+        $this->events[] = $event = new Event($this->mutex, $command);
 
         return $event;
     }

src/Illuminate/Contracts/Mail/MailQueue.php

@@ -7,23 +7,19 @@ interface MailQueue
     /**
      * Queue a new e-mail message for sending.
      *
-     * @param  string|array  $view
-     * @param  array   $data
-     * @param  \Closure|string  $callback
+     * @param  string|array|MailableContract  $view
      * @param  string  $queue
      * @return mixed
      */
-    public function queue($view, array $data, $callback, $queue = null);
+    public function queue($view, $queue = null);
 
     /**
      * Queue a new e-mail message for sending after (n) seconds.
      *
-     * @param  int  $delay
-     * @param  string|array  $view
-     * @param  array  $data
-     * @param  \Closure|string  $callback
+     * @param  \DateTime|int  $delay
+     * @param  string|array|MailableContract  $view
      * @param  string  $queue
      * @return mixed
      */
-    public function later($delay, $view, array $data, $callback, $queue = null);
+    public function later($delay, $view, $queue = null);
 }

src/Illuminate/Contracts/Mail/Mailer.php

@@ -16,7 +16,7 @@ public function raw($text, $callback);
     /**
      * Send a new message using a view.
      *
-     * @param  string|array  $view
+     * @param  string|array|MailableContract  $view
      * @param  array  $data
      * @param  \Closure|string  $callback
      * @return void

src/Illuminate/Database/Eloquent/Model.php

@@ -959,12 +959,13 @@ public function replicate(array $except = null)
     /**
      * Determine if two models have the same ID and belong to the same table.
      *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @param  \Illuminate\Database\Eloquent\Model|null  $model
      * @return bool
      */
-    public function is(Model $model)
+    public function is($model)
     {
-        return $this->getKey() === $model->getKey() &&
+        return ! is_null($model) &&
+               $this->getKey() === $model->getKey() &&
                $this->getTable() === $model->getTable() &&
                $this->getConnectionName() === $model->getConnectionName();
     }

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

@@ -204,7 +204,7 @@ public function update(array $attributes)
     /**
      * Associate the model instance to the given parent.
      *
-     * @param  \Illuminate\Database\Eloquent\Model|int  $model
+     * @param  \Illuminate\Database\Eloquent\Model|int|string  $model
      * @return \Illuminate\Database\Eloquent\Model
      */
     public function associate($model)