Merge branch '7.x'

Author: GrahamCampbell

src/Illuminate/Cache/DynamoDbStore.php

@@ -253,6 +253,8 @@ public function putMany(array $values, $seconds)
      * @param  mixed  $value
      * @param  int  $seconds
      * @return bool
+     *
+     * @throws \Aws\DynamoDb\Exception\DynamoDbException
      */
     public function add($key, $value, $seconds)
     {
@@ -298,6 +300,8 @@ public function add($key, $value, $seconds)
      * @param  string  $key
      * @param  mixed  $value
      * @return int|bool
+     *
+     * @throws \Aws\DynamoDb\Exception\DynamoDbException
      */
     public function increment($key, $value = 1)
     {
@@ -343,6 +347,8 @@ public function increment($key, $value = 1)
      * @param  string  $key
      * @param  mixed  $value
      * @return int|bool
+     *
+     * @throws \Aws\DynamoDb\Exception\DynamoDbException
      */
     public function decrement($key, $value = 1)
     {

src/Illuminate/Database/Connectors/ConnectionFactory.php

@@ -171,6 +171,8 @@ protected function createPdoResolver(array $config)
      *
      * @param  array  $config
      * @return \Closure
+     *
+     * @throws \PDOException
      */
     protected function createPdoResolverWithHosts(array $config)
     {

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

@@ -234,6 +234,11 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt
                 $attributes[$key] = $attributes[$key]->format(explode(':', $value, 2)[1]);
             }
 
+            if ($attributes[$key] && $attributes[$key] instanceof DateTimeInterface &&
+                $this->isClassCastable($key)) {
+                $attributes[$key] = $this->serializeDate($attributes[$key]);
+            }
+
             if ($attributes[$key] instanceof Arrayable) {
                 $attributes[$key] = $attributes[$key]->toArray();
             }

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

@@ -115,6 +115,19 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
         );
     }
 
+    /**
+     * Get the pivot models that are currently attached.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    protected function getCurrentlyAttachedPivots()
+    {
+        return parent::getCurrentlyAttachedPivots()->map(function ($record) {
+            return $record->setMorphType($this->morphType)
+                          ->setMorphClass($this->morphClass);
+        });
+    }
+
     /**
      * Create a new query builder for the pivot table.
      *

src/Illuminate/Database/Eloquent/SoftDeletes.php

@@ -137,7 +137,7 @@ public function trashed()
     }
 
     /**
-     * Register a restoring model event with the dispatcher.
+     * Register a "restoring" model event callback with the dispatcher.
      *
      * @param  \Closure|string  $callback
      * @return void
@@ -148,7 +148,7 @@ public static function restoring($callback)
     }
 
     /**
-     * Register a restored model event with the dispatcher.
+     * Register a "restored" model event callback with the dispatcher.
      *
      * @param  \Closure|string  $callback
      * @return void
@@ -158,6 +158,17 @@ public static function restored($callback)
         static::registerModelEvent('restored', $callback);
     }
 
+    /**
+     * Register a "forceDeleted" model event callback with the dispatcher.
+     *
+     * @param  \Closure|string  $callback
+     * @return void
+     */
+    public static function forceDeleted($callback)
+    {
+        static::registerModelEvent('forceDeleted', $callback);
+    }
+
     /**
      * Determine if the model is currently force deleting.
      *

src/Illuminate/Database/Query/Processors/PostgresProcessor.php

@@ -17,7 +17,11 @@ class PostgresProcessor extends Processor
      */
     public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
     {
-        $result = $query->getConnection()->selectFromWriteConnection($sql, $values)[0];
+        $connection = $query->getConnection();
+
+        $connection->recordsHaveBeenModified();
+
+        $result = $connection->selectFromWriteConnection($sql, $values)[0];
 
         $sequence = $sequence ?: 'id';
 

src/Illuminate/Foundation/Console/RouteListCommand.php

@@ -172,7 +172,7 @@ protected function getMiddleware($route)
     {
         return collect($this->router->gatherRouteMiddleware($route))->map(function ($middleware) {
             return $middleware instanceof Closure ? 'Closure' : $middleware;
-        })->implode(',');
+        })->implode("\n");
     }
 
     /**

src/Illuminate/Foundation/Providers/FoundationServiceProvider.php

@@ -49,6 +49,8 @@ public function register()
      * Register the "validate" macro on the request.
      *
      * @return void
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function registerRequestValidation()
     {

src/Illuminate/Foundation/Testing/TestCase.php

@@ -143,6 +143,8 @@ protected function setUpTraits()
      * Clean up the testing environment before the next test.
      *
      * @return void
+     *
+     * @throws \Mockery\Exception\InvalidCountException
      */
     protected function tearDown(): void
     {

src/Illuminate/Queue/Worker.php

@@ -446,6 +446,8 @@ protected function handleJobException($connectionName, $job, WorkerOptions $opti
      * @param  \Illuminate\Contracts\Queue\Job  $job
      * @param  int  $maxTries
      * @return void
+     *
+     * @throws \Throwable
      */
     protected function markJobAsFailedIfAlreadyExceedsMaxAttempts($connectionName, $job, $maxTries)
     {