Merge branch 'master' into improve-from-subqueries-v2

.travis.yml

@@ -27,7 +27,7 @@ services:
 before_install:
   - phpenv config-rm xdebug.ini || true
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - printf "\n" | pecl install -f redis-4.3.0
+  - printf "\n" | pecl install -f redis
   - travis_retry composer self-update
   - mysql -e 'CREATE DATABASE forge;'
 

CHANGELOG-5.8.md

@@ -1,9 +1,15 @@
 # Release Notes for 5.8.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v5.8.31...5.8)
+## [Unreleased](https://github.com/laravel/framework/compare/v5.8.32...5.8)
 
-### TODO:
-- Resolve columns with schema references ([#29448](https://github.com/laravel/framework/pull/29448))
+
+## [v5.8.32 (2019-08-13)](https://github.com/laravel/framework/compare/v5.8.31...v5.8.32)
+
+### Fixed
+- Fixed top level wildcard validation for `distinct` validator ([#29499](https://github.com/laravel/framework/pull/29499))
+- Fixed resolving of columns with schema references in Postgres ([#29448](https://github.com/laravel/framework/pull/29448))
+- Only remove the event mutex if it was created ([#29526](https://github.com/laravel/framework/pull/29526))
+- Fixed restoring serialized collection with deleted models ([#29533](https://github.com/laravel/framework/pull/29533), [74b62bb](https://github.com/laravel/framework/commit/74b62bbbb32674dfa167e2812231bf302454e67f))
 
 
 ## [v5.8.31 (2019-08-06)](https://github.com/laravel/framework/compare/v5.8.30...v5.8.31)

src/Illuminate/Auth/Notifications/ResetPassword.php

@@ -60,7 +60,7 @@ public function toMail($notifiable)
             ->subject(Lang::get('Reset Password Notification'))
             ->line(Lang::get('You are receiving this email because we received a password reset request for your account.'))
             ->action(Lang::get('Reset Password'), url(config('app.url').route('password.reset', ['token' => $this->token, 'email' => $notifiable->getEmailForPasswordReset()], false)))
-            ->line(Lang::get('This password reset link will expire in :count minutes.', ['count' => config('auth.passwords.users.expire')]))
+            ->line(Lang::get('This password reset link will expire in :count minutes.', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')]))
             ->line(Lang::get('If you did not request a password reset, no further action is required.'));
     }
 

src/Illuminate/Cache/NullStore.php

@@ -6,13 +6,6 @@ class NullStore extends TaggableStore
 {
     use RetrievesMultipleKeys;
 
-    /**
-     * The array of stored values.
-     *
-     * @var array
-     */
-    protected $storage = [];
-
     /**
      * Retrieve an item from the cache by key.
      *

src/Illuminate/Container/Container.php

@@ -768,9 +768,7 @@ protected function getContextualConcrete($abstract)
      */
     protected function findInContextualBindings($abstract)
     {
-        if (isset($this->contextual[end($this->buildStack)][$abstract])) {
-            return $this->contextual[end($this->buildStack)][$abstract];
-        }
+        return $this->contextual[end($this->buildStack)][$abstract] ?? null;
     }
 
     /**

src/Illuminate/Database/Connectors/SqlServerConnector.php

@@ -166,11 +166,11 @@ protected function buildConnectString($driver, array $arguments)
      */
     protected function buildHostString(array $config, $separator)
     {
-        if (isset($config['port']) && ! empty($config['port'])) {
-            return $config['host'].$separator.$config['port'];
-        } else {
+        if (empty($config['port'])) {
             return $config['host'];
         }
+
+        return $config['host'].$separator.$config['port'];
     }
 
     /**

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

@@ -376,9 +376,7 @@ public function getAttributeValue($key)
      */
     protected function getAttributeFromArray($key)
     {
-        if (isset($this->attributes[$key])) {
-            return $this->attributes[$key];
-        }
+        return $this->attributes[$key] ?? null;
     }
 
     /**

src/Illuminate/Database/Query/Builder.php

@@ -221,7 +221,21 @@ public function __construct(ConnectionInterface $connection,
      */
     public function select($columns = ['*'])
     {
-        $this->columns = is_array($columns) ? $columns : func_get_args();
+        $this->columns = [];
+
+        $columns = is_array($columns) ? $columns : func_get_args();
+
+        foreach ($columns as $as => $column) {
+            if (is_string($as) && (
+                $column instanceof self ||
+                $column instanceof EloquentBuilder ||
+                $column instanceof Closure
+            )) {
+                $this->selectSub($column, $as);
+            } else {
+                $this->columns[] = $column;
+            }
+        }
 
         return $this;
     }
@@ -339,9 +353,23 @@ protected function parseSub($query)
      */
     public function addSelect($column)
     {
-        $column = is_array($column) ? $column : func_get_args();
+        $columns = is_array($column) ? $column : func_get_args();
+
+        foreach ($columns as $as => $column) {
+            if (is_string($as) && (
+                $column instanceof self ||
+                $column instanceof EloquentBuilder ||
+                $column instanceof Closure
+            )) {
+                if (is_null($this->columns)) {
+                    $this->select($this->from.'.*');
+                }
 
-        $this->columns = array_merge((array) $this->columns, $column);
+                $this->selectSub($column, $as);
+            } else {
+                $this->columns[] = $column;
+            }
+        }
 
         return $this;
     }
@@ -1768,14 +1796,24 @@ public function orHavingRaw($sql, array $bindings = [])
     /**
      * Add an "order by" clause to the query.
      *
-     * @param  string  $column
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string  $column
      * @param  string  $direction
      * @return $this
      *
      * @throws \InvalidArgumentException
      */
     public function orderBy($column, $direction = 'asc')
     {
+        if ($column instanceof self ||
+            $column instanceof EloquentBuilder ||
+            $column instanceof Closure) {
+            [$query, $bindings] = $this->createSub($column);
+
+            $column = new Expression('('.$query.')');
+
+            $this->addBinding($bindings, 'order');
+        }
+
         $direction = strtolower($direction);
 
         if (! in_array($direction, ['asc', 'desc'], true)) {

src/Illuminate/Database/Seeder.php

@@ -35,11 +35,13 @@ public function call($class, $silent = false)
         $classes = Arr::wrap($class);
 
         foreach ($classes as $class) {
+            $seeder = $this->resolve($class);
+
             if ($silent === false && isset($this->command)) {
-                $this->command->getOutput()->writeln("<info>Seeding:</info> $class");
+                $this->command->getOutput()->writeln('<info>Seeding:</info> '.get_class($seeder));
             }
 
-            $this->resolve($class)->__invoke();
+            $seeder->__invoke();
         }
 
         return $this;

src/Illuminate/Filesystem/FilesystemManager.php

@@ -217,7 +217,7 @@ protected function formatS3Config(array $config)
     {
         $config += ['version' => 'latest'];
 
-        if ($config['key'] && $config['secret']) {
+        if (! empty($config['key']) && ! empty($config['secret'])) {
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 

src/Illuminate/Foundation/Events/DiscoverEvents.php

@@ -42,6 +42,10 @@ protected static function getListenerEvents($listeners, $basePath)
                 static::classFromFile($listener, $basePath)
             );
 
+            if (! $listener->isInstantiable()) {
+                continue;
+            }
+
             foreach ($listener->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
                 if (! Str::is('handle*', $method->name) ||
                     ! isset($method->getParameters()[0])) {

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -13,6 +13,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ViewErrorBag;
+use Whoops\Handler\HandlerInterface;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\Container;
@@ -24,6 +25,7 @@
 use Symfony\Component\Debug\Exception\FlattenException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -350,7 +352,11 @@ protected function renderExceptionWithWhoops(Exception $e)
      */
     protected function whoopsHandler()
     {
-        return (new WhoopsHandler)->forDebug();
+        try {
+            return app(HandlerInterface::class);
+        } catch (BindingResolutionException $e) {
+            return (new WhoopsHandler)->forDebug();
+        }
     }
 
     /**

src/Illuminate/Foundation/ProviderRepository.php

@@ -186,8 +186,8 @@ protected function freshManifest(array $providers)
      */
     public function writeManifest($manifest)
     {
-        if (! is_writable(dirname($this->manifestPath))) {
-            throw new Exception('The bootstrap/cache directory must be present and writable.');
+        if (! is_writable($dirname = dirname($this->manifestPath))) {
+            throw new Exception("The {$dirname} directory must be present and writable.");
         }
 
         $this->files->replace(

src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php

@@ -635,8 +635,8 @@ protected function registerQueueListenCommand()
      */
     protected function registerQueueRestartCommand()
     {
-        $this->app->singleton('command.queue.restart', function () {
-            return new QueueRestartCommand;
+        $this->app->singleton('command.queue.restart', function ($app) {
+            return new QueueRestartCommand($app['cache.store']);
         });
     }
 
@@ -660,7 +660,7 @@ protected function registerQueueRetryCommand()
     protected function registerQueueWorkCommand()
     {
         $this->app->singleton('command.queue.work', function ($app) {
-            return new QueueWorkCommand($app['queue.worker']);
+            return new QueueWorkCommand($app['queue.worker'], $app['cache.store']);
         });
     }
 

src/Illuminate/Foundation/Testing/PendingCommand.php

@@ -165,6 +165,7 @@ protected function mockConsoleOutput()
 
         foreach ($this->test->expectedQuestions as $i => $question) {
             $mock->shouldReceive('askQuestion')
+                ->once()
                 ->ordered()
                 ->with(Mockery::on(function ($argument) use ($question) {
                     return $argument->getQuestion() == $question[0];
@@ -194,6 +195,7 @@ private function createABufferedOutputMock()
 
         foreach ($this->test->expectedOutput as $i => $output) {
             $mock->shouldReceive('doWrite')
+                ->once()
                 ->ordered()
                 ->with($output, Mockery::any())
                 ->andReturnUsing(function () use ($i) {

src/Illuminate/Foundation/Testing/TestCase.php

@@ -6,8 +6,10 @@
 use Throwable;
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Database\Eloquent\Model;
+use Mockery\Exception\InvalidCountException;
 use Illuminate\Console\Application as Artisan;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
@@ -166,7 +168,13 @@ protected function tearDown(): void
                 $this->addToAssertionCount($container->mockery_getExpectationCount());
             }
 
-            Mockery::close();
+            try {
+                Mockery::close();
+            } catch (InvalidCountException $e) {
+                if (! Str::contains($e->getMethodName(), ['doWrite', 'askQuestion'])) {
+                    throw $e;
+                }
+            }
         }
 
         if (class_exists(Carbon::class)) {

src/Illuminate/Log/ParsesLogConfiguration.php

@@ -57,10 +57,6 @@ protected function level(array $config)
      */
     protected function parseChannel(array $config)
     {
-        if (! isset($config['name'])) {
-            return $this->getFallbackChannelName();
-        }
-
-        return $config['name'];
+        return $config['name'] ?? $this->getFallbackChannelName();
     }
 }

src/Illuminate/Notifications/NotificationSender.php

@@ -55,8 +55,8 @@ public function __construct($manager, $bus, $events, $locale = null)
     {
         $this->bus = $bus;
         $this->events = $events;
-        $this->manager = $manager;
         $this->locale = $locale;
+        $this->manager = $manager;
     }
 
     /**

src/Illuminate/Pagination/LengthAwarePaginator.php

@@ -7,7 +7,6 @@
 use JsonSerializable;
 use IteratorAggregate;
 use Illuminate\Support\Collection;
-use Illuminate\Support\HtmlString;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator as LengthAwarePaginatorContract;
@@ -73,7 +72,7 @@ protected function setCurrentPage($currentPage, $pageName)
      *
      * @param  string|null  $view
      * @param  array  $data
-     * @return \Illuminate\Support\HtmlString
+     * @return \Illuminate\Contracts\Support\Htmlable
      */
     public function links($view = null, $data = [])
     {
@@ -85,14 +84,14 @@ public function links($view = null, $data = [])
      *
      * @param  string|null  $view
      * @param  array  $data
-     * @return \Illuminate\Support\HtmlString
+     * @return \Illuminate\Contracts\Support\Htmlable
      */
     public function render($view = null, $data = [])
     {
-        return new HtmlString(static::viewFactory()->make($view ?: static::$defaultView, array_merge($data, [
+        return static::viewFactory()->make($view ?: static::$defaultView, array_merge($data, [
             'paginator' => $this,
             'elements' => $this->elements(),
-        ]))->render());
+        ]));
     }
 
     /**

src/Illuminate/Pagination/Paginator.php

@@ -7,7 +7,6 @@
 use JsonSerializable;
 use IteratorAggregate;
 use Illuminate\Support\Collection;
-use Illuminate\Support\HtmlString;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Pagination\Paginator as PaginatorContract;
@@ -102,15 +101,13 @@ public function links($view = null, $data = [])
      *
      * @param  string|null  $view
      * @param  array  $data
-     * @return string
+     * @return \Illuminate\Contracts\Support\Htmlable
      */
     public function render($view = null, $data = [])
     {
-        return new HtmlString(
-            static::viewFactory()->make($view ?: static::$defaultSimpleView, array_merge($data, [
-                'paginator' => $this,
-            ]))->render()
-        );
+        return static::viewFactory()->make($view ?: static::$defaultSimpleView, array_merge($data, [
+            'paginator' => $this,
+        ]));
     }
 
     /**