fix conflicts

Author: taylorotwell

.travis.yml

@@ -13,6 +13,9 @@ matrix:
     - php: 7.2
     - php: 7.2
       env: setup=lowest
+    - php: 7.3
+    - php: 7.3
+      env: setup=lowest
 
 sudo: false
 

CHANGELOG-5.7.md

@@ -1,5 +1,24 @@
 # Release Notes for 5.7.x
 
+## Unreleased
+
+### Added
+- Added ability to return an array of messages in a custom validation rule ([#26327](https://github.com/laravel/framework/pull/26327))
+- Added `whenEmpty`/ `whenNotEmpty` / `unlessEmpty` / `unlessNotEmpty` methods to `Collection` ([#26345](https://github.com/laravel/framework/pull/26345))
+- Added `Illuminate\Cache\Repository::missing` method ([#26351](https://github.com/laravel/framework/pull/26351)) 
+- Added `Macroable` trait to `Illuminate\View\Factory` ([#26361](https://github.com/laravel/framework/pull/26361))
+
+### Changed
+- Updated `AbstractPaginator::appends` to handle null ([#26326](https://github.com/laravel/framework/pull/26326))
+- Added "guzzlehttp/guzzle": "^6.3", to `composer.json` ([#26328](https://github.com/laravel/framework/pull/26328))
+- Showed exception message on 403 error page when message is available ([#26356](https://github.com/laravel/framework/pull/26356))
+- Don't run TransformsRequest twice on ?query= parameters ([#26366](https://github.com/laravel/framework/pull/26366))
+- Added missing logging options to slack log driver ([#26360](https://github.com/laravel/framework/pull/26360))
+
+### Changed realization
+- Used `Request::validate` macro in Auth traits ([#26314](https://github.com/laravel/framework/pull/26314))
+
+
 ## [v5.7.12 (2018-10-30)](https://github.com/laravel/framework/compare/v5.7.11...v5.7.12)
 
 ### Added

composer.json

@@ -78,6 +78,7 @@
         "aws/aws-sdk-php": "^3.0",
         "doctrine/dbal": "^2.6",
         "filp/whoops": "^2.1.4",
+        "guzzlehttp/guzzle": "^6.3",
         "league/flysystem-cached-adapter": "^1.0",
         "mockery/mockery": "^1.0",
         "moontoast/math": "^1.1",

src/Illuminate/Cache/Console/ClearCommand.php

@@ -60,7 +60,7 @@ public function __construct(CacheManager $cache, Filesystem $files)
      */
     public function handle()
     {
-        $this->laravel['events']->fire(
+        $this->laravel['events']->dispatch(
             'cache:clearing', [$this->argument('store'), $this->tags()]
         );
 
@@ -72,7 +72,7 @@ public function handle()
             return $this->error('Failed to clear cache. Make sure you have the appropriate permissions.');
         }
 
-        $this->laravel['events']->fire(
+        $this->laravel['events']->dispatch(
             'cache:cleared', [$this->argument('store'), $this->tags()]
         );
 

src/Illuminate/Cache/Repository.php

@@ -70,6 +70,17 @@ public function has($key)
         return ! is_null($this->get($key));
     }
 
+    /**
+     * Determine if an item doesn't exist in the cache.
+     *
+     * @param  string  $key
+     * @return bool
+     */
+    public function missing($key)
+    {
+        return ! $this->has($key);
+    }
+
     /**
      * Retrieve an item from the cache by key.
      *
@@ -308,7 +319,7 @@ public function forever($key, $value)
     }
 
     /**
-     * Get an item from the cache, or store the default value.
+     * Get an item from the cache, or execute the given Closure and store the result.
      *
      * @param  string  $key
      * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
@@ -332,9 +343,9 @@ public function remember($key, $minutes, Closure $callback)
     }
 
     /**
-     * Get an item from the cache, or store the default value forever.
+     * Get an item from the cache, or execute the given Closure and store the result forever.
      *
-     * @param  string   $key
+     * @param  string  $key
      * @param  \Closure  $callback
      * @return mixed
      */
@@ -344,9 +355,9 @@ public function sear($key, Closure $callback)
     }
 
     /**
-     * Get an item from the cache, or store the default value forever.
+     * Get an item from the cache, or execute the given Closure and store the result forever.
      *
-     * @param  string   $key
+     * @param  string  $key
      * @param  \Closure  $callback
      * @return mixed
      */

src/Illuminate/Console/Application.php

@@ -81,15 +81,15 @@ public function run(InputInterface $input = null, OutputInterface $output = null
             $input = $input ?: new ArgvInput
         );
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Events\CommandStarting(
                 $commandName, $input, $output = $output ?: new ConsoleOutput
             )
         );
 
         $exitCode = parent::run($input, $output);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Events\CommandFinished($commandName, $input, $output, $exitCode)
         );
 

src/Illuminate/Contracts/Cache/Repository.php

@@ -81,7 +81,7 @@ public function decrement($key, $value = 1);
     public function forever($key, $value);
 
     /**
-     * Get an item from the cache, or store the default value.
+     * Get an item from the cache, or execute the given Closure and store the result.
      *
      * @param  string  $key
      * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
@@ -91,18 +91,18 @@ public function forever($key, $value);
     public function remember($key, $minutes, Closure $callback);
 
     /**
-     * Get an item from the cache, or store the default value forever.
+     * Get an item from the cache, or execute the given Closure and store the result forever.
      *
-     * @param  string   $key
+     * @param  string  $key
      * @param  \Closure  $callback
      * @return mixed
      */
     public function sear($key, Closure $callback);
 
     /**
-     * Get an item from the cache, or store the default value forever.
+     * Get an item from the cache, or execute the given Closure and store the result forever.
      *
-     * @param  string   $key
+     * @param  string  $key
      * @param  \Closure  $callback
      * @return mixed
      */

src/Illuminate/Contracts/Validation/Rule.php

@@ -16,7 +16,7 @@ public function passes($attribute, $value);
     /**
      * Get the validation error message.
      *
-     * @return string
+     * @return string|array
      */
     public function message();
 }

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -46,6 +46,10 @@ class Grammar extends BaseGrammar
      */
     public function compileSelect(Builder $query)
     {
+        if ($query->unions && $query->aggregate) {
+            return $this->compileUnionAggregate($query);
+        }
+
         // If the query does not have any columns set, we'll set the columns to the
         // * character to just get all of the columns from the database. Then we
         // can build the query and concatenate all the pieces together as one.
@@ -711,6 +715,21 @@ protected function compileUnion(array $union)
         return $conjunction.$union['query']->toSql();
     }
 
+    /**
+     * Compile a union aggregate query into SQL.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return string
+     */
+    protected function compileUnionAggregate(Builder $query)
+    {
+        $sql = $this->compileAggregate($query, $query->aggregate);
+
+        $query->aggregate = null;
+
+        return $sql.' from ('.$this->compileSelect($query).') as '.$this->wrapTable('temp_table');
+    }
+
     /**
      * Compile an exists statement into SQL.
      *

src/Illuminate/Database/Query/Grammars/MySqlGrammar.php

@@ -42,6 +42,10 @@ class MySqlGrammar extends Grammar
      */
     public function compileSelect(Builder $query)
     {
+        if ($query->unions && $query->aggregate) {
+            return $this->compileUnionAggregate($query);
+        }
+
         $sql = parent::compileSelect($query);
 
         if ($query->unions) {

src/Illuminate/Database/Query/Grammars/PostgresGrammar.php

@@ -363,7 +363,7 @@ protected function compileDeleteWithJoins($query, $table)
      */
     public function compileTruncate(Builder $query)
     {
-        return ['truncate '.$this->wrapTable($query->from).' restart identity' => []];
+        return ['truncate '.$this->wrapTable($query->from).' restart identity cascade' => []];
     }
 
     /**

src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php

@@ -46,6 +46,10 @@ class SQLiteGrammar extends Grammar
      */
     public function compileSelect(Builder $query)
     {
+        if ($query->unions && $query->aggregate) {
+            return $this->compileUnionAggregate($query);
+        }
+
         $sql = parent::compileSelect($query);
 
         if ($query->unions) {

src/Illuminate/Database/Schema/ColumnDefinition.php

@@ -12,7 +12,7 @@
  * @method ColumnDefinition collation(string $collation) Specify a collation for the column (MySQL/SQL Server)
  * @method ColumnDefinition comment(string $comment) Add a comment to the column (MySQL)
  * @method ColumnDefinition default(mixed $value) Specify a "default" value for the column
- * @method ColumnDefinition first(string $column) Place the column "first" in the table (MySQL)
+ * @method ColumnDefinition first() Place the column "first" in the table (MySQL)
  * @method ColumnDefinition nullable($value = true) Allow NULL values to be inserted into the column
  * @method ColumnDefinition storedAs($expression) Create a stored generated column (MySQL)
  * @method ColumnDefinition unique() Add a unique index
@@ -22,6 +22,7 @@
  * @method ColumnDefinition generatedAs($expression) Create a SQL compliant identity column (PostgreSQL)
  * @method ColumnDefinition always() Used as a modifier for generatedAs() (PostgreSQL)
  * @method ColumnDefinition index() Add an index
+ * @method ColumnDefinition change() Change the column
  */
 class ColumnDefinition extends Fluent
 {

src/Illuminate/Foundation/Application.php

@@ -200,11 +200,11 @@ public function bootstrapWith(array $bootstrappers)
         $this->hasBeenBootstrapped = true;
 
         foreach ($bootstrappers as $bootstrapper) {
-            $this['events']->fire('bootstrapping: '.$bootstrapper, [$this]);
+            $this['events']->dispatch('bootstrapping: '.$bootstrapper, [$this]);
 
             $this->make($bootstrapper)->bootstrap($this);
 
-            $this['events']->fire('bootstrapped: '.$bootstrapper, [$this]);
+            $this['events']->dispatch('bootstrapped: '.$bootstrapper, [$this]);
         }
     }
 

src/Illuminate/Foundation/Exceptions/views/403.blade.php

@@ -8,4 +8,4 @@
 </div>
 @endsection
 
-@section('message', __('Sorry, you are forbidden from accessing this page.'))
+@section('message', __($exception->getMessage() ?: 'Sorry, you are forbidden from accessing this page.'))

src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php

@@ -43,7 +43,7 @@ protected function clean($request)
 
         if ($request->isJson()) {
             $this->cleanParameterBag($request->json());
-        } else {
+        } elseif ($request->request !== $request->query) {
             $this->cleanParameterBag($request->request);
         }
     }

src/Illuminate/Log/LogManager.php

@@ -270,8 +270,10 @@ protected function createSlackDriver(array $config)
                 $config['emoji'] ?? ':boom:',
                 $config['short'] ?? false,
                 $config['context'] ?? true,
-                $this->level($config)
-            )),
+                $this->level($config),
+                $config['bubble'] ?? true,
+                $config['exclude_fields'] ?? []
+            ), $config),
         ]);
     }
 

src/Illuminate/Queue/Jobs/RedisJob.php

@@ -120,7 +120,7 @@ public function getJobId()
     /**
      * Get the underlying Redis factory implementation.
      *
-     * @return \Illuminate\Contracts\Redis\Factory
+     * @return \Illuminate\Queue\RedisQueue
      */
     public function getRedisQueue()
     {

src/Illuminate/Support/Collection.php

@@ -58,7 +58,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     protected static $proxies = [
         'average', 'avg', 'contains', 'each', 'every', 'filter', 'first',
         'flatMap', 'groupBy', 'keyBy', 'map', 'max', 'min', 'partition',
-        'reject', 'sortBy', 'sortByDesc', 'sum', 'unique',
+        'reject', 'some', 'sortBy', 'sortByDesc', 'sum', 'unique',
     ];
 
     /**
@@ -238,6 +238,19 @@ public function collapse()
         return new static(Arr::collapse($this->items));
     }
 
+    /**
+     * Alias for the "contains" method.
+     *
+     * @param  mixed  $key
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function some($key, $operator = null, $value = null)
+    {
+        return $this->contains($key, $operator, $value);
+    }
+
     /**
      * Determine if an item exists in the collection.
      *
@@ -501,6 +514,32 @@ public function when($value, callable $callback, callable $default = null)
         return $this;
     }
 
+    /**
+     * Apply the callback if the collection is empty.
+     *
+     * @param  bool  $value
+     * @param  callable  $callback
+     * @param  callable  $default
+     * @return static|mixed
+     */
+    public function whenEmpty(callable $callback, callable $default = null)
+    {
+        return $this->when($this->isEmpty(), $callback, $default);
+    }
+
+    /**
+     * Apply the callback if the collection is not empty.
+     *
+     * @param  bool  $value
+     * @param  callable  $callback
+     * @param  callable  $default
+     * @return static|mixed
+     */
+    public function whenNotEmpty(callable $callback, callable $default = null)
+    {
+        return $this->when($this->isNotEmpty(), $callback, $default);
+    }
+
     /**
      * Apply the callback if the value is falsy.
      *
@@ -514,6 +553,32 @@ public function unless($value, callable $callback, callable $default = null)
         return $this->when(! $value, $callback, $default);
     }
 
+    /**
+     * Apply the callback unless the collection is empty.
+     *
+     * @param  bool  $value
+     * @param  callable  $callback
+     * @param  callable  $default
+     * @return static|mixed
+     */
+    public function unlessEmpty(callable $callback, callable $default = null)
+    {
+        return $this->unless($this->isEmpty(), $callback, $default);
+    }
+
+    /**
+     * Apply the callback unless the collection is not empty.
+     *
+     * @param  bool  $value
+     * @param  callable  $callback
+     * @param  callable  $default
+     * @return static|mixed
+     */
+    public function unlessNotEmpty(callable $callback, callable $default = null)
+    {
+        return $this->unless($this->isNotEmpty(), $callback, $default);
+    }
+
     /**
      * Filter items by the given key value pair.
      *