diff --git a/.gitattributes b/.gitattributes
index 927c475f58cd..a49ae3b7ca61 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,9 +5,8 @@
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.nitpick.json export-ignore
 .php_cs export-ignore
 .travis.yml export-ignore
-phpunit.xml export-ignore
+phpunit.xml.dist export-ignore
 CHANGELOG.md export-ignore
 CONTRIBUTING.md export-ignore
diff --git a/.gitignore b/.gitignore
index 54406f02a976..2de844b899a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ composer.lock
 .php_cs.cache
 .DS_Store
 Thumbs.db
+/phpunit.xml
\ No newline at end of file
diff --git a/.nitpick.json b/.nitpick.json
deleted file mode 100644
index 3881d8dc2f2e..000000000000
--- a/.nitpick.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "ignore": [
-        "tests/*"
-    ]
-}
diff --git a/.travis.yml b/.travis.yml
index 20d73d042e04..37a59740861d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - 5.6
   - 7.0
-  - hhvm
 
 env:
   global:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a80d6ff302b..96c3abc935ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Release Notes
 
+## v5.2.43 (2016-08-10)
+
+### Changed
+- Throw exception if `$amount` is not numeric in `increment()` and `decrement()` ([915cb84](https://github.com/laravel/framework/commit/915cb843981ad434b10709425d968bf2db37cb1a))
+
+
+## v5.2.42 (2016-08-08)
+
+### Added
+- Allow `BelongsToMany::detach()` to accept a collection ([#14412](https://github.com/laravel/framework/pull/14412))
+- Added `whereTime()` and `orWhereTime()` to query builder ([#14528](https://github.com/laravel/framework/pull/14528))
+- Added PHP 7.1 support ([#14549](https://github.com/laravel/framework/pull/14549))
+- Allow collections to be created from objects that implement `Traversable` ([#14628](https://github.com/laravel/framework/pull/14628))
+- Support dot notation in `Request::exists()` ([#14660](https://github.com/laravel/framework/pull/14660))
+- Added missing `Model::makeHidden()` method ([#14641](https://github.com/laravel/framework/pull/14641))
+
+### Changed
+- Return `true` when `$key` is empty in `MessageBag::has()` ([#14409](https://github.com/laravel/framework/pull/14409))
+- Optimized `Filesystem::moveDirectory` ([#14362](https://github.com/laravel/framework/pull/14362))
+- Convert `$count` to integer in `Str::plural()` ([#14502](https://github.com/laravel/framework/pull/14502))
+- Handle arrays in `validateIn()` method ([#14607](https://github.com/laravel/framework/pull/14607))
+
+### Fixed
+- Fixed an issue with `wherePivotIn()` ([#14397](https://github.com/laravel/framework/issues/14397))
+- Fixed PDO connection on HHVM ([#14429](https://github.com/laravel/framework/pull/14429))
+- Prevent `make:migration` from creating duplicate classes ([#14432](https://github.com/laravel/framework/pull/14432))
+- Fixed lazy eager loading issue in `LengthAwarePaginator` collection ([#14476](https://github.com/laravel/framework/pull/14476))
+- Fixed plural form of Pokémon ([#14525](https://github.com/laravel/framework/pull/14525))
+- Fixed authentication bug in `TokenGuard::validate()` ([#14568](https://github.com/laravel/framework/pull/14568))
+- Fix missing middleware parameters when using `authorizeResource()` ([#14592](https://github.com/laravel/framework/pull/14592))
+
+### Removed
+- Removed duplicate interface implementation in `Dispatcher` ([#14515](https://github.com/laravel/framework/pull/14515))
+
+
 ## v5.2.41 (2016-07-20)
 
 ### Changed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2cbf8251054c..500ac3f96bec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Laravel Contribution Guide
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions). Please review the entire guide before sending a pull request.
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). Please review the entire guide before sending a pull request.
diff --git a/composer.json b/composer.json
index bcbbd3e8bb49..471df21da6c9 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "The Laravel Framework.",
     "keywords": ["framework", "laravel"],
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -11,7 +11,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
@@ -27,6 +27,7 @@
         "nesbot/carbon": "~1.20",
         "paragonie/random_compat": "~1.4|~2.0",
         "psy/psysh": "0.7.*",
+        "ramsey/uuid": "~3.0",
         "swiftmailer/swiftmailer": "~5.1",
         "symfony/console": "3.1.*",
         "symfony/debug": "3.1.*",
diff --git a/phpunit.xml b/phpunit.xml.dist
similarity index 87%
rename from phpunit.xml
rename to phpunit.xml.dist
index db640da487f2..baa2d1e86eb3 100644
--- a/phpunit.xml
+++ b/phpunit.xml.dist
@@ -26,4 +26,10 @@
             </exclude>
         </whitelist>
     </filter>
+    <php>
+      <!--
+      <env name="REDIS_HOST" value="127.0.0.1" />
+      <env name="REDIS_PORT" value="6379" />
+      -->
+    </php>
 </phpunit>
diff --git a/readme.md b/readme.md
index 76d266ffaf3c..c7d5e0f27848 100644
--- a/readme.md
+++ b/readme.md
@@ -17,11 +17,11 @@ Laravel is accessible, yet powerful, providing powerful tools needed for large,
 
 ## Official Documentation
 
-Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs).
+Documentation for the framework can be found on the [Laravel website](https://laravel.com/docs).
 
 ## Contributing
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
 
 ## Security Vulnerabilities
 
diff --git a/src/Illuminate/Auth/Access/Gate.php b/src/Illuminate/Auth/Access/Gate.php
index a16966e75e6d..85882567e95d 100644
--- a/src/Illuminate/Auth/Access/Gate.php
+++ b/src/Illuminate/Auth/Access/Gate.php
@@ -369,11 +369,9 @@ protected function resolvePolicyCallback($user, $ability, array $arguments)
             }
 
             // If the first argument is a string, that means they are passing a class name
-            // to the policy. We'll append "Any" to this ability name so that users may
-            // call the policy method with either a class or model name consistently.
+            // to the policy. We will remove the first argument from this argument list
+            // because the policy already knows what type of models it can authorize.
             if (isset($arguments[0]) && is_string($arguments[0])) {
-                $ability = $ability.'Any';
-
                 array_shift($arguments);
             }
 
diff --git a/src/Illuminate/Auth/Console/stubs/make/controllers/HomeController.stub b/src/Illuminate/Auth/Console/stubs/make/controllers/HomeController.stub
index 669e2ea9ca39..8e0007adcab8 100644
--- a/src/Illuminate/Auth/Console/stubs/make/controllers/HomeController.stub
+++ b/src/Illuminate/Auth/Console/stubs/make/controllers/HomeController.stub
@@ -2,7 +2,6 @@
 
 namespace {{namespace}}Http\Controllers;
 
-use {{namespace}}Http\Requests;
 use Illuminate\Http\Request;
 
 class HomeController extends Controller
diff --git a/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub b/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
index bb4775a99093..3ac82d8c38fd 100644
--- a/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
+++ b/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
@@ -17,7 +17,7 @@
                             <label for="email" class="col-md-4 control-label">E-Mail Address</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" autofocus>
 
                                 @if ($errors->has('email'))
                                     <span class="help-block">
diff --git a/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub b/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
index 71d548a30b11..3222a70f9cd8 100644
--- a/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
+++ b/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
@@ -5,10 +5,20 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+
     <title>Laravel</title>
 
     <!-- Styles -->
     <link href="/css/app.css" rel="stylesheet">
+
+    <!-- Scripts -->
+    <script>
+        window.Laravel = <?php echo json_encode([
+            'csrfToken' => csrf_token(),
+        ]); ?>
+    </script>
 </head>
 <body>
     <nav class="navbar navbar-default navbar-static-top">
diff --git a/src/Illuminate/Auth/Middleware/Authorize.php b/src/Illuminate/Auth/Middleware/Authorize.php
index 0d1af41b03b3..6752f9cb30a1 100644
--- a/src/Illuminate/Auth/Middleware/Authorize.php
+++ b/src/Illuminate/Auth/Middleware/Authorize.php
@@ -41,17 +41,17 @@ public function __construct(Auth $auth, Gate $gate)
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @param  string  $ability
-     * @param  string|null  $model
+     * @param  array|null  $models
      * @return mixed
      *
      * @throws \Illuminate\Auth\Access\AuthenticationException
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function handle($request, Closure $next, $ability, $model = null)
+    public function handle($request, Closure $next, $ability, ...$models)
     {
         $this->auth->authenticate();
 
-        $this->gate->authorize($ability, $this->getGateArguments($request, $model));
+        $this->gate->authorize($ability, $this->getGateArguments($request, $models));
 
         return $next($request);
     }
@@ -60,12 +60,18 @@ public function handle($request, Closure $next, $ability, $model = null)
      * Get the arguments parameter for the gate.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  string|null  $model
+     * @param  array|null  $models
      * @return array|string|\Illuminate\Database\Eloquent\Model
      */
-    protected function getGateArguments($request, $model)
+    protected function getGateArguments($request, $models)
     {
-        return is_null($model) ? [] : $this->getModel($request, $model);
+        if (is_null($models)) {
+            return [];
+        }
+
+        return collect($models)->map(function ($model) use ($request) {
+            return $this->getModel($request, $model);
+        })->all();
     }
 
     /**
diff --git a/src/Illuminate/Auth/Notifications/ResetPassword.php b/src/Illuminate/Auth/Notifications/ResetPassword.php
index 488d4e1d0e6b..c5fa1d819ec2 100644
--- a/src/Illuminate/Auth/Notifications/ResetPassword.php
+++ b/src/Illuminate/Auth/Notifications/ResetPassword.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Auth\Notifications;
 
 use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
 
 class ResetPassword extends Notification
 {
@@ -36,15 +37,18 @@ public function via($notifiable)
     }
 
     /**
-     * Get the notification message.
+     * Build the mail representation of the notification.
      *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\MessageBuilder
+     * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function message($notifiable)
+    public function toMail()
     {
-        return $this->line('You are receiving this email because we received a password reset request for your account. Click the button below to reset your password:')
-                    ->action('Reset Password', url('password/reset', $this->token).'?email='.urlencode($notifiable->email))
-                    ->line('If you did not request a password reset, no further action is required.');
+        return (new MailMessage)
+            ->line([
+                'You are receiving this email because we received a password reset request for your account.',
+                'Click the button below to reset your password:',
+            ])
+            ->action('Reset Password', url('password/reset', $this->token))
+            ->line('If you did not request a password reset, no further action is required.');
     }
 }
diff --git a/src/Illuminate/Auth/RequestGuard.php b/src/Illuminate/Auth/RequestGuard.php
index 0d73bd6aef69..e6b9a7e7f73e 100644
--- a/src/Illuminate/Auth/RequestGuard.php
+++ b/src/Illuminate/Auth/RequestGuard.php
@@ -27,11 +27,10 @@ class RequestGuard implements Guard
      * Create a new authentication guard.
      *
      * @param  callable  $callback
-     * @param  \Symfony\Component\HttpFoundation\Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @return void
      */
-    public function __construct(callable $callback,
-                                Request $request)
+    public function __construct(callable $callback, Request $request)
     {
         $this->request = $request;
         $this->callback = $callback;
diff --git a/src/Illuminate/Auth/TokenGuard.php b/src/Illuminate/Auth/TokenGuard.php
index e9d3602fca57..2a33ab0e61f4 100644
--- a/src/Illuminate/Auth/TokenGuard.php
+++ b/src/Illuminate/Auth/TokenGuard.php
@@ -101,6 +101,10 @@ protected function getTokenForRequest()
      */
     public function validate(array $credentials = [])
     {
+        if (empty($credentials[$this->inputKey])) {
+            return false;
+        }
+
         $credentials = [$this->storageKey => $credentials[$this->inputKey]];
 
         if ($this->provider->retrieveByCredentials($credentials)) {
diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json
index 9e3fba321fcb..08582ba6727d 100644
--- a/src/Illuminate/Auth/composer.json
+++ b/src/Illuminate/Auth/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/auth",
     "description": "The Illuminate Auth package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Broadcasting/BroadcastController.php b/src/Illuminate/Broadcasting/BroadcastController.php
index e4b704f5436f..f71c9237711d 100644
--- a/src/Illuminate/Broadcasting/BroadcastController.php
+++ b/src/Illuminate/Broadcasting/BroadcastController.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Broadcasting;
 
-use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Broadcast;
@@ -13,25 +12,10 @@ class BroadcastController extends Controller
      * Authenticate the request for channel access.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return void
+     * @return \Illuminate\Http\Response
      */
     public function authenticate(Request $request)
     {
-        if (Str::startsWith($request->channel_name, 'presence-') && ! $request->user()) {
-            abort(403);
-        }
-
-        return Broadcast::check($request);
-    }
-
-    /**
-     * Store the socket ID for the current user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    public function rememberSocket(Request $request)
-    {
-        return Broadcast::rememberSocket($request);
+        return Broadcast::auth($request);
     }
 }
diff --git a/src/Illuminate/Broadcasting/BroadcastEvent.php b/src/Illuminate/Broadcasting/BroadcastEvent.php
index 1b6bad9f2e12..6b852bd03e87 100644
--- a/src/Illuminate/Broadcasting/BroadcastEvent.php
+++ b/src/Illuminate/Broadcasting/BroadcastEvent.php
@@ -42,8 +42,14 @@ public function fire(Job $job, array $data)
         $name = method_exists($event, 'broadcastAs')
                 ? $event->broadcastAs() : get_class($event);
 
+        $channels = $event->broadcastOn();
+
+        if (! is_array($channels)) {
+            $channels = [$channels];
+        }
+
         $this->broadcaster->broadcast(
-            $event->broadcastOn(), $name, $this->getPayloadFromEvent($event)
+            $channels, $name, $this->getPayloadFromEvent($event)
         );
 
         $job->delete();
diff --git a/src/Illuminate/Broadcasting/BroadcastManager.php b/src/Illuminate/Broadcasting/BroadcastManager.php
index 8693c7ccb88f..697585b7b2c3 100644
--- a/src/Illuminate/Broadcasting/BroadcastManager.php
+++ b/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -7,6 +7,8 @@
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use Illuminate\Broadcasting\Broadcasters\LogBroadcaster;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Broadcasting\Broadcasters\NullBroadcaster;
 use Illuminate\Broadcasting\Broadcasters\RedisBroadcaster;
 use Illuminate\Broadcasting\Broadcasters\PusherBroadcaster;
 use Illuminate\Contracts\Broadcasting\Factory as FactoryContract;
@@ -48,18 +50,19 @@ public function __construct($app)
     /**
      * Register the routes for handling broadcast authentication and sockets.
      *
-     * @param  array  $attributes
+     * @param  array|null  $attributes
      * @return void
      */
-    public function route(array $attributes = [])
+    public function routes(array $attributes = null)
     {
         if ($this->app->routesAreCached()) {
             return;
         }
 
-        $this->app['router']->group($attributes, function () {
-            $this->app['router']->post('/broadcasting/auth', BroadcastController::class.'@authenticate');
-            $this->app['router']->post('/broadcasting/socket', BroadcastController::class.'@rememberSocket');
+        $attributes = $attributes ?: ['middleware' => ['web']];
+
+        $this->app['router']->group($attributes, function ($router) {
+            $router->post('/broadcasting/auth', BroadcastController::class.'@authenticate');
         });
     }
 
@@ -77,35 +80,46 @@ public function socket($request = null)
 
         $request = $request ?: $this->app['request'];
 
-        if ($request->hasHeader('X-Socket-Id')) {
-            return $request->header('X-Socket-Id');
-        }
-
-        if (! $request->hasSession()) {
-            return;
+        if ($request->hasHeader('X-Socket-ID')) {
+            return $request->header('X-Socket-ID');
         }
+    }
 
-        return $this->app['cache']->get(
-            'broadcast:socket:'.$request->session()->getId()
-        );
+    /**
+     * Begin broadcasting an event.
+     *
+     * @param  mixed|null  $event
+     * @return \Illuminate\Broadcasting\PendingBroadcast|void
+     */
+    public function event($event = null)
+    {
+        return new PendingBroadcast($this->app->make('events'), $event);
     }
 
     /**
-     * Remember the socket for the given request.
+     * Queue the given event for broadcast.
      *
-     * @param  \Illuminate\Http\Request|null  $request
+     * @param  mixed  $event
      * @return void
      */
-    public function rememberSocket($request = null)
+    public function queue($event)
     {
-        if (! $request && ! $this->app->bound('request')) {
-            return;
+        $connection = $event instanceof ShouldBroadcastNow ? 'sync' : null;
+
+        if (is_null($connection) && isset($event->connection)) {
+            $connection = $event->connection;
         }
 
-        $request = $request ?: $this->app['request'];
+        $queue = null;
+
+        if (isset($event->broadcastQueue)) {
+            $queue = $event->broadcastQueue;
+        } elseif (isset($event->queue)) {
+            $queue = $event->queue;
+        }
 
-        $this->app['cache']->forever(
-            'broadcast:socket:'.$request->session()->getId(), $request->socket_id
+        $this->app->make('queue')->connection($connection)->pushOn(
+            $queue, BroadcastEvent::class, ['event' => serialize(clone $event)]
         );
     }
 
@@ -223,6 +237,17 @@ protected function createLogDriver(array $config)
         );
     }
 
+    /**
+     * Create an instance of the driver.
+     *
+     * @param  array  $config
+     * @return \Illuminate\Contracts\Broadcasting\Broadcaster
+     */
+    protected function createNullDriver(array $config)
+    {
+        return new NullBroadcaster;
+    }
+
     /**
      * Get the connection configuration.
      *
@@ -278,6 +303,6 @@ public function extend($driver, Closure $callback)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->driver(), $method], $parameters);
+        return $this->driver()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
index 9607c08e15b1..d41ed40fadfc 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
@@ -15,11 +15,6 @@ abstract class Broadcaster implements BroadcasterContract
      */
     protected $channels = [];
 
-    /**
-     * {@inheritdoc}
-     */
-    abstract public function broadcast(array $channels, $event, array $payload = []);
-
     /**
      * Register a channel authenticator.
      *
@@ -27,7 +22,7 @@ abstract public function broadcast(array $channels, $event, array $payload = [])
      * @param  callable  $callback
      * @return $this
      */
-    public function auth($channel, callable $callback)
+    public function channel($channel, callable $callback)
     {
         $this->channels[$channel] = $callback;
 
@@ -38,12 +33,11 @@ public function auth($channel, callable $callback)
      * Authenticate the incoming request for a given channel.
      *
      * @param  \Illuminate\Http\Request  $request
+     * @param  string  $channel
      * @return mixed
      */
-    public function check($request)
+    protected function verifyUserCanAccessChannel($request, $channel)
     {
-        $channel = str_replace(['private-', 'presence-'], '', $request->channel_name);
-
         foreach ($this->channels as $pattern => $callback) {
             if (! Str::is($pattern, $channel)) {
                 continue;
@@ -84,21 +78,15 @@ protected function extractAuthParameters($pattern, $channel)
     }
 
     /**
-     * Return the valid Pusher authentication response.
+     * Format the channel array into an array of strings.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  mixed  $result
-     * @return mixed
+     * @param  array  $channels
+     * @return array
      */
-    protected function validAuthenticationResponse($request, $result)
+    protected function formatChannels(array $channels)
     {
-        if (is_bool($result)) {
-            return json_encode($result);
-        }
-
-        return json_encode(['channel_data' => [
-            'user_id' => $request->user()->getKey(),
-            'user_info' => $result,
-        ]]);
+        return array_map(function ($channel) {
+            return (string) $channel;
+        }, $channels);
     }
 }
diff --git a/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
index 3407c9cd78c6..50877dc976fe 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
@@ -24,12 +24,28 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function auth($request)
+    {
+        //
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validAuthenticationResponse($request, $result)
+    {
+        //
+    }
+
     /**
      * {@inheritdoc}
      */
     public function broadcast(array $channels, $event, array $payload = [])
     {
-        $channels = implode(', ', $channels);
+        $channels = implode(', ', $this->formatChannels($channels));
 
         $payload = json_encode($payload, JSON_PRETTY_PRINT);
 
diff --git a/src/Illuminate/Broadcasting/Broadcasters/NullBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/NullBroadcaster.php
new file mode 100644
index 000000000000..6205c90c12da
--- /dev/null
+++ b/src/Illuminate/Broadcasting/Broadcasters/NullBroadcaster.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Illuminate\Broadcasting\Broadcasters;
+
+class NullBroadcaster extends Broadcaster
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function auth($request)
+    {
+        //
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validAuthenticationResponse($request, $result)
+    {
+        //
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function broadcast(array $channels, $event, array $payload = [])
+    {
+        //
+    }
+}
diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
index 53a7b9215270..15534128dd21 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -5,6 +5,7 @@
 use Pusher;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class PusherBroadcaster extends Broadcaster
 {
@@ -27,13 +28,31 @@ public function __construct(Pusher $pusher)
     }
 
     /**
-     * Return the valid Pusher authentication response.
+     * Authenticate the incoming request for a given channel.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return mixed
+     */
+    public function auth($request)
+    {
+        if (Str::startsWith($request->channel_name, ['private-', 'presence-']) &&
+            ! $request->user()) {
+            throw new HttpException(403);
+        }
+
+        return parent::verifyUserCanAccessChannel(
+            $request, str_replace(['private-', 'presence-'], '', $request->channel_name)
+        );
+    }
+
+    /**
+     * Return the valid authentication response.
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  mixed  $result
      * @return mixed
      */
-    protected function validAuthenticationResponse($request, $result)
+    public function validAuthenticationResponse($request, $result)
     {
         if (Str::startsWith($request->channel_name, 'private')) {
             return $this->pusher->socket_auth($request->channel_name, $request->socket_id);
@@ -45,13 +64,18 @@ protected function validAuthenticationResponse($request, $result)
     }
 
     /**
-     * {@inheritdoc}
+     * Broadcast the given event.
+     *
+     * @param  array  $channels
+     * @param  string  $event
+     * @param  array  $payload
+     * @return void
      */
     public function broadcast(array $channels, $event, array $payload = [])
     {
         $socket = Arr::pull($payload, 'socket');
 
-        $this->pusher->trigger($channels, $event, $payload, $socket);
+        $this->pusher->trigger($this->formatChannels($channels), $event, $payload, $socket);
     }
 
     /**
diff --git a/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
index fd588aa5bc0c..6b7e5be66c92 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
@@ -3,7 +3,9 @@
 namespace Illuminate\Broadcasting\Broadcasters;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Redis\Database as RedisDatabase;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class RedisBroadcaster extends Broadcaster
 {
@@ -35,7 +37,49 @@ public function __construct(RedisDatabase $redis, $connection = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Authenticate the incoming request for a given channel.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return mixed
+     */
+    public function auth($request)
+    {
+        if (Str::startsWith($request->channel_name, ['private-', 'presence-']) &&
+            ! $request->user()) {
+            throw new HttpException(403);
+        }
+
+        return parent::verifyUserCanAccessChannel(
+            $request, str_replace(['private-', 'presence-'], '', $request->channel_name)
+        );
+    }
+
+    /**
+     * Return the valid authentication response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  mixed  $result
+     * @return mixed
+     */
+    public function validAuthenticationResponse($request, $result)
+    {
+        if (is_bool($result)) {
+            return json_encode($result);
+        }
+
+        return json_encode(['channel_data' => [
+            'user_id' => $request->user()->getKey(),
+            'user_info' => $result,
+        ]]);
+    }
+
+    /**
+     * Broadcast the given event.
+     *
+     * @param  array  $channels
+     * @param  string  $event
+     * @param  array  $payload
+     * @return void
      */
     public function broadcast(array $channels, $event, array $payload = [])
     {
@@ -47,7 +91,7 @@ public function broadcast(array $channels, $event, array $payload = [])
             'event' => $event, 'data' => $payload, 'socket' => $socket,
         ]);
 
-        foreach ($channels as $channel) {
+        foreach ($this->formatChannels($channels) as $channel) {
             $connection->publish($channel, $payload);
         }
     }
diff --git a/src/Illuminate/Broadcasting/Channel.php b/src/Illuminate/Broadcasting/Channel.php
new file mode 100644
index 000000000000..798d6026a5f9
--- /dev/null
+++ b/src/Illuminate/Broadcasting/Channel.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Illuminate\Broadcasting;
+
+class Channel
+{
+    /**
+     * The channel's name.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * Create a new channel instance.
+     *
+     * @param  string  $name
+     * @return void
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Convert the channel instance to a string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->name;
+    }
+}
diff --git a/src/Illuminate/Broadcasting/PendingBroadcast.php b/src/Illuminate/Broadcasting/PendingBroadcast.php
new file mode 100644
index 000000000000..c972520b1ef6
--- /dev/null
+++ b/src/Illuminate/Broadcasting/PendingBroadcast.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Illuminate\Broadcasting;
+
+use Illuminate\Contracts\Events\Dispatcher;
+
+class PendingBroadcast
+{
+    /**
+     * The event dispatcher implementation.
+     *
+     * @var \Illuminate\Contracts\Events\Dispatcher
+     */
+    protected $events;
+
+    /**
+     * The event instance.
+     *
+     * @var mixed
+     */
+    protected $event;
+
+    /**
+     * Create a new pending broadcast instance.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @param  mixed  $event
+     * @return void
+     */
+    public function __construct(Dispatcher $events, $event)
+    {
+        $this->event = $event;
+        $this->events = $events;
+    }
+
+    /**
+     * Handle the object's destruction.
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        $this->events->fire($this->event);
+    }
+
+    /**
+     * Broadcast the event to everyone except the current user.
+     *
+     * @return $this
+     */
+    public function toOthers()
+    {
+        if (method_exists($this->event, 'dontBroadcastToCurrentUser')) {
+            $this->event->dontBroadcastToCurrentUser();
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Illuminate/Broadcasting/PresenceChannel.php b/src/Illuminate/Broadcasting/PresenceChannel.php
new file mode 100644
index 000000000000..22de12d37f16
--- /dev/null
+++ b/src/Illuminate/Broadcasting/PresenceChannel.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Illuminate\Broadcasting;
+
+class PresenceChannel extends Channel
+{
+    /**
+     * Create a new channel instance.
+     *
+     * @param  string  $name
+     * @return void
+     */
+    public function __construct($name)
+    {
+        parent::__construct('presence-'.$name);
+    }
+}
diff --git a/src/Illuminate/Broadcasting/PrivateChannel.php b/src/Illuminate/Broadcasting/PrivateChannel.php
new file mode 100644
index 000000000000..045e630b178f
--- /dev/null
+++ b/src/Illuminate/Broadcasting/PrivateChannel.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Illuminate\Broadcasting;
+
+class PrivateChannel extends Channel
+{
+    /**
+     * Create a new channel instance.
+     *
+     * @param  string  $name
+     * @return void
+     */
+    public function __construct($name)
+    {
+        parent::__construct('private-'.$name);
+    }
+}
diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json
index b7de1953718c..ff1af49db929 100644
--- a/src/Illuminate/Broadcasting/composer.json
+++ b/src/Illuminate/Broadcasting/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/broadcasting",
     "description": "The Illuminate Broadcasting package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Bus/Dispatcher.php b/src/Illuminate/Bus/Dispatcher.php
index 6c87a4a66e2c..70e9b67e2485 100644
--- a/src/Illuminate/Bus/Dispatcher.php
+++ b/src/Illuminate/Bus/Dispatcher.php
@@ -9,9 +9,8 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Bus\QueueingDispatcher;
-use Illuminate\Contracts\Bus\Dispatcher as DispatcherContract;
 
-class Dispatcher implements DispatcherContract, QueueingDispatcher
+class Dispatcher implements QueueingDispatcher
 {
     /**
      * The container implementation.
diff --git a/src/Illuminate/Bus/Queueable.php b/src/Illuminate/Bus/Queueable.php
index b850c5e44a7a..a7d306a89ba3 100644
--- a/src/Illuminate/Bus/Queueable.php
+++ b/src/Illuminate/Bus/Queueable.php
@@ -21,7 +21,7 @@ trait Queueable
     /**
      * The number of seconds before the job should be made available.
      *
-     * @var int|null
+     * @var \DateTime|int|null
      */
     public $delay;
 
diff --git a/src/Illuminate/Bus/composer.json b/src/Illuminate/Bus/composer.json
index 57a578a1f1f2..805e49f93560 100644
--- a/src/Illuminate/Bus/composer.json
+++ b/src/Illuminate/Bus/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/bus",
     "description": "The Illuminate Bus package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Cache/ArrayStore.php b/src/Illuminate/Cache/ArrayStore.php
index efc94c001b88..caf83750acd6 100644
--- a/src/Illuminate/Cache/ArrayStore.php
+++ b/src/Illuminate/Cache/ArrayStore.php
@@ -50,7 +50,7 @@ public function put($key, $value, $minutes)
      */
     public function increment($key, $value = 1)
     {
-        $this->storage[$key] = $this->storage[$key] + $value;
+        $this->storage[$key] = ((int) $this->storage[$key]) + $value;
 
         return $this->storage[$key];
     }
diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
index 69f7111ab2dd..bc1318e504ff 100755
--- a/src/Illuminate/Cache/CacheManager.php
+++ b/src/Illuminate/Cache/CacheManager.php
@@ -298,6 +298,6 @@ public function extend($driver, Closure $callback)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->store(), $method], $parameters);
+        return $this->store()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Cache/Console/CacheTableCommand.php b/src/Illuminate/Cache/Console/CacheTableCommand.php
index 2feedfd27d9a..7c3f4b62d519 100644
--- a/src/Illuminate/Cache/Console/CacheTableCommand.php
+++ b/src/Illuminate/Cache/Console/CacheTableCommand.php
@@ -35,7 +35,7 @@ class CacheTableCommand extends Command
     protected $composer;
 
     /**
-     * Create a new session table command instance.
+     * Create a new cache table command instance.
      *
      * @param  \Illuminate\Filesystem\Filesystem  $files
      * @param  \Illuminate\Support\Composer  $composer
diff --git a/src/Illuminate/Cache/Console/stubs/cache.stub b/src/Illuminate/Cache/Console/stubs/cache.stub
index c972a4fba790..cbcdfa970456 100644
--- a/src/Illuminate/Cache/Console/stubs/cache.stub
+++ b/src/Illuminate/Cache/Console/stubs/cache.stub
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
diff --git a/src/Illuminate/Cache/DatabaseStore.php b/src/Illuminate/Cache/DatabaseStore.php
index 5617c2f56564..3ecc628f9748 100755
--- a/src/Illuminate/Cache/DatabaseStore.php
+++ b/src/Illuminate/Cache/DatabaseStore.php
@@ -165,7 +165,7 @@ protected function incrementOrDecrement($key, $value, Closure $callback)
             }
 
             $current = $this->encrypter->decrypt($cache->value);
-            $new = $callback($current, $value);
+            $new = $callback((int) $current, $value);
 
             if (! is_numeric($current)) {
                 return false;
diff --git a/src/Illuminate/Cache/RedisStore.php b/src/Illuminate/Cache/RedisStore.php
index fa81c0ac48c6..ea80432e4b86 100755
--- a/src/Illuminate/Cache/RedisStore.php
+++ b/src/Illuminate/Cache/RedisStore.php
@@ -3,14 +3,14 @@
 namespace Illuminate\Cache;
 
 use Illuminate\Contracts\Cache\Store;
-use Illuminate\Redis\Database as Redis;
+use Illuminate\Contracts\Redis\Database;
 
 class RedisStore extends TaggableStore implements Store
 {
     /**
      * The Redis database connection.
      *
-     * @var \Illuminate\Redis\Database
+     * @var \Illuminate\Contracts\Redis\Database
      */
     protected $redis;
 
@@ -31,12 +31,12 @@ class RedisStore extends TaggableStore implements Store
     /**
      * Create a new Redis store.
      *
-     * @param  \Illuminate\Redis\Database  $redis
+     * @param  \Illuminate\Contracts\Redis\Database  $redis
      * @param  string  $prefix
      * @param  string  $connection
      * @return void
      */
-    public function __construct(Redis $redis, $prefix = '', $connection = 'default')
+    public function __construct(Database $redis, $prefix = '', $connection = 'default')
     {
         $this->redis = $redis;
         $this->setPrefix($prefix);
@@ -51,7 +51,9 @@ public function __construct(Redis $redis, $prefix = '', $connection = 'default')
      */
     public function get($key)
     {
-        if (! is_null($value = $this->connection()->get($this->prefix.$key))) {
+        $value = $this->connection()->get($this->prefix.$key);
+
+        if (! is_null($value) && $value !== false) {
             return is_numeric($value) ? $value : unserialize($value);
         }
     }
@@ -208,7 +210,7 @@ public function setConnection($connection)
     /**
      * Get the Redis database instance.
      *
-     * @return \Illuminate\Redis\Database
+     * @return \Illuminate\Contracts\Redis\Database
      */
     public function getRedis()
     {
diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
index 3c7eb9eece7d..a1983d793dc1 100755
--- a/src/Illuminate/Cache/Repository.php
+++ b/src/Illuminate/Cache/Repository.php
@@ -110,7 +110,9 @@ protected function fireCacheEvent($event, $payload)
      */
     public function has($key)
     {
-        return ! is_null($this->get($key));
+        $value = $this->get($key);
+
+        return ! is_null($value) && $value !== false;
     }
 
     /**
@@ -128,7 +130,7 @@ public function get($key, $default = null)
 
         $value = $this->store->get($this->itemKey($key));
 
-        if (is_null($value)) {
+        if (is_null($value) || $value === false) {
             $this->fireCacheEvent('missed', [$key]);
 
             $value = value($default);
@@ -158,7 +160,7 @@ public function many(array $keys)
         $values = $this->store->many($normalizedKeys);
 
         foreach ($values as $key => &$value) {
-            if (is_null($value)) {
+            if (is_null($value) || $value === false) {
                 $this->fireCacheEvent('missed', [$key]);
 
                 $value = isset($keys[$key]) ? value($keys[$key]) : null;
@@ -249,7 +251,9 @@ public function add($key, $value, $minutes)
             return $this->store->add($this->itemKey($key), $value, $minutes);
         }
 
-        if (is_null($this->get($key))) {
+        $exists = $this->get($key);
+
+        if (is_null($exists) || $exists === false) {
             $this->put($key, $value, $minutes);
 
             return true;
@@ -306,10 +310,12 @@ public function forever($key, $value)
      */
     public function remember($key, $minutes, Closure $callback)
     {
+        $value = $this->get($key);
+
         // If the item exists in the cache we will just return this immediately
         // otherwise we will execute the given Closure and cache the result
         // of that execution for the given number of minutes in storage.
-        if (! is_null($value = $this->get($key))) {
+        if (! is_null($value) && $value !== false) {
             return $value;
         }
 
@@ -339,10 +345,12 @@ public function sear($key, Closure $callback)
      */
     public function rememberForever($key, Closure $callback)
     {
+        $value = $this->get($key);
+
         // If the item exists in the cache we will just return this immediately
         // otherwise we will execute the given Closure and cache the result
         // of that execution for the given number of minutes. It's easy.
-        if (! is_null($value = $this->get($key))) {
+        if (! is_null($value) && $value !== false) {
             return $value;
         }
 
@@ -506,7 +514,7 @@ public function __call($method, $parameters)
             return $this->macroCall($method, $parameters);
         }
 
-        return call_user_func_array([$this->store, $method], $parameters);
+        return $this->store->$method(...$parameters);
     }
 
     /**
diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json
index 1eaa26b83b2f..568ffb0e8764 100755
--- a/src/Illuminate/Cache/composer.json
+++ b/src/Illuminate/Cache/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/cache",
     "description": "The Illuminate Cache package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json
index d61855ad86a3..4e44ea7bb79a 100755
--- a/src/Illuminate/Config/composer.json
+++ b/src/Illuminate/Config/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/config",
     "description": "The Illuminate Config package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php
index ae10b0aa3311..1971d2a40ab3 100644
--- a/src/Illuminate/Console/Scheduling/Event.php
+++ b/src/Illuminate/Console/Scheduling/Event.php
@@ -341,7 +341,7 @@ public function cron($expression)
      */
     public function hourly()
     {
-        return $this->cron('0 * * * * *');
+        return $this->spliceIntoPosition(1, 0);
     }
 
     /**
@@ -351,7 +351,8 @@ public function hourly()
      */
     public function daily()
     {
-        return $this->cron('0 0 * * * *');
+        return $this->spliceIntoPosition(1, 0)
+                    ->spliceIntoPosition(2, 0);
     }
 
     /**
@@ -481,7 +482,9 @@ public function sundays()
      */
     public function weekly()
     {
-        return $this->cron('0 0 * * 0 *');
+        return $this->spliceIntoPosition(1, 0)
+                    ->spliceIntoPosition(2, 0)
+                    ->spliceIntoPosition(5, 0);
     }
 
     /**
@@ -505,7 +508,9 @@ public function weeklyOn($day, $time = '0:0')
      */
     public function monthly()
     {
-        return $this->cron('0 0 1 * * *');
+        return $this->spliceIntoPosition(1, 0)
+                    ->spliceIntoPosition(2, 0)
+                    ->spliceIntoPosition(3, 1);
     }
 
     /**
@@ -529,7 +534,10 @@ public function monthlyOn($day = 1, $time = '0:0')
      */
     public function quarterly()
     {
-        return $this->cron('0 0 1 */3 *');
+        return $this->spliceIntoPosition(1, 0)
+                    ->spliceIntoPosition(2, 0)
+                    ->spliceIntoPosition(3, 1)
+                    ->spliceIntoPosition(4, '*/3');
     }
 
     /**
@@ -539,7 +547,10 @@ public function quarterly()
      */
     public function yearly()
     {
-        return $this->cron('0 0 1 1 * *');
+        return $this->spliceIntoPosition(1, 0)
+                    ->spliceIntoPosition(2, 0)
+                    ->spliceIntoPosition(3, 1)
+                    ->spliceIntoPosition(4, 1);
     }
 
     /**
@@ -549,7 +560,7 @@ public function yearly()
      */
     public function everyMinute()
     {
-        return $this->cron('* * * * * *');
+        return $this->spliceIntoPosition(1, '*');
     }
 
     /**
@@ -559,7 +570,7 @@ public function everyMinute()
      */
     public function everyFiveMinutes()
     {
-        return $this->cron('*/5 * * * * *');
+        return $this->spliceIntoPosition(1, '*/5');
     }
 
     /**
@@ -569,7 +580,7 @@ public function everyFiveMinutes()
      */
     public function everyTenMinutes()
     {
-        return $this->cron('*/10 * * * * *');
+        return $this->spliceIntoPosition(1, '*/10');
     }
 
     /**
@@ -579,7 +590,7 @@ public function everyTenMinutes()
      */
     public function everyThirtyMinutes()
     {
-        return $this->cron('0,30 * * * * *');
+        return $this->spliceIntoPosition(1, '0,30');
     }
 
     /**
diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php
index b9bd265912ed..f5ee9cf813bc 100644
--- a/src/Illuminate/Console/Scheduling/Schedule.php
+++ b/src/Illuminate/Console/Scheduling/Schedule.php
@@ -39,15 +39,7 @@ public function command($command, array $parameters = [])
     {
         $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
 
-        if (defined('HHVM_VERSION')) {
-            $binary .= ' --php';
-        }
-
-        if (defined('ARTISAN_BINARY')) {
-            $artisan = ProcessUtils::escapeArgument(ARTISAN_BINARY);
-        } else {
-            $artisan = 'artisan';
-        }
+        $artisan = defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan';
 
         return $this->exec("{$binary} {$artisan} {$command}", $parameters);
     }
diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json
index 6c3464d7e6aa..f0b4bc02f014 100755
--- a/src/Illuminate/Console/composer.json
+++ b/src/Illuminate/Console/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/console",
     "description": "The Illuminate Console package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json
index c4ea9ad0b34a..aa98b334530e 100755
--- a/src/Illuminate/Container/composer.json
+++ b/src/Illuminate/Container/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/container",
     "description": "The Illuminate Container package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Contracts/Auth/Access/Gate.php b/src/Illuminate/Contracts/Auth/Access/Gate.php
index 04f3e5e41968..9d8389089515 100644
--- a/src/Illuminate/Contracts/Auth/Access/Gate.php
+++ b/src/Illuminate/Contracts/Auth/Access/Gate.php
@@ -38,6 +38,14 @@ public function policy($class, $policy);
      */
     public function before(callable $callback);
 
+    /**
+     * Register a callback to run after all Gate checks.
+     *
+     * @param  callable  $callback
+     * @return $this
+     */
+    public function after(callable $callback);
+
     /**
      * Determine if the given ability should be granted for the current user.
      *
@@ -65,6 +73,27 @@ public function denies($ability, $arguments = []);
      */
     public function check($ability, $arguments = []);
 
+    /**
+     * Determine if the given ability should be granted for the current user.
+     *
+     * @param  string  $ability
+     * @param  array|mixed  $arguments
+     * @return \Illuminate\Auth\Access\Response
+     *
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function authorize($ability, $arguments = []);
+
+    /**
+     * Get a policy instance for a given class.
+     *
+     * @param  object|string  $class
+     * @return mixed
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function getPolicyFor($class);
+
     /**
      * Get a guard instance for the given user.
      *
diff --git a/src/Illuminate/Contracts/Broadcasting/Broadcaster.php b/src/Illuminate/Contracts/Broadcasting/Broadcaster.php
index 73643669c2b4..1034e4406823 100644
--- a/src/Illuminate/Contracts/Broadcasting/Broadcaster.php
+++ b/src/Illuminate/Contracts/Broadcasting/Broadcaster.php
@@ -4,6 +4,23 @@
 
 interface Broadcaster
 {
+    /**
+     * Authenticate the incoming request for a given channel.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return mixed
+     */
+    public function auth($request);
+
+    /**
+     * Return the valid authentication response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  mixed  $result
+     * @return mixed
+     */
+    public function validAuthenticationResponse($request, $result);
+
     /**
      * Broadcast the given event.
      *
diff --git a/src/Illuminate/Contracts/Notifications/Dispatcher.php b/src/Illuminate/Contracts/Notifications/Dispatcher.php
index 17b8d3e9e2cb..696376620cd6 100644
--- a/src/Illuminate/Contracts/Notifications/Dispatcher.php
+++ b/src/Illuminate/Contracts/Notifications/Dispatcher.php
@@ -4,13 +4,13 @@
 
 interface Dispatcher
 {
-    /**
-     * Dispatch the given notification instance to the given notifiable.
-     *
-     * @param  mixed  $notifiable
-     * @param  mixed  $instance
-     * @param  array  $channels
-     * @return void
-     */
-    public function dispatch($notifiable, $instance, array $channels = []);
+    // *
+    //  * Dispatch the given notification instance to the given notifiable.
+    //  *
+    //  * @param  mixed  $notifiable
+    //  * @param  mixed  $instance
+    //  * @param  array  $channels
+    //  * @return void
+
+    // public function dispatch($notifiable, $instance, array $channels = []);
 }
diff --git a/src/Illuminate/Contracts/Queue/Job.php b/src/Illuminate/Contracts/Queue/Job.php
index 50d849dd2740..577b75e0c8f9 100644
--- a/src/Illuminate/Contracts/Queue/Job.php
+++ b/src/Illuminate/Contracts/Queue/Job.php
@@ -54,6 +54,13 @@ public function attempts();
      */
     public function getName();
 
+    /**
+     * Get the resolved name of the queued job class.
+     *
+     * @return string
+     */
+    public function resolveName();
+
     /**
      * Call the failed method on the job instance.
      *
diff --git a/src/Illuminate/Contracts/Queue/Queue.php b/src/Illuminate/Contracts/Queue/Queue.php
index 3f9e38304720..b5b5c9427c14 100644
--- a/src/Illuminate/Contracts/Queue/Queue.php
+++ b/src/Illuminate/Contracts/Queue/Queue.php
@@ -4,6 +4,14 @@
 
 interface Queue
 {
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null);
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json
index 18e4c9f7d683..e836001ddcaf 100644
--- a/src/Illuminate/Contracts/composer.json
+++ b/src/Illuminate/Contracts/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/contracts",
     "description": "The Illuminate Contracts package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json
index aeccfa7ddbe2..176cd71fdf06 100755
--- a/src/Illuminate/Cookie/composer.json
+++ b/src/Illuminate/Cookie/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/cookie",
     "description": "The Illuminate Cookie package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Database/Capsule/Manager.php b/src/Illuminate/Database/Capsule/Manager.php
index 5800df0603d3..b82a792ce7d2 100755
--- a/src/Illuminate/Database/Capsule/Manager.php
+++ b/src/Illuminate/Database/Capsule/Manager.php
@@ -196,6 +196,6 @@ public function setEventDispatcher(Dispatcher $dispatcher)
      */
     public static function __callStatic($method, $parameters)
     {
-        return call_user_func_array([static::connection(), $method], $parameters);
+        return static::connection()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
index b593559da384..9efaabedac1e 100755
--- a/src/Illuminate/Database/Connection.php
+++ b/src/Illuminate/Database/Connection.php
@@ -407,7 +407,7 @@ public function bindValues($statement, $bindings)
         foreach ($bindings as $key => $value) {
             $statement->bindValue(
                 is_string($key) ? $key : $key + 1, $value,
-                filter_var($value, FILTER_VALIDATE_FLOAT) !== false ? PDO::PARAM_INT : PDO::PARAM_STR
+                ! is_string($value) && is_numeric($value) ? PDO::PARAM_INT : PDO::PARAM_STR
             );
         }
     }
diff --git a/src/Illuminate/Database/DatabaseManager.php b/src/Illuminate/Database/DatabaseManager.php
index 17f8bf676fa1..1021507c1416 100755
--- a/src/Illuminate/Database/DatabaseManager.php
+++ b/src/Illuminate/Database/DatabaseManager.php
@@ -314,6 +314,6 @@ public function getConnections()
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->connection(), $method], $parameters);
+        return $this->connection()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
index 6b3194416e01..40ef104174e7 100755
--- a/src/Illuminate/Database/Eloquent/Builder.php
+++ b/src/Illuminate/Database/Eloquent/Builder.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Eloquent;
 
 use Closure;
+use BadMethodCallException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Pagination\Paginator;
@@ -233,7 +234,9 @@ public function findOrNew($id, $columns = ['*'])
      */
     public function firstOrNew(array $attributes)
     {
-        if (! is_null($instance = $this->where($attributes)->first())) {
+        $mutatedAttributes = $this->model->newInstance($attributes)->getAttributes();
+
+        if (! is_null($instance = $this->where($mutatedAttributes)->first())) {
             return $instance;
         }
 
@@ -249,7 +252,9 @@ public function firstOrNew(array $attributes)
      */
     public function firstOrCreate(array $attributes, array $values = [])
     {
-        if (! is_null($instance = $this->where($attributes)->first())) {
+        $mutatedAttributes = $this->model->newInstance($attributes)->getAttributes();
+
+        if (! is_null($instance = $this->where($mutatedAttributes)->first())) {
             return $instance;
         }
 
@@ -677,7 +682,11 @@ public function getRelation($name)
         // not have to remove these where clauses manually which gets really hacky
         // and is error prone while we remove the developer's own where clauses.
         $relation = Relation::noConstraints(function () use ($name) {
-            return $this->getModel()->$name();
+            try {
+                return $this->getModel()->$name();
+            } catch (BadMethodCallException $e) {
+                throw RelationNotFoundException::make($this->getModel(), $name);
+            }
         });
 
         $nested = $this->nestedRelations($name);
@@ -1287,7 +1296,7 @@ protected function nestWhereSlice($whereSlice, $boolean = 'and')
     /**
      * Get the underlying query builder instance.
      *
-     * @return \Illuminate\Database\Query\Builder|static
+     * @return \Illuminate\Database\Query\Builder
      */
     public function getQuery()
     {
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
index d52c4d8c5992..59a48f6ca454 100755
--- a/src/Illuminate/Database/Eloquent/Collection.php
+++ b/src/Illuminate/Database/Eloquent/Collection.php
@@ -114,6 +114,21 @@ public function merge($items)
         return new static(array_values($dictionary));
     }
 
+    /**
+     * Run a map over each of the items.
+     *
+     * @param  callable  $callback
+     * @return static
+     */
+    public function map(callable $callback)
+    {
+        $result = parent::map($callback);
+
+        return $result->contains(function ($item) {
+            return ! $item instanceof Model;
+        }) ? $result->toBase() : $result;
+    }
+
     /**
      * Diff the collection with the given items.
      *
@@ -160,12 +175,13 @@ public function intersect($items)
      * Return only unique items from the collection.
      *
      * @param  string|callable|null  $key
+     * @param  bool  $strict
      * @return static
      */
-    public function unique($key = null)
+    public function unique($key = null, $strict = false)
     {
         if (! is_null($key)) {
-            return parent::unique($key);
+            return parent::unique($key, $strict);
         }
 
         return new static(array_values($this->getDictionary()));
@@ -341,14 +357,4 @@ public function getQueueableIds()
     {
         return $this->modelKeys();
     }
-
-    /**
-     * Get a base Support collection instance from this collection.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function toBase()
-    {
-        return new BaseCollection($this->items);
-    }
 }
diff --git a/src/Illuminate/Database/Eloquent/FactoryBuilder.php b/src/Illuminate/Database/Eloquent/FactoryBuilder.php
index 3fdb4b0b2e9a..8107dc788760 100644
--- a/src/Illuminate/Database/Eloquent/FactoryBuilder.php
+++ b/src/Illuminate/Database/Eloquent/FactoryBuilder.php
@@ -104,15 +104,11 @@ public function make(array $attributes = [])
     {
         if ($this->amount === 1) {
             return $this->makeInstance($attributes);
-        } else {
-            $results = [];
-
-            for ($i = 0; $i < $this->amount; $i++) {
-                $results[] = $this->makeInstance($attributes);
-            }
-
-            return new Collection($results);
         }
+
+        return new Collection(array_map(function () use ($attributes) {
+            return $this->makeInstance($attributes);
+        }, range(1, $this->amount)));
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
index e946d4b81ef9..cddc22555d8b 100644
--- a/src/Illuminate/Database/Eloquent/Model.php
+++ b/src/Illuminate/Database/Eloquent/Model.php
@@ -182,13 +182,6 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     protected $with = [];
 
-    /**
-     * The class name to be used in polymorphic relations.
-     *
-     * @var string
-     */
-    protected $morphClass;
-
     /**
      * Indicates if the model exists.
      *
@@ -2036,7 +2029,7 @@ public function getMorphClass()
             return array_search($class, $morphMap, true);
         }
 
-        return $this->morphClass ?: $class;
+        return $class;
     }
 
     /**
@@ -2108,6 +2101,21 @@ public function addHidden($attributes = null)
         $this->hidden = array_merge($this->hidden, $attributes);
     }
 
+    /**
+     * Make the given, typically visible, attributes hidden.
+     *
+     * @param  array|string  $attributes
+     * @return $this
+     */
+    public function makeHidden($attributes)
+    {
+        $this->visible = array_diff($this->visible, (array) $attributes);
+
+        $this->hidden = array_unique(array_merge($this->hidden, $attributes));
+
+        return $this;
+    }
+
     /**
      * Make the given, typically hidden, attributes visible.
      *
@@ -2567,10 +2575,14 @@ protected function getArrayableRelations()
     protected function getArrayableItems(array $values)
     {
         if (count($this->getVisible()) > 0) {
-            return array_intersect_key($values, array_flip($this->getVisible()));
+            $values = array_intersect_key($values, array_flip($this->getVisible()));
         }
 
-        return array_diff_key($values, array_flip($this->getHidden()));
+        if (count($this->getHidden()) > 0) {
+            $values = array_diff_key($values, array_flip($this->getHidden()));
+        }
+
+        return $values;
     }
 
     /**
@@ -3139,6 +3151,17 @@ public function isDirty($attributes = null)
         return false;
     }
 
+    /**
+     * Determine if the model or given attribute(s) have remained the same.
+     *
+     * @param  array|string|null  $attributes
+     * @return bool
+     */
+    public function isClean($attributes = null)
+    {
+        return ! $this->isDirty(...func_get_args());
+    }
+
     /**
      * Get the attributes that have been changed since last sync.
      *
diff --git a/src/Illuminate/Database/Eloquent/RelationNotFoundException.php b/src/Illuminate/Database/Eloquent/RelationNotFoundException.php
new file mode 100755
index 000000000000..5026ac9c8910
--- /dev/null
+++ b/src/Illuminate/Database/Eloquent/RelationNotFoundException.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Illuminate\Database\Eloquent;
+
+use RuntimeException;
+
+class RelationNotFoundException extends RuntimeException
+{
+    /**
+     * Create a new exception instance.
+     *
+     * @param  mixed  $model
+     * @param  string  $relation
+     * @return static
+     */
+    public static function make($model, $relation)
+    {
+        $class = get_class($model);
+
+        return new static("Call to undefined relationship [{$relation}] on model [{$class}].");
+    }
+}
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
index 449c5c325158..0c1966eafc4b 100755
--- a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+++ b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -795,6 +795,78 @@ public function createMany(array $records, array $joinings = [])
         return $instances;
     }
 
+    /**
+     * Toggles a model (or models) from the parent.
+     *
+     * Each existing model is detached, and non existing ones are attached.
+     *
+     * @param  mixed  $ids
+     * @return array
+     */
+    public function toggle($ids)
+    {
+        $changes = [
+            'attached' => [], 'detached' => [],
+        ];
+
+        if ($ids instanceof Model) {
+            $ids = $ids->getKey();
+        }
+
+        if ($ids instanceof Collection) {
+            $ids = $ids->modelKeys();
+        }
+
+        // First we will execute a query to get all of the current attached IDs for
+        // the relationship, which will allow us to determine which of them will
+        // be attached and which of them will be detached from the join table.
+        $current = $this->newPivotQuery()
+                    ->pluck($this->otherKey)->all();
+
+        $records = $this->formatRecordsList((array) $ids);
+
+        // Next, we will determine which IDs should get removed from the join table
+        // by checking which of the given ID / records is in the list of current
+        // records. We will then remove all those rows from the joining table.
+        $detach = array_values(array_intersect(
+            $current, array_keys($records)
+        ));
+
+        if (count($detach) > 0) {
+            $this->detach($detach, false);
+
+            $changes['detached'] = $this->castKeys($detach);
+        }
+
+        // Finally, for all of the records that were not detached, we'll attach the
+        // records into the intermediate table. Then we'll add those attaches to
+        // the change list and be ready to return these results to the caller.
+        $attach = array_diff_key($records, array_flip($detach));
+
+        if (count($attach) > 0) {
+            $this->attach($attach, [], false);
+
+            $changes['attached'] = array_keys($attach);
+        }
+
+        if (count($changes['attached']) || count($changes['detached'])) {
+            $this->touchIfTouching();
+        }
+
+        return $changes;
+    }
+
+    /**
+     * Sync the intermediate tables with a list of IDs without detaching.
+     *
+     * @param  \Illuminate\Database\Eloquent\Collection|array  $ids
+     * @return array
+     */
+    public function syncWithoutDetaching($ids)
+    {
+        return $this->sync($ids, false);
+    }
+
     /**
      * Sync the intermediate tables with a list of IDs or collection of models.
      *
@@ -817,7 +889,7 @@ public function sync($ids, $detaching = true)
         // if they exist in the array of current ones, and if not we will insert.
         $current = $this->newPivotQuery()->pluck($this->otherKey)->all();
 
-        $records = $this->formatSyncList($ids);
+        $records = $this->formatRecordsList($ids);
 
         $detach = array_diff($current, array_keys($records));
 
@@ -827,9 +899,7 @@ public function sync($ids, $detaching = true)
         if ($detaching && count($detach) > 0) {
             $this->detach($detach);
 
-            $changes['detached'] = (array) array_map(function ($v) {
-                return is_numeric($v) ? (int) $v : (string) $v;
-            }, $detach);
+            $changes['detached'] = $this->castKeys($detach);
         }
 
         // Now we are finally ready to attach the new records. Note that we'll disable
@@ -847,12 +917,12 @@ public function sync($ids, $detaching = true)
     }
 
     /**
-     * Format the sync list so that it is keyed by ID.
+     * Format the sync/toggle list so that it is keyed by ID.
      *
      * @param  array  $records
      * @return array
      */
-    protected function formatSyncList(array $records)
+    protected function formatRecordsList(array $records)
     {
         $results = [];
 
@@ -901,6 +971,19 @@ protected function attachNew(array $records, array $current, $touch = true)
         return $changes;
     }
 
+    /**
+     * Cast the given keys to integers if they are numeric and string otherwise.
+     *
+     * @param  arary  $keys
+     * @return array
+     */
+    protected function castKeys(array $keys)
+    {
+        return (array) array_map(function ($v) {
+            return is_numeric($v) ? (int) $v : (string) $v;
+        }, $keys);
+    }
+
     /**
      * Update an existing pivot record on the table.
      *
diff --git a/src/Illuminate/Database/Eloquent/SoftDeletingScope.php b/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
index dee43bb4d523..86770d78dfde 100644
--- a/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
+++ b/src/Illuminate/Database/Eloquent/SoftDeletingScope.php
@@ -9,7 +9,7 @@ class SoftDeletingScope implements Scope
      *
      * @var array
      */
-    protected $extensions = ['ForceDelete', 'Restore', 'WithTrashed', 'OnlyTrashed'];
+    protected $extensions = ['ForceDelete', 'Restore', 'WithTrashed', 'WithoutTrashed', 'OnlyTrashed'];
 
     /**
      * Apply the scope to a given Eloquent query builder.
@@ -100,6 +100,25 @@ protected function addWithTrashed(Builder $builder)
         });
     }
 
+    /**
+     * Add the without-trashed extension to the builder.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @return void
+     */
+    protected function addWithoutTrashed(Builder $builder)
+    {
+        $builder->macro('withoutTrashed', function (Builder $builder) {
+            $model = $builder->getModel();
+
+            $builder->withoutGlobalScope($this)->whereNull(
+                $model->getQualifiedDeletedAtColumn()
+            );
+
+            return $builder;
+        });
+    }
+
     /**
      * Add the only-trashed extension to the builder.
      *
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index 42e7c810d6c2..6da0772d4f08 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -1078,6 +1078,33 @@ public function orWhereDate($column, $operator, $value)
         return $this->whereDate($column, $operator, $value, 'or');
     }
 
+    /**
+     * Add a "where time" statement to the query.
+     *
+     * @param  string  $column
+     * @param  string   $operator
+     * @param  int   $value
+     * @param  string   $boolean
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function whereTime($column, $operator, $value, $boolean = 'and')
+    {
+        return $this->addDateBasedWhere('Time', $column, $operator, $value, $boolean);
+    }
+
+    /**
+     * Add an "or where time" statement to the query.
+     *
+     * @param  string  $column
+     * @param  string   $operator
+     * @param  int   $value
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function orWhereTime($column, $operator, $value)
+    {
+        return $this->whereTime($column, $operator, $value, 'or');
+    }
+
     /**
      * Add a "where day" statement to the query.
      *
@@ -1133,7 +1160,7 @@ public function whereYear($column, $operator, $value = null, $boolean = 'and')
     }
 
     /**
-     * Add a date based (year, month, day) statement to the query.
+     * Add a date based (year, month, day, time) statement to the query.
      *
      * @param  string  $type
      * @param  string  $column
@@ -1682,7 +1709,17 @@ public function getCountForPagination($columns = ['*'])
             return count($results);
         }
 
-        return isset($results[0]) ? (int) array_change_key_case((array) $results[0])['aggregate'] : 0;
+        if (! isset($results[0])) {
+            return 0;
+        }
+
+        $item = $results[0];
+
+        if (is_object($item)) {
+            return (int) $item->aggregate;
+        }
+
+        return (int) array_change_key_case((array) $item)['aggregate'];
     }
 
     /**
@@ -2001,8 +2038,18 @@ public function aggregate($function, $columns = ['*'])
         if (! $results->isEmpty()) {
             $result = array_change_key_case((array) $results[0]);
 
-            return $result['aggregate'];
+            if (is_int($result['aggregate']) || is_float($result['aggregate'])) {
+                return $result['aggregate'];
+            }
+
+            if (strpos((string) $result['aggregate'], '.') !== false) {
+                return (int) $result['aggregate'];
+            }
+
+            return (float) $result['aggregate'];
         }
+
+        return 0;
     }
 
     /**
@@ -2114,6 +2161,10 @@ public function updateOrInsert(array $attributes, array $values = [])
      */
     public function increment($column, $amount = 1, array $extra = [])
     {
+        if (! is_numeric($amount)) {
+            throw new InvalidArgumentException('Non-numeric value passed to increment method.');
+        }
+
         $wrapped = $this->grammar->wrap($column);
 
         $columns = array_merge([$column => $this->raw("$wrapped + $amount")], $extra);
@@ -2131,6 +2182,10 @@ public function increment($column, $amount = 1, array $extra = [])
      */
     public function decrement($column, $amount = 1, array $extra = [])
     {
+        if (! is_numeric($amount)) {
+            throw new InvalidArgumentException('Non-numeric value passed to decrement method.');
+        }
+
         $wrapped = $this->grammar->wrap($column);
 
         $columns = array_merge([$column => $this->raw("$wrapped - $amount")], $extra);
diff --git a/src/Illuminate/Database/Query/Grammars/Grammar.php b/src/Illuminate/Database/Query/Grammars/Grammar.php
index e51e6ec4047a..47beabc26398 100755
--- a/src/Illuminate/Database/Query/Grammars/Grammar.php
+++ b/src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -389,6 +389,18 @@ protected function whereDate(Builder $query, $where)
         return $this->dateBasedWhere('date', $query, $where);
     }
 
+    /**
+     * Compile a "where time" clause.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereTime(Builder $query, $where)
+    {
+        return $this->dateBasedWhere('time', $query, $where);
+    }
+
     /**
      * Compile a "where day" clause.
      *
diff --git a/src/Illuminate/Database/README.md b/src/Illuminate/Database/README.md
index 1675a9325de9..e7cdeed2c8b4 100755
--- a/src/Illuminate/Database/README.md
+++ b/src/Illuminate/Database/README.md
@@ -67,4 +67,4 @@ class User extends Illuminate\Database\Eloquent\Model {}
 $users = User::where('votes', '>', 1)->get();
 ```
 
-For further documentation on using the various database facilities this library provides, consult the [Laravel framework documentation](http://laravel.com/docs).
+For further documentation on using the various database facilities this library provides, consult the [Laravel framework documentation](https://laravel.com/docs).
diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json
index 4f7e03144db7..7aa0525adcf7 100644
--- a/src/Illuminate/Database/composer.json
+++ b/src/Illuminate/Database/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/database",
     "description": "The Illuminate Database package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -11,7 +11,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json
index 0c79358ca1aa..481391089a7d 100644
--- a/src/Illuminate/Encryption/composer.json
+++ b/src/Illuminate/Encryption/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/encryption",
     "description": "The Illuminate Encryption package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Events/Dispatcher.php b/src/Illuminate/Events/Dispatcher.php
index 63dc8996f034..ede7ebe64017 100755
--- a/src/Illuminate/Events/Dispatcher.php
+++ b/src/Illuminate/Events/Dispatcher.php
@@ -7,8 +7,8 @@
 use Illuminate\Support\Str;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory;
 use Illuminate\Contracts\Container\Container as ContainerContract;
 
 class Dispatcher implements DispatcherContract
@@ -252,15 +252,7 @@ public function fire($event, $payload = [], $halt = false)
      */
     protected function broadcastEvent($event)
     {
-        if ($this->queueResolver) {
-            $connection = $event instanceof ShouldBroadcastNow ? 'sync' : null;
-
-            $queue = method_exists($event, 'onQueue') ? $event->onQueue() : null;
-
-            $this->resolveQueue()->connection($connection)->pushOn($queue, 'Illuminate\Broadcasting\BroadcastEvent', [
-                'event' => serialize(clone $event),
-            ]);
-        }
+        $this->container->make(BroadcastFactory::class)->queue($event);
     }
 
     /**
@@ -303,21 +295,30 @@ protected function getWildcardListeners($eventName)
      * Sort the listeners for a given event by priority.
      *
      * @param  string  $eventName
-     * @return array
+     * @return void
      */
     protected function sortListeners($eventName)
     {
-        $this->sorted[$eventName] = [];
-
         // If listeners exist for the given event, we will sort them by the priority
         // so that we can call them in the correct order. We will cache off these
         // sorted event listeners so we do not have to re-sort on every events.
-        if (isset($this->listeners[$eventName])) {
-            krsort($this->listeners[$eventName]);
+        $listeners = isset($this->listeners[$eventName])
+                            ? $this->listeners[$eventName] : [];
+
+        if (class_exists($eventName, false)) {
+            foreach (class_implements($eventName) as $interface) {
+                if (isset($this->listeners[$interface])) {
+                    $listeners = array_merge_recursive($listeners, $this->listeners[$interface]);
+                }
+            }
+        }
 
-            $this->sorted[$eventName] = call_user_func_array(
-                'array_merge', $this->listeners[$eventName]
-            );
+        if ($listeners) {
+            krsort($listeners);
+
+            $this->sorted[$eventName] = call_user_func_array('array_merge', $listeners);
+        } else {
+            $this->sorted[$eventName] = [];
         }
     }
 
diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json
index ca5c9c7deea6..0605612ddc58 100755
--- a/src/Illuminate/Events/composer.json
+++ b/src/Illuminate/Events/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/events",
     "description": "The Illuminate Events package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
index adb4092bc650..8ca82309dff1 100644
--- a/src/Illuminate/Filesystem/FilesystemManager.php
+++ b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -325,6 +325,6 @@ public function extend($driver, Closure $callback)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->disk(), $method], $parameters);
+        return $this->disk()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json
index 0242fac70fdf..492799d795e6 100644
--- a/src/Illuminate/Filesystem/composer.json
+++ b/src/Illuminate/Filesystem/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/filesystem",
     "description": "The Illuminate Filesystem package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php b/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
index 92ffcbb7ebc2..c678c6e0eeb3 100644
--- a/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
+++ b/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
@@ -98,7 +98,6 @@ public function authorizeResource($model, $parameter = null, array $options = []
     protected function resourceAbilityMap()
     {
         return [
-            'index' => 'view',
             'show' => 'view',
             'create' => 'create',
             'store' => 'create',
diff --git a/src/Illuminate/Foundation/Auth/ResetsPasswords.php b/src/Illuminate/Foundation/Auth/ResetsPasswords.php
index 7f4105474547..cf79ace0bc45 100644
--- a/src/Illuminate/Foundation/Auth/ResetsPasswords.php
+++ b/src/Illuminate/Foundation/Auth/ResetsPasswords.php
@@ -54,7 +54,7 @@ public function reset(Request $request)
         // redirect them back to where they came from with their error message.
         return $response == Password::PASSWORD_RESET
                     ? $this->sendResetResponse($response)
-                    : $this->sendResetFailedResponse($response);
+                    : $this->sendResetFailedResponse($request, $response);
     }
 
     /**
@@ -102,10 +102,11 @@ protected function sendResetResponse($response)
     /**
      * Get the response for a failed password reset.
      *
+     * @param  \Illuminate\Http\Request
      * @param  string  $response
      * @return \Illuminate\Http\Response
      */
-    protected function sendResetFailedResponse($response)
+    protected function sendResetFailedResponse(Request $request, $response)
     {
         return redirect()->back()
                     ->withInput($request->only('email'))
diff --git a/src/Illuminate/Foundation/Console/Kernel.php b/src/Illuminate/Foundation/Console/Kernel.php
index 0c67528bfd31..ec46c44dbd46 100644
--- a/src/Illuminate/Foundation/Console/Kernel.php
+++ b/src/Illuminate/Foundation/Console/Kernel.php
@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Console\Application as Artisan;
+use Illuminate\Console\Events\ArtisanStarting;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Console\Kernel as KernelContract;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
@@ -167,7 +168,11 @@ protected function commands()
      */
     public function command($signature, Closure $callback)
     {
-        $this->registerCommand($command = new ClosureCommand($signature, $callback));
+        $command = new ClosureCommand($signature, $callback);
+
+        $this->app['events']->listen(ArtisanStarting::class, function ($event) use ($command) {
+            $event->artisan->add($command);
+        });
 
         return $command;
     }
diff --git a/src/Illuminate/Foundation/Console/RouteListCommand.php b/src/Illuminate/Foundation/Console/RouteListCommand.php
index 1abd6cae669e..dbb8531c82b9 100644
--- a/src/Illuminate/Foundation/Console/RouteListCommand.php
+++ b/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -159,7 +159,8 @@ protected function getControllerMiddleware($actionName)
         $segments = explode('@', $actionName);
 
         return $this->getControllerMiddlewareFromInstance(
-            $this->laravel->make($segments[0]), $segments[1]
+            $this->laravel->make($segments[0]),
+            isset($segments[1]) ? $segments[1] : null
         );
     }
 
@@ -167,17 +168,21 @@ protected function getControllerMiddleware($actionName)
      * Get the middlewares for the given controller instance and method.
      *
      * @param  \Illuminate\Routing\Controller  $controller
-     * @param  string  $method
+     * @param  string|null  $method
      * @return array
      */
     protected function getControllerMiddlewareFromInstance($controller, $method)
     {
+        if (! method_exists($controller, 'getMiddleware')) {
+            return [];
+        }
+
         $middleware = $this->router->getMiddleware();
 
         $results = [];
 
         foreach ($controller->getMiddleware() as $name => $options) {
-            if (! $this->methodExcludedByOptions($method, $options)) {
+            if (! $method || ! $this->methodExcludedByOptions($method, $options)) {
                 $results[] = Arr::get($middleware, $name, $name);
             }
         }
diff --git a/src/Illuminate/Foundation/Console/ServeCommand.php b/src/Illuminate/Foundation/Console/ServeCommand.php
index 90e596e9788e..9c3478cca3f9 100644
--- a/src/Illuminate/Foundation/Console/ServeCommand.php
+++ b/src/Illuminate/Foundation/Console/ServeCommand.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Foundation\Console;
 
-use Exception;
 use Illuminate\Console\Command;
 use Symfony\Component\Process\ProcessUtils;
 use Symfony\Component\Console\Input\InputOption;
@@ -45,15 +44,7 @@ public function fire()
 
         $this->info("Laravel development server started on http://{$host}:{$port}/");
 
-        if (defined('HHVM_VERSION')) {
-            if (version_compare(HHVM_VERSION, '3.8.0') >= 0) {
-                passthru("{$binary} -m server -v Server.Type=proxygen -v Server.SourceRoot={$base}/ -v Server.IP={$host} -v Server.Port={$port} -v Server.DefaultDocument=server.php -v Server.ErrorDocument404=server.php");
-            } else {
-                throw new Exception("HHVM's built-in server requires HHVM >= 3.8.0.");
-            }
-        } else {
-            passthru("{$binary} -S {$host}:{$port} {$base}/server.php");
-        }
+        passthru("{$binary} -S {$host}:{$port} {$base}/server.php");
     }
 
     /**
diff --git a/src/Illuminate/Foundation/Console/ViewClearCommand.php b/src/Illuminate/Foundation/Console/ViewClearCommand.php
index 74b919ebe347..c7e443e7d67a 100644
--- a/src/Illuminate/Foundation/Console/ViewClearCommand.php
+++ b/src/Illuminate/Foundation/Console/ViewClearCommand.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Console;
 
+use RuntimeException;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 
@@ -48,9 +49,13 @@ public function __construct(Filesystem $files)
      */
     public function fire()
     {
-        $views = $this->files->glob($this->laravel['config']['view.compiled'].'/*');
+        $path = $this->laravel['config']['view.compiled'];
 
-        foreach ($views as $view) {
+        if (! $path) {
+            throw new RuntimeException('View path not found.');
+        }
+
+        foreach ($this->files->glob("{$path}/*") as $view) {
             $this->files->delete($view);
         }
 
diff --git a/src/Illuminate/Foundation/Console/stubs/event.stub b/src/Illuminate/Foundation/Console/stubs/event.stub
index db435cfd5a14..9e61b6359b08 100644
--- a/src/Illuminate/Foundation/Console/stubs/event.stub
+++ b/src/Illuminate/Foundation/Console/stubs/event.stub
@@ -2,7 +2,10 @@
 
 namespace DummyNamespace;
 
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
@@ -21,12 +24,12 @@ class DummyClass
     }
 
     /**
-     * Get the channels the event should be broadcast on.
+     * Get the channels the event should broadcast on.
      *
-     * @return array
+     * @return Channel|array
      */
     public function broadcastOn()
     {
-        return [];
+        return new PrivateChannel('channel-name');
     }
 }
diff --git a/src/Illuminate/Foundation/Console/stubs/mail.stub b/src/Illuminate/Foundation/Console/stubs/mail.stub
index f517c152680a..402313448769 100644
--- a/src/Illuminate/Foundation/Console/stubs/mail.stub
+++ b/src/Illuminate/Foundation/Console/stubs/mail.stub
@@ -5,6 +5,7 @@ namespace DummyNamespace;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
 class DummyClass extends Mailable
 {
diff --git a/src/Illuminate/Foundation/Console/stubs/notification.stub b/src/Illuminate/Foundation/Console/stubs/notification.stub
index dce1e296a1c0..cc537f517aff 100644
--- a/src/Illuminate/Foundation/Console/stubs/notification.stub
+++ b/src/Illuminate/Foundation/Console/stubs/notification.stub
@@ -5,6 +5,7 @@ namespace DummyNamespace;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
 
 class DummyClass extends Notification
 {
@@ -21,9 +22,10 @@ class DummyClass extends Notification
     }
 
     /**
-     * Get the notification channels.
+     * Get the notification's delivery channels.
      *
-     * @return array|string
+     * @param  mixed  $notifiable
+     * @return array
      */
     public function via($notifiable)
     {
@@ -31,14 +33,29 @@ class DummyClass extends Notification
     }
 
     /**
-     * Get the notification message.
+     * Get the mail representation of the notification.
      *
-     * @return \Illuminate\Notifications\MessageBuilder
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function message()
+    public function toMail($notifiable)
     {
-        return $this->line('The introduction to the notification.')
+        return (new MailMessage)
+                    ->line('The introduction to the notification.')
                     ->action('Notification Action', 'https://laravel.com')
                     ->line('Thank you for using our application!');
     }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
 }
diff --git a/src/Illuminate/Foundation/Console/stubs/policy.stub b/src/Illuminate/Foundation/Console/stubs/policy.stub
index 04f73e216413..59dcf5925839 100644
--- a/src/Illuminate/Foundation/Console/stubs/policy.stub
+++ b/src/Illuminate/Foundation/Console/stubs/policy.stub
@@ -10,17 +10,6 @@ class DummyClass
 {
     use HandlesAuthorization;
 
-    /**
-     * Determine whether the user can view dummyPluralModelName.
-     *
-     * @param  DummyRootNamespaceUser  $user
-     * @return mixed
-     */
-    public function viewAny(User $user)
-    {
-        //
-    }
-
     /**
      * Determine whether the user can view the dummyModelName.
      *
@@ -39,18 +28,7 @@ class DummyClass
      * @param  DummyRootNamespaceUser  $user
      * @return mixed
      */
-    public function createAny(User $user)
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can update dummyPluralModelName.
-     *
-     * @param  DummyRootNamespaceUser  $user
-     * @return mixed
-     */
-    public function updateAny(User $user)
+    public function create(User $user)
     {
         //
     }
diff --git a/src/Illuminate/Foundation/Console/stubs/request.stub b/src/Illuminate/Foundation/Console/stubs/request.stub
index 06294e3f8d09..6653f57a91a0 100644
--- a/src/Illuminate/Foundation/Console/stubs/request.stub
+++ b/src/Illuminate/Foundation/Console/stubs/request.stub
@@ -2,9 +2,9 @@
 
 namespace DummyNamespace;
 
-use DummyRootNamespaceHttp\Requests\Request;
+use Illuminate\Foundation\Http\FormRequest;
 
-class DummyClass extends Request
+class DummyClass extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
diff --git a/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php b/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
index 83f1ec090081..08a1c440ff17 100755
--- a/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
+++ b/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
@@ -41,6 +41,7 @@
 use Illuminate\Foundation\Console\VendorPublishCommand;
 use Illuminate\Database\Console\Seeds\SeederMakeCommand;
 use Illuminate\Foundation\Console\NotificationMakeCommand;
+use Illuminate\Notifications\Console\NotificationTableCommand;
 
 class ArtisanServiceProvider extends ServiceProvider
 {
@@ -93,6 +94,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'MiddlewareMake' => 'command.middleware.make',
         'ModelMake' => 'command.model.make',
         'NotificationMake' => 'command.notification.make',
+        'NotificationTable' => 'command.notification.table',
         'PolicyMake' => 'command.policy.make',
         'ProviderMake' => 'command.provider.make',
         'QueueFailedTable' => 'command.queue.failed-table',
@@ -590,6 +592,18 @@ protected function registerPolicyMakeCommand()
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerNotificationTableCommand()
+    {
+        $this->app->singleton('command.notification.table', function ($app) {
+            return new NotificationTableCommand($app['files'], $app['composer']);
+        });
+    }
+
     /**
      * Get the services provided by the provider.
      *
diff --git a/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php b/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
index c14313c3e9a8..ad0435851b1b 100644
--- a/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
+++ b/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Support\Providers;
 
+use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Routing\UrlGenerator;
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithPages.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithPages.php
index 28db9d42a06b..e81aa361aa41 100644
--- a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithPages.php
+++ b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithPages.php
@@ -61,6 +61,18 @@ public function visit($uri)
         return $this->makeRequest('GET', $uri);
     }
 
+    /**
+     * Visit the given named route with a GET request.
+     *
+     * @param  string  $route
+     * @param  array  $parameters
+     * @return $this
+     */
+    public function visitRoute($route, $parameters = [])
+    {
+        return $this->makeRequest('GET', route($route, $parameters));
+    }
+
     /**
      * Make a request to the application and create a Crawler instance.
      *
@@ -172,6 +184,18 @@ protected function seePageIs($uri)
         return $this;
     }
 
+    /**
+     * Assert that the current page matches a given named route.
+     *
+     * @param  string  $route
+     * @param  array  $parameters
+     * @return $this
+     */
+    protected function seeRouteIs($route, $parameters = [])
+    {
+        return $this->seePageIs(route($route, $parameters));
+    }
+
     /**
      * Assert that a given page successfully loaded.
      *
diff --git a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
index 64153d844089..074519c7da0c 100644
--- a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
+++ b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -321,14 +321,14 @@ protected function seeJsonContains(array $data, $negate = false)
 
         $actual = json_encode(Arr::sortRecursive(
             (array) $this->decodeResponseJson()
-        ));
+        ), JSON_PRETTY_PRINT);
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
             $expected = $this->formatToExpectedJson($key, $value);
 
             $this->{$method}(
                 Str::contains($actual, $expected),
-                ($negate ? 'Found unexpected' : 'Unable to find')." JSON fragment [{$expected}] within [{$actual}]."
+                ($negate ? 'Found unexpected' : 'Unable to find').' JSON fragment'.PHP_EOL."[{$expected}]".PHP_EOL.'within'.PHP_EOL."[{$actual}]."
             );
         }
 
@@ -373,7 +373,7 @@ protected function decodeResponseJson()
      */
     protected function formatToExpectedJson($key, $value)
     {
-        $expected = json_encode([$key => $value]);
+        $expected = json_encode([$key => $value], JSON_PRETTY_PRINT);
 
         if (Str::startsWith($expected, '{')) {
             $expected = substr($expected, 1);
diff --git a/src/Illuminate/Foundation/Testing/TestCase.php b/src/Illuminate/Foundation/Testing/TestCase.php
index 42c4e1da4500..979c2f38d542 100755
--- a/src/Illuminate/Foundation/Testing/TestCase.php
+++ b/src/Illuminate/Foundation/Testing/TestCase.php
@@ -100,14 +100,14 @@ protected function setUpTraits()
     {
         $uses = array_flip(class_uses_recursive(static::class));
 
-        if (isset($uses[DatabaseTransactions::class])) {
-            $this->beginDatabaseTransaction();
-        }
-
         if (isset($uses[DatabaseMigrations::class])) {
             $this->runDatabaseMigrations();
         }
 
+        if (isset($uses[DatabaseTransactions::class])) {
+            $this->beginDatabaseTransaction();
+        }
+
         if (isset($uses[WithoutMiddleware::class])) {
             $this->disableMiddlewareForAllTests();
         }
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
index 0f798a6fea12..d52ae3084f13 100644
--- a/src/Illuminate/Foundation/helpers.php
+++ b/src/Illuminate/Foundation/helpers.php
@@ -12,6 +12,7 @@
 use Illuminate\Contracts\Cookie\Factory as CookieFactory;
 use Illuminate\Database\Eloquent\Factory as EloquentFactory;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
+use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory;
 
 if (! function_exists('abort')) {
     /**
@@ -191,6 +192,19 @@ function bcrypt($value, $options = [])
     }
 }
 
+if (! function_exists('broadcast')) {
+    /**
+     * Begin broadcasting an event.
+     *
+     * @param  mixed|null  $event
+     * @return \Illuminate\Broadcasting\PendingBroadcast|void
+     */
+    function broadcast($event = null)
+    {
+        return app(BroadcastFactory::class)->event($event);
+    }
+}
+
 if (! function_exists('cache')) {
     /**
      * Get / set the specified cache value.
@@ -589,7 +603,7 @@ function redirect($to = null, $status = 302, $headers = [], $secure = null)
     /**
      * Get an instance of the current request or an input item from the request.
      *
-     * @param  string  $key
+     * @param  array|string  $key
      * @param  mixed   $default
      * @return \Illuminate\Http\Request|string|array
      */
@@ -599,10 +613,28 @@ function request($key = null, $default = null)
             return app('request');
         }
 
+        if (is_array($key)) {
+            return app('request')->only($key);
+        }
+
         return app('request')->input($key, $default);
     }
 }
 
+if (! function_exists('resolve')) {
+    /**
+     * Resolve a service from the container.
+     *
+     * @param  string  $name
+     * @param  array  $parameters
+     * @return mixed
+     */
+    function resolve($name, $parameters = [])
+    {
+        return app($name, $parameters);
+    }
+}
+
 if (! function_exists('resource_path')) {
     /**
      * Get the path to the resources folder.
diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json
index 09548cf731f3..8442f35685b1 100755
--- a/src/Illuminate/Hashing/composer.json
+++ b/src/Illuminate/Hashing/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/hashing",
     "description": "The Illuminate Hashing package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
index 2ef5cadfc187..bf5b51757abe 100644
--- a/src/Illuminate/Http/Request.php
+++ b/src/Illuminate/Http/Request.php
@@ -273,7 +273,7 @@ public function exists($key)
         $input = $this->all();
 
         foreach ($keys as $value) {
-            if (! array_key_exists($value, $input)) {
+            if (! Arr::has($input, $value)) {
                 return false;
             }
         }
@@ -340,7 +340,7 @@ public function input($key = null, $default = null)
     }
 
     /**
-     * Get a subset of the items from the input data.
+     * Get a subset containing the provided keys with values from the input data.
      *
      * @param  array|mixed  $keys
      * @return array
@@ -461,7 +461,7 @@ protected function convertUploadedFiles(array $files)
      *
      * @param  string  $key
      * @param  mixed  $default
-     * @return \Symfony\Component\HttpFoundation\File\UploadedFile|array|null
+     * @return \Illuminate\Http\UploadedFile|array|null
      */
     public function file($key = null, $default = null)
     {
@@ -923,16 +923,13 @@ public function route($param = null)
      */
     public function fingerprint()
     {
-        if (! $this->route()) {
+        if (! $route = $this->route()) {
             throw new RuntimeException('Unable to generate fingerprint. Route unavailable.');
         }
 
-        return sha1(
-            implode('|', $this->route()->methods()).
-            '|'.$this->route()->domain().
-            '|'.$this->route()->uri().
-            '|'.$this->ip()
-        );
+        return sha1(implode('|', array_merge(
+            $route->methods(), [$route->domain(), $route->uri(), $this->ip()]
+        )));
     }
 
     /**
@@ -1026,7 +1023,7 @@ public function offsetGet($offset)
      */
     public function offsetSet($offset, $value)
     {
-        return $this->getInputSource()->set($offset, $value);
+        $this->getInputSource()->set($offset, $value);
     }
 
     /**
@@ -1037,7 +1034,7 @@ public function offsetSet($offset, $value)
      */
     public function offsetUnset($offset)
     {
-        return $this->getInputSource()->remove($offset);
+        $this->getInputSource()->remove($offset);
     }
 
     /**
@@ -1059,12 +1056,10 @@ public function __isset($key)
      */
     public function __get($key)
     {
-        $all = $this->all();
-
-        if (array_key_exists($key, $all)) {
-            return $all[$key];
-        } else {
-            return $this->route($key);
+        if ($this->offsetExists($key)) {
+            return $this->offsetGet($key);
         }
+
+        return $this->route($key);
     }
 }
diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json
index 52ef78494686..409554dbe3bf 100755
--- a/src/Illuminate/Http/composer.json
+++ b/src/Illuminate/Http/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/http",
     "description": "The Illuminate Http package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json
index 7e406a863de6..0d157d5fe5c9 100755
--- a/src/Illuminate/Log/composer.json
+++ b/src/Illuminate/Log/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/log",
     "description": "The Illuminate Log package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Mail/Jobs/HandleQueuedMessage.php b/src/Illuminate/Mail/Jobs/HandleQueuedMessage.php
new file mode 100644
index 000000000000..848c59ae6a81
--- /dev/null
+++ b/src/Illuminate/Mail/Jobs/HandleQueuedMessage.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Illuminate\Mail\Jobs;
+
+use Closure;
+use Illuminate\Support\Str;
+use SuperClosure\Serializer;
+use Illuminate\Contracts\Queue\Job;
+use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Queue\SerializesAndRestoresModelIdentifiers;
+
+class HandleQueuedMessage
+{
+    use SerializesAndRestoresModelIdentifiers;
+
+    /**
+     * The name of the email view.
+     *
+     * @var string
+     */
+    public $view;
+
+    /**
+     * The data to be passed to the view.
+     *
+     * @param  array  $data
+     */
+    public $data;
+
+    /**
+     * The message configuration callback.
+     *
+     * @var \Closure
+     */
+    public $callback;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param  string  $view
+     * @param  array  $data
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public function __construct($view, $data, $callback)
+    {
+        $this->view = $view;
+        $this->data = $data;
+        $this->callback = $callback;
+    }
+
+    /**
+     * Handle the queued job.
+     *
+     * @param  \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @return void
+     */
+    public function handle(Mailer $mailer)
+    {
+        $mailer->send($this->view, $this->data, $this->callback);
+    }
+
+    /**
+     * Prepare the instance for serialization.
+     *
+     * @return array
+     */
+    public function __sleep()
+    {
+        foreach ($this->data as $key => $value) {
+            $this->data[$key] = $this->getSerializedPropertyValue($value);
+        }
+
+        if ($this->callback instanceof Closure) {
+            $this->callback = (new Serializer)->serialize($this->callback);
+        }
+
+        return array_keys(get_object_vars($this));
+    }
+
+    /**
+     * Restore the model after serialization.
+     *
+     * @return void
+     */
+    public function __wakeup()
+    {
+        foreach ($this->data as $key => $value) {
+            $this->data[$key] = $this->getRestoredPropertyValue($value);
+        }
+
+        if (Str::contains($this->callback, 'SerializableClosure')) {
+            $this->callback = (new Serializer)->unserialize($this->callback);
+        }
+    }
+}
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
index 85091e4c887d..f56b2b75349e 100644
--- a/src/Illuminate/Mail/Mailable.php
+++ b/src/Illuminate/Mail/Mailable.php
@@ -7,8 +7,8 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
-use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Contracts\Queue\Factory as Queue;
+use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Mail\Mailable as MailableContract;
 
 class Mailable implements MailableContract
@@ -100,10 +100,10 @@ class Mailable implements MailableContract
     /**
      * Send the message using the given mailer.
      *
-     * @param  Mailer  $mailer
+     * @param  \Illuminate\Contracts\Mail\Mailer  $mailer
      * @return void
      */
-    public function send(Mailer $mailer)
+    public function send(MailerContract $mailer)
     {
         Container::getInstance()->call([$this, 'build']);
 
@@ -119,7 +119,7 @@ public function send(Mailer $mailer)
     /**
      * Queue the message for sending.
      *
-     * @param  Queue  $queue
+     * @param  \Illuminate\Contracts\Queue\Factory  $queue
      * @return mixed
      */
     public function queue(Queue $queue)
@@ -289,7 +289,7 @@ protected function runCallbacks($message)
      */
     public function from($address, $name = null)
     {
-        $this->setAddress($address, $name, 'from');
+        return $this->setAddress($address, $name, 'from');
     }
 
     /**
@@ -345,6 +345,7 @@ public function replyTo($address, $name = null)
      *
      * @param  object|array|string  $address
      * @param  string|null  $name
+     * @param  string  $property
      * @return $this
      */
     protected function setAddress($address, $name = null, $property = 'to')
@@ -395,7 +396,7 @@ public function view($view, array $data = [])
     /**
      * Set the plain text view for the message.
      *
-     * @param  string  $view
+     * @param  string  $textView
      * @param  array  $data
      * @return $this
      */
@@ -410,12 +411,17 @@ public function text($textView, array $data = [])
     /**
      * Set the view data for the message.
      *
-     * @param  array  $data
+     * @param  string|array  $key
+     * @param  mixed   $value
      * @return $this
      */
-    public function with(array $data)
+    public function with($key, $value = null)
     {
-        $this->viewData = $data;
+        if (is_array($key)) {
+            $this->viewData = array_merge($this->viewData, $key);
+        } else {
+            $this->viewData[$key] = $value;
+        }
 
         return $this;
     }
diff --git a/src/Illuminate/Mail/MailableMailer.php b/src/Illuminate/Mail/MailableMailer.php
index befc9dae778b..bc967b45cd70 100644
--- a/src/Illuminate/Mail/MailableMailer.php
+++ b/src/Illuminate/Mail/MailableMailer.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Mail;
 
+use Illuminate\Contracts\Queue\ShouldQueue;
+
 class MailableMailer
 {
     /**
@@ -90,41 +92,49 @@ public function bcc($users)
      */
     public function send(Mailable $mailable)
     {
-        $mailable = $mailable->to($this->to)
-                 ->cc($this->cc)
-                 ->bcc($this->bcc);
+        if ($mailable instanceof ShouldQueue) {
+            return $this->queue($this->fill($mailable));
+        }
 
-        return $this->mailer->send($mailable);
+        return $this->mailer->send($this->fill($mailable));
     }
 
     /**
-     * Queue a mailable message for sending.
+     * Send a mailable message immediately.
      *
      * @param  Mailable  $mailable
      * @return mixed
      */
-    public function queue(Mailable $mailable)
+    public function sendNow(Mailable $mailable)
     {
-        $mailable = $mailable->to($this->to)
-                 ->cc($this->cc)
-                 ->bcc($this->bcc);
+        return $this->mailer->send($this->fill($mailable));
+    }
 
-        return $this->mailer->queue($mailable);
+    /**
+     * Populate the mailable with the addresses.
+     *
+     * @param  Mailable  $mailable
+     * @return Mailable
+     */
+    protected function fill(Mailable $mailable)
+    {
+        return $mailable->to($this->to)
+                        ->cc($this->cc)
+                        ->bcc($this->bcc);
     }
 
     /**
-     * Deliver the queued message after the given delay.
+     * Push the given mailable onto the queue.
      *
-     * @param  \DateTime|int  $delay
      * @param  Mailable  $mailable
      * @return mixed
      */
-    public function later($delay, Mailable $mailable)
+    protected function queue(Mailable $mailable)
     {
-        $mailable = $mailable->to($this->to)
-                 ->cc($this->cc)
-                 ->bcc($this->bcc);
+        if (isset($mailable->delay)) {
+            return $this->mailer->later($mailable->delay, $mailable);
+        }
 
-        return $this->mailer->later($delay, $mailable);
+        return $this->mailer->queue($mailable);
     }
 }
diff --git a/src/Illuminate/Mail/Mailer.php b/src/Illuminate/Mail/Mailer.php
index 9561440ea3e9..54a76aa1335b 100755
--- a/src/Illuminate/Mail/Mailer.php
+++ b/src/Illuminate/Mail/Mailer.php
@@ -6,8 +6,6 @@
 use Swift_Mailer;
 use Swift_Message;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
-use SuperClosure\Serializer;
 use InvalidArgumentException;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -213,10 +211,8 @@ public function queue($view, array $data = [], $callback = null, $queue = null)
             return $view->queue($this->queue);
         }
 
-        $callback = $this->buildQueueCallable($callback);
-
-        return $this->queue->push(
-            'mailer@handleQueuedMessage', compact('view', 'data', 'callback'), $queue
+        return $this->queue->pushOn(
+            $queue, new Jobs\HandleQueuedMessage($view, $data, $callback)
         );
     }
 
@@ -266,11 +262,8 @@ public function later($delay, $view, array $data = [], $callback = null, $queue
             return $view->later($delay, $this->queue);
         }
 
-        $callback = $this->buildQueueCallable($callback);
-
-        return $this->queue->later(
-            $delay, 'mailer@handleQueuedMessage',
-            compact('view', 'data', 'callback'), $queue
+        return $this->queue->laterOn(
+            $queue, $delay, new Jobs\HandleQueuedMessage($view, $data, $callback)
         );
     }
 
@@ -289,50 +282,6 @@ public function laterOn($queue, $delay, $view, array $data, $callback)
         return $this->later($delay, $view, $data, $callback, $queue);
     }
 
-    /**
-     * Build the callable for a queued e-mail job.
-     *
-     * @param  \Closure|string  $callback
-     * @return string
-     */
-    protected function buildQueueCallable($callback)
-    {
-        if (! $callback instanceof Closure) {
-            return $callback;
-        }
-
-        return (new Serializer)->serialize($callback);
-    }
-
-    /**
-     * Handle a queued e-mail message job.
-     *
-     * @param  \Illuminate\Contracts\Queue\Job  $job
-     * @param  array  $data
-     * @return void
-     */
-    public function handleQueuedMessage($job, $data)
-    {
-        $this->send($data['view'], $data['data'], $this->getQueuedCallable($data));
-
-        $job->delete();
-    }
-
-    /**
-     * Get the true callable for a queued e-mail message.
-     *
-     * @param  array  $data
-     * @return \Closure|string
-     */
-    protected function getQueuedCallable(array $data)
-    {
-        if (Str::contains($data['callback'], 'SerializableClosure')) {
-            return (new Serializer)->unserialize($data['callback']);
-        }
-
-        return $data['callback'];
-    }
-
     /**
      * Force the transport to re-connect.
      *
diff --git a/src/Illuminate/Mail/SendQueuedMailable.php b/src/Illuminate/Mail/SendQueuedMailable.php
index 1d5bd36601e5..995b5a88d536 100644
--- a/src/Illuminate/Mail/SendQueuedMailable.php
+++ b/src/Illuminate/Mail/SendQueuedMailable.php
@@ -2,7 +2,7 @@
 
 namespace Illuminate\Mail;
 
-use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Mail\Mailable as MailableContract;
 
 class SendQueuedMailable
@@ -28,10 +28,10 @@ public function __construct(MailableContract $mailable)
     /**
      * Handle the queued job.
      *
-     * @param  Mailer  $mailer
+     * @param  MailerContract  $mailer
      * @return void
      */
-    public function handle(Mailer $mailer)
+    public function handle(MailerContract $mailer)
     {
         $mailer->send($this->mailable);
     }
diff --git a/src/Illuminate/Mail/Transport/MailgunTransport.php b/src/Illuminate/Mail/Transport/MailgunTransport.php
index 21bffea0e5a4..f8378322868d 100644
--- a/src/Illuminate/Mail/Transport/MailgunTransport.php
+++ b/src/Illuminate/Mail/Transport/MailgunTransport.php
@@ -46,8 +46,8 @@ class MailgunTransport extends Transport
      */
     public function __construct(ClientInterface $client, $key, $domain)
     {
-        $this->client = $client;
         $this->key = $key;
+        $this->client = $client;
         $this->setDomain($domain);
     }
 
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
index 0986a9d8e803..ad96ea5a6bb8 100755
--- a/src/Illuminate/Mail/composer.json
+++ b/src/Illuminate/Mail/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/mail",
     "description": "The Illuminate Mail package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Notifications/Action.php b/src/Illuminate/Notifications/Action.php
index f59f86836d1a..071db2d9efdc 100644
--- a/src/Illuminate/Notifications/Action.php
+++ b/src/Illuminate/Notifications/Action.php
@@ -23,6 +23,7 @@ class Action
      *
      * @param  string  $text
      * @param  string  $url
+     * @return void
      */
     public function __construct($text, $url)
     {
diff --git a/src/Illuminate/Notifications/ChannelManager.php b/src/Illuminate/Notifications/ChannelManager.php
index 20e77c214bb8..0ffdd783b408 100644
--- a/src/Illuminate/Notifications/ChannelManager.php
+++ b/src/Illuminate/Notifications/ChannelManager.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Notifications;
 
+use Ramsey\Uuid\Uuid;
 use InvalidArgumentException;
 use Illuminate\Support\Manager;
 use Nexmo\Client as NexmoClient;
@@ -22,83 +23,84 @@ class ChannelManager extends Manager implements DispatcherContract, FactoryContr
     protected $defaultChannels = ['mail', 'database'];
 
     /**
-     * Create a new notification for the given notifiable entities.
+     * Send the given notification to the given notifiable entities.
      *
-     * @param  array  $notifiables
-     * @return \Illuminate\Notifications\Channels\Notification
+     * @param  \Illuminate\Support\Collection|array  $notifiables
+     * @param  mixed  $notification
+     * @return void
      */
-    public function to($notifiables)
+    public function send($notifiables, $notification)
     {
-        return new Channels\Notification($notifiables);
+        if ($notification instanceof ShouldQueue) {
+            return $this->queueNotification($notifiables, $notification);
+        }
+
+        return $this->sendNow($notifiables, $notification);
     }
 
     /**
-     * Dispatch the given notification instance to the given notifiable.
+     * Send the given notification immediately.
      *
-     * @param  mixed  $notifiable
-     * @param  mixed  $instance
-     * @param  array  $channels
+     * @param  \Illuminate\Support\Collection|array  $notifiables
+     * @param  mixed  $notification
      * @return void
      */
-    public function dispatch($notifiable, $instance, array $channels = [])
+    public function sendNow($notifiables, $notification)
     {
-        $notifications = $this->notificationsFromInstance(
-            $notifiable, $instance
-        );
+        foreach ($notifiables as $notifiable) {
+            $notification = clone $notification;
+
+            $notification->id = (string) Uuid::uuid4();
 
-        if (count($channels) > 0) {
-            foreach ($notifications as $notification) {
-                $notification->via((array) $channels);
+            $channels = $notification->via($notifiable);
+
+            if (empty($channels)) {
+                continue;
             }
-        }
 
-        if ($instance instanceof ShouldQueue) {
-            return $this->queueNotifications($instance, $notifications);
-        }
+            foreach ($channels as $channel) {
+                if (! $this->shouldSendNotification($notifiable, $notification, $channel)) {
+                    continue;
+                }
+
+                $this->driver($channel)->send($notifiable, $notification);
 
-        foreach ($notifications as $notification) {
-            $this->send($notification);
+                $this->app->make('events')->fire(
+                    new Events\NotificationSent($notifiable, $notification, $channel)
+                );
+            }
         }
     }
 
     /**
-     * Queue the given notification instances.
+     * Determines if the notification can be sent.
      *
-     * @param  mixed  $instance
-     * @param  array[\Illuminate\Notifcations\Channels\Notification]
-     * @return void
+     * @param  mixed  $notifiable
+     * @param  mixed  $notification
+     * @param  string  $channel
+     * @return bool
      */
-    protected function queueNotifications($instance, array $notifications)
+    protected function shouldSendNotification($notifiable, $notification, $channel)
     {
-        $this->app->make(Bus::class)->dispatch(
-            (new SendQueuedNotifications($notifications))
-                    ->onConnection($instance->connection)
-                    ->onQueue($instance->queue)
-                    ->delay($instance->delay)
-        );
+        return $this->app->make('events')->until(
+            new Events\NotificationSending($notifiable, $notification, $channel)
+        ) !== false;
     }
 
     /**
-     * Send the given notification.
+     * Queue the given notification instances.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiables
+     * @param  array[\Illuminate\Notifcations\Channels\Notification]  $notification
      * @return void
      */
-    public function send(Channels\Notification $notification)
+    protected function queueNotification($notifiables, $notification)
     {
-        if (! $notification->application) {
-            $notification->application(
-                $this->app['config']['app.name'],
-                $this->app['config']['app.logo']
-            );
-        }
-
-        foreach ($notification->via ?: $this->deliversVia() as $channel) {
-            $this->driver($channel)->send($notification);
-        }
-
-        $this->app->make('events')->fire(
-            new Events\NotificationSent($notification)
+        $this->app->make(Bus::class)->dispatch(
+            (new SendQueuedNotifications($notifiables, $notification))
+                    ->onConnection($notification->connection)
+                    ->onQueue($notification->queue)
+                    ->delay($notification->delay)
         );
     }
 
@@ -123,6 +125,16 @@ protected function createDatabaseDriver()
         return $this->app->make(Channels\DatabaseChannel::class);
     }
 
+    /**
+     * Create an instance of the broadcast driver.
+     *
+     * @return \Illuminate\Notifications\Channels\BroadcastChannel
+     */
+    protected function createBroadcastDriver()
+    {
+        return $this->app->make(Channels\BroadcastChannel::class);
+    }
+
     /**
      * Create an instance of the mail driver.
      *
@@ -210,17 +222,4 @@ public function deliverVia($channels)
     {
         $this->defaultChannels = (array) $channels;
     }
-
-    /**
-     * Build a new channel notification from the given object.
-     *
-     * @param  mixed  $notifiable
-     * @param  mixed  $notification
-     * @param  array|null  $channels
-     * @return array
-     */
-    public function notificationsFromInstance($notifiable, $notification, $channels = null)
-    {
-        return Channels\Notification::notificationsFromInstance($notifiable, $notification, $channels);
-    }
 }
diff --git a/src/Illuminate/Notifications/Channels/BroadcastChannel.php b/src/Illuminate/Notifications/Channels/BroadcastChannel.php
new file mode 100644
index 000000000000..20a46c70f0ac
--- /dev/null
+++ b/src/Illuminate/Notifications/Channels/BroadcastChannel.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Illuminate\Notifications\Channels;
+
+use RuntimeException;
+use Illuminate\Notifications\Notification;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Notifications\Events\BroadcastNotificationCreated;
+
+class BroadcastChannel
+{
+    /**
+     * The event dispatcher.
+     *
+     * @var \Illuminate\Contracts\Events\Dispatcher
+     */
+    protected $events;
+
+    /**
+     * Create a new database channel.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @return void
+     */
+    public function __construct(Dispatcher $events)
+    {
+        $this->events = $events;
+    }
+
+    /**
+     * Send the given notification.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @return void
+     */
+    public function send($notifiable, Notification $notification)
+    {
+        $this->events->fire(new BroadcastNotificationCreated(
+            $notifiable, $notification, $this->getData($notifiable, $notification)
+        ));
+    }
+
+    /**
+     * Get the data for the notification.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @return array
+     *
+     * @throws \RuntimeException
+     */
+    protected function getData($notifiable, Notification $notification)
+    {
+        if (method_exists($notification, 'toArray')) {
+            return $notification->toArray($notifiable);
+        }
+
+        throw new RuntimeException(
+            'Notification is missing toArray method.'
+        );
+    }
+}
diff --git a/src/Illuminate/Notifications/Channels/DatabaseChannel.php b/src/Illuminate/Notifications/Channels/DatabaseChannel.php
index 696a5bdbbf88..e5d7aeee2f48 100644
--- a/src/Illuminate/Notifications/Channels/DatabaseChannel.php
+++ b/src/Illuminate/Notifications/Channels/DatabaseChannel.php
@@ -2,25 +2,49 @@
 
 namespace Illuminate\Notifications\Channels;
 
+use RuntimeException;
+use Illuminate\Notifications\Notification;
+
 class DatabaseChannel
 {
     /**
      * Send the given notification.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
-    public function send(Notification $notification)
+    public function send($notifiable, Notification $notification)
+    {
+        $notifiable->routeNotificationFor('database')->create([
+            'id' => $notification->id,
+            'type' => get_class($notification),
+            'data' => $this->getData($notifiable, $notification),
+            'read_at' => null,
+        ]);
+    }
+
+    /**
+     * Get the data for the notification.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @return array
+     *
+     * @throws \RuntimeException
+     */
+    protected function getData($notifiable, Notification $notification)
     {
-        foreach ($notification->notifiables as $notifiable) {
-            $notifiable->routeNotificationFor('database')->create([
-                'level' => $notification->level,
-                'intro' => $notification->introLines,
-                'outro' => $notification->outroLines,
-                'action_text' => $notification->actionText,
-                'action_url' => $notification->actionUrl,
-                'read' => false,
-            ]);
+        if (method_exists($notification, 'toDatabase')) {
+            $data = $notification->toDatabase($notifiable);
+
+            return is_array($data) ? $data : $data->data;
+        } elseif (method_exists($notification, 'toArray')) {
+            return $notification->toArray($notifiable);
         }
+
+        throw new RuntimeException(
+            'Notification is missing toDatabase / toArray method.'
+        );
     }
 }
diff --git a/src/Illuminate/Notifications/Channels/MailChannel.php b/src/Illuminate/Notifications/Channels/MailChannel.php
index 8e54bd7c211b..5a91079f0b05 100644
--- a/src/Illuminate/Notifications/Channels/MailChannel.php
+++ b/src/Illuminate/Notifications/Channels/MailChannel.php
@@ -2,8 +2,9 @@
 
 namespace Illuminate\Notifications\Channels;
 
-use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Notifications\Notification;
 
 class MailChannel
 {
@@ -28,59 +29,24 @@ public function __construct(Mailer $mailer)
     /**
      * Send the given notification.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
-    public function send(Notification $notification)
+    public function send($notifiable, Notification $notification)
     {
-        $data = $this->prepareNotificationData($notification);
-
-        $emails = $notification->notifiables->map(function ($n) {
-            return $n->routeNotificationFor('mail');
-        })->filter()->all();
-
-        if (empty($emails)) {
+        if (! $notifiable->routeNotificationFor('mail')) {
             return;
         }
 
-        $view = data_get($notification, 'options.view', 'notifications::email');
+        $message = $notification->toMail($notifiable);
 
-        $this->mailer->send($view, $data, function ($m) use ($notification, $emails) {
-            count($notification->notifiables) === 1
-                        ? $m->to($emails) : $m->bcc($emails);
+        $this->mailer->send($message->view, $message->toArray(), function ($m) use ($notifiable, $notification, $message) {
+            $m->to($notifiable->routeNotificationFor('mail'));
 
-            $m->subject($notification->subject);
+            $m->subject($message->subject ?: Str::title(
+                Str::snake(class_basename($notification), ' ')
+            ));
         });
     }
-
-    /**
-     * Prepare the data from the given notification.
-     *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
-     * @return array
-     */
-    protected function prepareNotificationData($notification)
-    {
-        $data = $notification->toArray();
-
-        return Arr::set($data, 'actionColor', $this->actionColorForLevel($data['level']));
-    }
-
-    /**
-     * Get the action color for the given notification "level".
-     *
-     * @param  string  $level
-     * @return string
-     */
-    protected function actionColorForLevel($level)
-    {
-        switch ($level) {
-            case 'success':
-                return 'green';
-            case 'error':
-                return 'red';
-            default:
-                return 'blue';
-        }
-    }
 }
diff --git a/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php b/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
index b3a7ecc92281..bc0cb21908cc 100644
--- a/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
+++ b/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
@@ -2,8 +2,9 @@
 
 namespace Illuminate\Notifications\Channels;
 
-use Illuminate\Support\Arr;
 use Nexmo\Client as NexmoClient;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\NexmoMessage;
 
 class NexmoSmsChannel
 {
@@ -25,6 +26,7 @@ class NexmoSmsChannel
      * Create a new Nexmo channel instance.
      *
      * @param  \Nexmo\Client  $nexmo
+     * @param  string  $from
      * @return void
      */
     public function __construct(NexmoClient $nexmo, $from)
@@ -36,54 +38,26 @@ public function __construct(NexmoClient $nexmo, $from)
     /**
      * Send the given notification.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
-    public function send(Notification $notification)
+    public function send($notifiable, Notification $notification)
     {
-        foreach ($notification->notifiables as $notifiable) {
-            if (! $to = $notifiable->routeNotificationFor('nexmo')) {
-                continue;
-            }
-
-            $this->nexmo->message()->send([
-                'from' => $this->from,
-                'to' => $to,
-                'text' => $this->formatNotification($notification),
-            ]);
+        if (! $to = $notifiable->routeNotificationFor('nexmo')) {
+            return;
         }
-    }
 
-    /**
-     * Format the given notification to a single string.
-     *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
-     * @return string
-     */
-    protected function formatNotification(Notification $notification)
-    {
-        $data = $notification->toArray();
+        $message = $notification->toNexmo($notifiable);
 
-        $actionText = $notification->actionText
-                    ? $notification->actionText.': ' : '';
-
-        return trim(implode(PHP_EOL.PHP_EOL, array_filter([
-            implode(' ', Arr::get($data, 'introLines', [])),
-            $actionText.Arr::get($data, 'actionUrl'),
-            implode(' ', Arr::get($data, 'outroLines', [])),
-        ])));
-    }
-
-    /**
-     * Set the phone number that should be used to send notification.
-     *
-     * @param  string  $from
-     * @return $this
-     */
-    public function sendNotificationsFrom($from)
-    {
-        $this->from = $from;
+        if (is_string($message)) {
+            $message = new NexmoMessage($message);
+        }
 
-        return $this;
+        $this->nexmo->message()->send([
+            'from' => $message->from ?: $this->from,
+            'to' => $to,
+            'text' => trim($message->content),
+        ]);
     }
 }
diff --git a/src/Illuminate/Notifications/Channels/Notification.php b/src/Illuminate/Notifications/Channels/Notification.php
deleted file mode 100644
index 600e1d66f907..000000000000
--- a/src/Illuminate/Notifications/Channels/Notification.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-
-namespace Illuminate\Notifications\Channels;
-
-use Illuminate\Support\Str;
-use Illuminate\Container\Container;
-use Illuminate\Notifications\Action;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Notifications\ChannelManager;
-use Illuminate\Database\Eloquent\Collection;
-
-class Notification implements Arrayable
-{
-    use SerializesModels;
-
-    /**
-     * The entities that should receive the notification.
-     *
-     * @var \Illuminate\Support\Collection
-     */
-    public $notifiables;
-
-    /**
-     * The channels that the notification should be sent through.
-     */
-    public $via = [];
-
-    /**
-     * The name of the application sending the notification.
-     *
-     * @var string
-     */
-    public $application;
-
-    /**
-     * The URL to the application's logo.
-     *
-     * @var string
-     */
-    public $logoUrl;
-
-    /**
-     * The "level" of the notification (info, success, error).
-     *
-     * @var string
-     */
-    public $level = 'info';
-
-    /**
-     * The subject of the notification.
-     *
-     * @var string
-     */
-    public $subject;
-
-    /**
-     * The "intro" lines of the notification.
-     *
-     * @var array
-     */
-    public $introLines = [];
-
-    /**
-     * The "outro" lines of the notification.
-     *
-     * @var array
-     */
-    public $outroLines = [];
-
-    /**
-     * The text / label for the action.
-     *
-     * @var string
-     */
-    public $actionText;
-
-    /**
-     * The action URL.
-     *
-     * @var string
-     */
-    public $actionUrl;
-
-    /**
-     * The notification's options.
-     *
-     * @var array
-     */
-    public $options = [];
-
-    /**
-     * Create a new notification instance.
-     *
-     * @param  \Illuminate\Support\Collection|array|mixed  $notifiables
-     * @return void
-     */
-    public function __construct($notifiables)
-    {
-        if (is_object($notifiables) && ! $notifiables instanceof Collection) {
-            $notifiables = [$notifiables];
-        }
-
-        $this->notifiables = Collection::make($notifiables);
-    }
-
-    /**
-     * Specify the name of the application sending the notification.
-     *
-     * @param  string  $application
-     * @param  string  $logoUrl
-     * @return $this
-     */
-    public function application($application, $logoUrl = null)
-    {
-        $this->application = $application;
-        $this->logoUrl = $logoUrl;
-
-        return $this;
-    }
-
-    /**
-     * Indicate that the notification gives information about a successful operation.
-     *
-     * @return $this
-     */
-    public function success()
-    {
-        $this->level = 'success';
-
-        return $this;
-    }
-
-    /**
-     * Indicate that the notification gives information about an error.
-     *
-     * @return $this
-     */
-    public function error()
-    {
-        $this->level = 'error';
-
-        return $this;
-    }
-
-    /**
-     * Set the "level" of the notification (success, error, etc.).
-     *
-     * @param  string  $level
-     * @return $this
-     */
-    public function level($level)
-    {
-        $this->level = $level;
-
-        return $this;
-    }
-
-    /**
-     * Set the subject of the notification.
-     *
-     * @param  string  $subject
-     * @return $this
-     */
-    public function subject($subject)
-    {
-        $this->subject = $subject;
-
-        return $this;
-    }
-
-    /**
-     * Add a line of text to the notification.
-     *
-     * @param  \Illuminate\Notifications\Action|string  $line
-     * @return $this
-     */
-    public function line($line)
-    {
-        return $this->with($line);
-    }
-
-    /**
-     * Add a line of text to the notification.
-     *
-     * @param  \Illuminate\Notifications\Action|string  $line
-     * @return $this
-     */
-    public function with($line)
-    {
-        if ($line instanceof Action) {
-            $this->action($line->text, $line->url);
-        } elseif (! $this->actionText) {
-            $this->introLines[] = trim($line);
-        } else {
-            $this->outroLines[] = trim($line);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the notification's options.
-     *
-     * @param  array  $options
-     * @return $this
-     */
-    public function options(array $options)
-    {
-        $this->options = $options;
-
-        return $this;
-    }
-
-    /**
-     * Configure the "call to action" button.
-     *
-     * @param  string  $text
-     * @param  string  $url
-     * @return $this
-     */
-    public function action($text, $url)
-    {
-        $this->actionText = $text;
-        $this->actionUrl = $url;
-
-        return $this;
-    }
-
-    /**
-     * Set the channels that should be used to deliver the notification.
-     *
-     * @param  array|string  $channels
-     * @return $this
-     */
-    public function via($channels)
-    {
-        $this->via = is_string($channels) ? func_get_args() : (array) $channels;
-
-        return $this;
-    }
-
-    /**
-     * Send the notification.
-     *
-     * @return void
-     */
-    public function send()
-    {
-        return Container::getInstance()->make(ChannelManager::class)->send($this);
-    }
-
-    /**
-     * Build new channel notifications from the given object.
-     *
-     * @param  mixed  $notifiable
-     * @param  mixed  $instance
-     * @param  array|null  $channels
-     * @return array[static]
-     */
-    public static function notificationsFromInstance($notifiable, $instance, $channels = null)
-    {
-        $notifications = [];
-
-        $channels = $channels ?: $instance->via($notifiable);
-
-        $channels = $channels ?: app(ChannelManager::class)->deliversVia();
-
-        foreach ($channels as $channel) {
-            $notifications[] = static::buildNotification($notifiable, $instance, $channel);
-        }
-
-        return $notifications;
-    }
-
-    /**
-     * Build a new channel notification.
-     *
-     * @param  mixed  $notifiable
-     * @param  mixed  $instance
-     * @param  string  $channel
-     * @return static
-     */
-    protected static function buildNotification($notifiable, $instance, $channel)
-    {
-        $notification = new static([$notifiable]);
-
-        $notification->via($channel)
-                     ->subject($instance->subject())
-                     ->level($instance->level());
-
-        $method = static::messageMethod($instance, $channel);
-
-        foreach ($instance->{$method}($notifiable)->elements as $element) {
-            $notification->with($element);
-        }
-
-        $method = static::optionsMethod($instance, $channel);
-
-        $notification->options($instance->{$method}($notifiable));
-
-        return $notification;
-    }
-
-    /**
-     * Get the proper message method for the given instance and channel.
-     *
-     * @param  mixed  $instance
-     * @param  string  $channel
-     * @return string
-     */
-    protected static function messageMethod($instance, $channel)
-    {
-        return method_exists(
-            $instance, $channelMethod = Str::camel($channel).'Message'
-        ) ? $channelMethod : 'message';
-    }
-
-    /**
-     * Get the proper data method for the given instance and channel.
-     *
-     * @param  mixed  $instance
-     * @param  string  $channel
-     * @return string
-     */
-    protected static function optionsMethod($instance, $channel)
-    {
-        return method_exists(
-            $instance, $channelMethod = Str::camel($channel).'Options'
-        ) ? $channelMethod : 'options';
-    }
-
-    /**
-     * Get the instance as an array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            'notifiables' => $this->notifiables,
-            'application' => $this->application,
-            'logoUrl' => $this->logoUrl,
-            'level' => $this->level,
-            'subject' => $this->subject,
-            'introLines' => $this->introLines,
-            'outroLines' => $this->outroLines,
-            'actionText' => $this->actionText,
-            'actionUrl' => $this->actionUrl,
-        ];
-    }
-}
diff --git a/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php b/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
index 4e68e904842f..b75821bb63a9 100644
--- a/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
+++ b/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
@@ -3,6 +3,9 @@
 namespace Illuminate\Notifications\Channels;
 
 use GuzzleHttp\Client as HttpClient;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Messages\SlackAttachment;
 
 class SlackWebhookChannel
 {
@@ -27,63 +30,55 @@ public function __construct(HttpClient $http)
     /**
      * Send the given notification.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
-    public function send(Notification $notification)
+    public function send($notifiable, Notification $notification)
     {
-        foreach ($notification->notifiables as $notifiable) {
-            if (! $url = $notifiable->routeNotificationFor('slack')) {
-                continue;
-            }
-
-            $this->http->post($url, [
-                'json' => [
-                    'attachments' => [
-                        array_filter([
-                            'color' => $this->color($notification),
-                            'title' => $notification->subject,
-                            'title_link' => $notification->actionUrl ?: null,
-                            'text' => $this->format($notification),
-                        ]),
-                    ],
-                ],
-            ]);
+        if (! $url = $notifiable->routeNotificationFor('slack')) {
+            return;
         }
+
+        $message = $notification->toSlack($notifiable);
+
+        $this->http->post($url, [
+            'json' => [
+                'text' => $message->content,
+                'attachments' => $this->attachments($message),
+            ],
+        ]);
     }
 
     /**
-     * Format the given notification.
+     * Format the message's attachments.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
-     * @return string
+     * @param  \Illuminate\Notifications\Messages\SlackMessage  $message
+     * @return array
      */
-    protected function format(Notification $notification)
+    protected function attachments(SlackMessage $message)
     {
-        $message = trim(implode(PHP_EOL.PHP_EOL, $notification->introLines));
-
-        if ($notification->actionText) {
-            $message .= PHP_EOL.PHP_EOL.'<'.$notification->actionUrl.'|'.$notification->actionText.'>';
-        }
-
-        $message .= PHP_EOL.PHP_EOL.trim(implode(PHP_EOL.PHP_EOL, $notification->outroLines));
-
-        return trim($message);
+        return collect($message->attachments)->map(function ($attachment) use ($message) {
+            return array_filter([
+                'color' => $message->color(),
+                'title' => $attachment->title,
+                'text' => $attachment->content,
+                'title_link' => $attachment->url,
+                'fields' => $this->fields($attachment),
+            ]);
+        })->all();
     }
 
     /**
-     * Get the color that should be applied to the notification.
+     * Format the attachment's fields.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
-     * @return string|null
+     * @param  \Illuminate\Notifications\Messages\SlackAttachment  $attachment
+     * @return array
      */
-    protected function color(Notification $notification)
+    protected function fields(SlackAttachment $attachment)
     {
-        switch ($notification->level) {
-            case 'success':
-                return 'good';
-            case 'error':
-                return 'danger';
-        }
+        return collect($attachment->fields)->map(function ($value, $key) {
+            return ['title' => $key, 'value' => $value, 'short' => true];
+        })->values()->all();
     }
 }
diff --git a/src/Illuminate/Notifications/Console/NotificationTableCommand.php b/src/Illuminate/Notifications/Console/NotificationTableCommand.php
new file mode 100644
index 000000000000..09b0e3eb5415
--- /dev/null
+++ b/src/Illuminate/Notifications/Console/NotificationTableCommand.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Illuminate\Notifications\Console;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Composer;
+use Illuminate\Filesystem\Filesystem;
+
+class NotificationTableCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'notifications:table';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a migration for the notifications table';
+
+    /**
+     * The filesystem instance.
+     *
+     * @var \Illuminate\Filesystem\Filesystem
+     */
+    protected $files;
+
+    /**
+     * @var \Illuminate\Support\Composer
+     */
+    protected $composer;
+
+    /**
+     * Create a new notifications table command instance.
+     *
+     * @param  \Illuminate\Filesystem\Filesystem  $files
+     * @param  \Illuminate\Support\Composer    $composer
+     * @return void
+     */
+    public function __construct(Filesystem $files, Composer $composer)
+    {
+        parent::__construct();
+
+        $this->files = $files;
+        $this->composer = $composer;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $fullPath = $this->createBaseMigration();
+
+        $this->files->put($fullPath, $this->files->get(__DIR__.'/stubs/notifications.stub'));
+
+        $this->info('Migration created successfully!');
+
+        $this->composer->dumpAutoloads();
+    }
+
+    /**
+     * Create a base migration file for the notifications.
+     *
+     * @return string
+     */
+    protected function createBaseMigration()
+    {
+        $name = 'create_notifications_table';
+
+        $path = $this->laravel->databasePath().'/migrations';
+
+        return $this->laravel['migration.creator']->create($name, $path);
+    }
+}
diff --git a/src/Illuminate/Notifications/Console/stubs/notifications.stub b/src/Illuminate/Notifications/Console/stubs/notifications.stub
new file mode 100644
index 000000000000..160a1c42f498
--- /dev/null
+++ b/src/Illuminate/Notifications/Console/stubs/notifications.stub
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateNotificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('notifications', function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->string('type');
+            $table->morphs('notifiable');
+            $table->text('data');
+            $table->timestamp('read_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('notifications');
+    }
+}
diff --git a/src/Illuminate/Notifications/DatabaseNotification.php b/src/Illuminate/Notifications/DatabaseNotification.php
index 69497c1cfe9c..a8e6ec12beb2 100644
--- a/src/Illuminate/Notifications/DatabaseNotification.php
+++ b/src/Illuminate/Notifications/DatabaseNotification.php
@@ -6,6 +6,13 @@
 
 class DatabaseNotification extends Model
 {
+    /**
+     * Indicates if the IDs are auto-incrementing.
+     *
+     * @var bool
+     */
+    public $incrementing = false;
+
     /**
      * The table associated with the model.
      *
@@ -26,9 +33,8 @@ class DatabaseNotification extends Model
      * @var array
      */
     protected $casts = [
-        'intro' => 'array',
-        'outro' => 'array',
-        'read' => 'boolean',
+        'data' => 'array',
+        'read_at' => 'datetime',
     ];
 
     /**
@@ -46,6 +52,19 @@ public function notifiable()
      */
     public function markAsRead()
     {
-        $this->forceFill(['read' => true])->save();
+        if (is_null($this->read_at)) {
+            $this->forceFill(['read_at' => $this->freshTimestamp()])->save();
+        }
+    }
+
+    /**
+     * Create a new database notification collection instance.
+     *
+     * @param  array  $models
+     * @return \Illuminate\Notifications\DatabaseNotificationCollection
+     */
+    public function newCollection(array $models = [])
+    {
+        return new DatabaseNotificationCollection($models);
     }
 }
diff --git a/src/Illuminate/Notifications/DatabaseNotificationCollection.php b/src/Illuminate/Notifications/DatabaseNotificationCollection.php
new file mode 100644
index 000000000000..5ef3f27e11ff
--- /dev/null
+++ b/src/Illuminate/Notifications/DatabaseNotificationCollection.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Illuminate\Notifications;
+
+use Illuminate\Database\Eloquent\Collection;
+
+class DatabaseNotificationCollection extends Collection
+{
+    /**
+     * Mark all notification as read.
+     *
+     * @return void
+     */
+    public function markAsRead()
+    {
+        $this->each(function ($notification) {
+            $notification->markAsRead();
+        });
+    }
+}
diff --git a/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
new file mode 100644
index 000000000000..a24cc8b362cd
--- /dev/null
+++ b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Illuminate\Notifications\Events;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Notifications\Notification;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class BroadcastNotificationCreated implements ShouldBroadcast
+{
+    use SerializesModels;
+
+    /**
+     * The notifiable entity who received the notification.
+     *
+     * @var mixed
+     */
+    public $notifiable;
+
+    /**
+     * The notification instance.
+     *
+     * @var \Illuminate\Notifications\Notification
+     */
+    public $notification;
+
+    /**
+     * The notification data.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  array  $data
+     * @return void
+     */
+    public function __construct($notifiable, $notification, $data)
+    {
+        $this->data = $data;
+        $this->notifiable = $notifiable;
+        $this->notification = $notification;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array
+     */
+    public function broadcastOn()
+    {
+        return [new PrivateChannel($this->channelName())];
+    }
+
+    /**
+     * Get the data that should be sent with the broadcasted event.
+     *
+     * @return array
+     */
+    public function broadcastWith()
+    {
+        return array_merge($this->data, [
+            'id' => $this->notification->id,
+            'type' => get_class($this->notification),
+        ]);
+    }
+
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        $class = str_replace('\\', '.', get_class($this->notifiable));
+
+        return $class.'.'.$this->notifiable->getKey();
+    }
+}
diff --git a/src/Illuminate/Notifications/Events/NotificationSending.php b/src/Illuminate/Notifications/Events/NotificationSending.php
new file mode 100644
index 000000000000..81a218ece563
--- /dev/null
+++ b/src/Illuminate/Notifications/Events/NotificationSending.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Illuminate\Notifications\Events;
+
+class NotificationSending
+{
+    /**
+     * The notifiable entity who received the notification.
+     *
+     * @var mixed
+     */
+    public $notifiable;
+
+    /**
+     * The notification instance.
+     *
+     * @var \Illuminate\Notifications\Notification
+     */
+    public $notification;
+
+    /**
+     * The channel name.
+     *
+     * @var string
+     */
+    public $channel;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  string  $channel
+     * @return void
+     */
+    public function __construct($notifiable, $notification, $channel)
+    {
+        $this->channel = $channel;
+        $this->notifiable = $notifiable;
+        $this->notification = $notification;
+    }
+}
diff --git a/src/Illuminate/Notifications/Events/NotificationSent.php b/src/Illuminate/Notifications/Events/NotificationSent.php
index 1361f1ad6764..5685f231b136 100644
--- a/src/Illuminate/Notifications/Events/NotificationSent.php
+++ b/src/Illuminate/Notifications/Events/NotificationSent.php
@@ -2,25 +2,41 @@
 
 namespace Illuminate\Notifications\Events;
 
-use Illuminate\Notifications\Channels\Notification;
-
 class NotificationSent
 {
+    /**
+     * The notifiable entity who received the notification.
+     *
+     * @var mixed
+     */
+    public $notifiable;
+
     /**
      * The notification instance.
      *
-     * @var \Illuminate\Notifications\Channels\Notification
+     * @var \Illuminate\Notifications\Notification
      */
     public $notification;
 
+    /**
+     * The channel name.
+     *
+     * @var string
+     */
+    public $channel;
+
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Notifications\Channels\Notification  $notification
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param  string  $channel
      * @return void
      */
-    public function __construct(Notification $notification)
+    public function __construct($notifiable, $notification, $channel)
     {
+        $this->channel = $channel;
+        $this->notifiable = $notifiable;
         $this->notification = $notification;
     }
 }
diff --git a/src/Illuminate/Notifications/HasDatabaseNotifications.php b/src/Illuminate/Notifications/HasDatabaseNotifications.php
index d9b8fde4726b..807ebadc5005 100644
--- a/src/Illuminate/Notifications/HasDatabaseNotifications.php
+++ b/src/Illuminate/Notifications/HasDatabaseNotifications.php
@@ -9,6 +9,17 @@ trait HasDatabaseNotifications
      */
     public function notifications()
     {
-        return $this->morphMany(DatabaseNotification::class, 'notifiable');
+        return $this->morphMany(DatabaseNotification::class, 'notifiable')
+                            ->orderBy('created_at', 'desc');
+    }
+
+    /**
+     * Get the entity's unread notifications.
+     */
+    public function unreadNotifications()
+    {
+        return $this->morphMany(DatabaseNotification::class, 'notifiable')
+                            ->whereNull('read_at')
+                            ->orderBy('created_at', 'desc');
     }
 }
diff --git a/src/Illuminate/Notifications/MessageBuilder.php b/src/Illuminate/Notifications/MessageBuilder.php
deleted file mode 100644
index c548a6dcbeae..000000000000
--- a/src/Illuminate/Notifications/MessageBuilder.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Illuminate\Notifications;
-
-use Illuminate\Support\Traits\Macroable;
-
-class MessageBuilder
-{
-    use Macroable;
-
-    /**
-     * All of the message elements.
-     *
-     * @var array
-     */
-    public $elements = [];
-
-    /**
-     * Create a new message builder instance.
-     *
-     * @param  string  $line
-     * @return void
-     */
-    public function __construct($line)
-    {
-        $this->elements[] = $line;
-    }
-
-    /**
-     * Add a line to the message.
-     *
-     * @param  string  $line
-     * @return $this
-     */
-    public function line($line)
-    {
-        $this->elements[] = $line;
-
-        return $this;
-    }
-
-    /**
-     * Add an action to the message.
-     *
-     * @param  string  $text
-     * @param  string  $url
-     * @return $this
-     */
-    public function action($text, $url)
-    {
-        $this->elements[] = new Action($text, $url);
-
-        return $this;
-    }
-}
diff --git a/src/Illuminate/Notifications/Messages/DatabaseMessage.php b/src/Illuminate/Notifications/Messages/DatabaseMessage.php
new file mode 100644
index 000000000000..55707a7c065f
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/DatabaseMessage.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+class DatabaseMessage
+{
+    /**
+     * The data that should be stored with the notification.
+     *
+     * @var array
+     */
+    public $data = [];
+
+    /**
+     * Create a new database message.
+     *
+     * @param  array  $data
+     * @return void
+     */
+    public function __construct(array $data = [])
+    {
+        $this->data = $data;
+    }
+}
diff --git a/src/Illuminate/Notifications/Messages/MailMessage.php b/src/Illuminate/Notifications/Messages/MailMessage.php
new file mode 100644
index 000000000000..ee6a8b2b870a
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/MailMessage.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+class MailMessage extends SimpleMessage
+{
+    /**
+     * The view for the message.
+     *
+     * @var string
+     */
+    public $view = 'notifications::email';
+
+    /**
+     * Set the view for the mail message.
+     *
+     * @param  string  $view
+     * @return $this
+     */
+    public function view($view)
+    {
+        $this->view = $view;
+
+        return $this;
+    }
+}
diff --git a/src/Illuminate/Notifications/Messages/NexmoMessage.php b/src/Illuminate/Notifications/Messages/NexmoMessage.php
new file mode 100644
index 000000000000..23ebbe622f79
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/NexmoMessage.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+class NexmoMessage
+{
+    /**
+     * The message content.
+     *
+     * @var string
+     */
+    public $content;
+
+    /**
+     * The phone number the message should be sent from.
+     *
+     * @var string
+     */
+    public $from;
+
+    /**
+     * Create a new message instance.
+     *
+     * @param  string  $message
+     * @return void
+     */
+    public function __construct($content = '')
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Set the message content.
+     *
+     * @param  string  $content
+     * @return $this
+     */
+    public function content($content)
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    /**
+     * Set the phone number the message should be sent from.
+     *
+     * @param  string  $number
+     * @return $this
+     */
+    public function from($from)
+    {
+        $this->from = $from;
+
+        return $this;
+    }
+}
diff --git a/src/Illuminate/Notifications/Messages/SimpleMessage.php b/src/Illuminate/Notifications/Messages/SimpleMessage.php
new file mode 100644
index 000000000000..25187ecc1d39
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/SimpleMessage.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+use Illuminate\Notifications\Action;
+
+class SimpleMessage
+{
+    /**
+     * The "level" of the notification (info, success, error).
+     *
+     * @var string
+     */
+    public $level = 'info';
+
+    /**
+     * The subject of the notification.
+     *
+     * @var string
+     */
+    public $subject;
+
+    /**
+     * The "intro" lines of the notification.
+     *
+     * @var array
+     */
+    public $introLines = [];
+
+    /**
+     * The "outro" lines of the notification.
+     *
+     * @var array
+     */
+    public $outroLines = [];
+
+    /**
+     * The text / label for the action.
+     *
+     * @var string
+     */
+    public $actionText;
+
+    /**
+     * The action URL.
+     *
+     * @var string
+     */
+    public $actionUrl;
+
+    /**
+     * Indicate that the notification gives information about a successful operation.
+     *
+     * @return $this
+     */
+    public function success()
+    {
+        $this->level = 'success';
+
+        return $this;
+    }
+
+    /**
+     * Indicate that the notification gives information about an error.
+     *
+     * @return $this
+     */
+    public function error()
+    {
+        $this->level = 'error';
+
+        return $this;
+    }
+
+    /**
+     * Set the "level" of the notification (success, error, etc.).
+     *
+     * @param  string  $level
+     * @return $this
+     */
+    public function level($level)
+    {
+        $this->level = $level;
+
+        return $this;
+    }
+
+    /**
+     * Set the subject of the notification.
+     *
+     * @param  string  $subject
+     * @return $this
+     */
+    public function subject($subject)
+    {
+        $this->subject = $subject;
+
+        return $this;
+    }
+
+    /**
+     * Add a line of text to the notification.
+     *
+     * @param  \Illuminate\Notifications\Action|string  $line
+     * @return $this
+     */
+    public function line($line)
+    {
+        return $this->with($line);
+    }
+
+    /**
+     * Add a line of text to the notification.
+     *
+     * @param  \Illuminate\Notifications\Action|string|array  $line
+     * @return $this
+     */
+    public function with($line)
+    {
+        if ($line instanceof Action) {
+            $this->action($line->text, $line->url);
+        } elseif (! $this->actionText) {
+            $this->introLines[] = $this->formatLine($line);
+        } else {
+            $this->outroLines[] = $this->formatLine($line);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Format the given line of text.
+     *
+     * @param  string|array  $line
+     * @return string
+     */
+    protected function formatLine($line)
+    {
+        if (is_array($line)) {
+            return implode(' ', array_map('trim', $line));
+        }
+
+        return trim(implode(' ', array_map('trim', explode(PHP_EOL, $line))));
+    }
+
+    /**
+     * Configure the "call to action" button.
+     *
+     * @param  string  $text
+     * @param  string  $url
+     * @return $this
+     */
+    public function action($text, $url)
+    {
+        $this->actionText = $text;
+        $this->actionUrl = $url;
+
+        return $this;
+    }
+
+    /**
+     * Get an array representation of the message.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return [
+            'level' => $this->level,
+            'subject' => $this->subject,
+            'introLines' => $this->introLines,
+            'outroLines' => $this->outroLines,
+            'actionText' => $this->actionText,
+            'actionUrl' => $this->actionUrl,
+        ];
+    }
+}
diff --git a/src/Illuminate/Notifications/Messages/SlackAttachment.php b/src/Illuminate/Notifications/Messages/SlackAttachment.php
new file mode 100644
index 000000000000..11b8a7ac0ef9
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/SlackAttachment.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+class SlackAttachment
+{
+    /**
+     * The attachment's title.
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * The attachment's URL.
+     *
+     * @var string
+     */
+    public $url;
+
+    /**
+     * The attachment's text content.
+     *
+     * @var string
+     */
+    public $content;
+
+    /**
+     * The attachment's fields.
+     *
+     * @var array
+     */
+    public $fields;
+
+    /**
+     * Set the title of the attachment.
+     *
+     * @param  string  $title
+     * @param  string  $url
+     * @return $this
+     */
+    public function title($title, $url = null)
+    {
+        $this->title = $title;
+        $this->url = $url;
+
+        return $this;
+    }
+
+    /**
+     * Set the content (text) of the attachment.
+     *
+     * @param  string  $content
+     * @return $this
+     */
+    public function content($content)
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    /**
+     * Set the fields of the attachment.
+     *
+     * @param  array  $fields
+     * @return $this
+     */
+    public function fields(array $fields)
+    {
+        $this->fields = $fields;
+
+        return $this;
+    }
+}
diff --git a/src/Illuminate/Notifications/Messages/SlackMessage.php b/src/Illuminate/Notifications/Messages/SlackMessage.php
new file mode 100644
index 000000000000..c20508f8fcf1
--- /dev/null
+++ b/src/Illuminate/Notifications/Messages/SlackMessage.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Illuminate\Notifications\Messages;
+
+use Closure;
+
+class SlackMessage
+{
+    /**
+     * The "level" of the notification (info, success, error).
+     *
+     * @var string
+     */
+    public $level = 'info';
+
+    /**
+     * The text content of the message.
+     *
+     * @var string
+     */
+    public $content;
+
+    /**
+     * The message's attachments.
+     *
+     * @var array
+     */
+    public $attachments = [];
+
+    /**
+     * Indicate that the notification gives information about a successful operation.
+     *
+     * @return $this
+     */
+    public function success()
+    {
+        $this->level = 'success';
+
+        return $this;
+    }
+
+    /**
+     * Indicate that the notification gives information about an error.
+     *
+     * @return $this
+     */
+    public function error()
+    {
+        $this->level = 'error';
+
+        return $this;
+    }
+
+    /**
+     * Set the content of the Slack message.
+     *
+     * @param  string  $content
+     * @return $this
+     */
+    public function content($content)
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    /**
+     * Define an attachment for the message.
+     *
+     * @param  \Closure  $callback
+     * @return $this
+     */
+    public function attachment(Closure $callback)
+    {
+        $this->attachments[] = $attachment = new SlackAttachment;
+
+        $callback($attachment);
+
+        return $this;
+    }
+
+    /**
+     * Get the color for the message.
+     *
+     * @return string
+     */
+    public function color()
+    {
+        switch ($this->level) {
+            case 'success':
+                return '#7CD197';
+            case 'error':
+                return '#F35A00';
+        }
+    }
+}
diff --git a/src/Illuminate/Notifications/Notification.php b/src/Illuminate/Notifications/Notification.php
index 96595fcd9d0a..9b258b7dc1f6 100644
--- a/src/Illuminate/Notifications/Notification.php
+++ b/src/Illuminate/Notifications/Notification.php
@@ -2,50 +2,26 @@
 
 namespace Illuminate\Notifications;
 
-use Illuminate\Support\Str;
+use Illuminate\Queue\SerializesModels;
 
 class Notification
 {
-    /**
-     * Get the "level" of the notification.
-     *
-     * @return string
-     */
-    public function level()
-    {
-        return property_exists($this, 'level') ? $this->level : 'info';
-    }
+    use SerializesModels;
 
     /**
-     * Get the subject of the notification.
+     * The unique identifier for the notification.
      *
-     * @return string
+     * @var string
      */
-    public function subject()
-    {
-        return property_exists($this, 'subject')
-                        ? $this->subject
-                        : Str::title(Str::snake(class_basename($this), ' '));
-    }
-
-    /**
-     * Create a new message builder instance.
-     *
-     * @param  string  $line
-     * @return \Illuminate\Notifications\MessageBuilder
-     */
-    public function line($line)
-    {
-        return new MessageBuilder($line);
-    }
+    public $id;
 
     /**
-     * Get the notification's options.
+     * Get the channels the event should broadcast on.
      *
      * @return array
      */
-    public function options()
+    public function broadcastOn()
     {
-        return property_exists($this, 'options') ? $this->options : [];
+        return [];
     }
 }
diff --git a/src/Illuminate/Notifications/NotificationServiceProvider.php b/src/Illuminate/Notifications/NotificationServiceProvider.php
index bba721ccc8ab..ba1fb2c3ad4c 100644
--- a/src/Illuminate/Notifications/NotificationServiceProvider.php
+++ b/src/Illuminate/Notifications/NotificationServiceProvider.php
@@ -8,13 +8,6 @@
 
 class NotificationServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = true;
-
     /**
      * Boot the application services.
      *
@@ -50,16 +43,4 @@ public function register()
             ChannelManager::class, FactoryContract::class
         );
     }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return [
-            ChannelManager::class, DispatcherContract::class, FactoryContract::class,
-        ];
-    }
 }
diff --git a/src/Illuminate/Notifications/RoutesNotifications.php b/src/Illuminate/Notifications/RoutesNotifications.php
index 9619ad3d7eb5..f73cdffc1571 100644
--- a/src/Illuminate/Notifications/RoutesNotifications.php
+++ b/src/Illuminate/Notifications/RoutesNotifications.php
@@ -15,19 +15,7 @@ trait RoutesNotifications
      */
     public function notify($instance)
     {
-        app(Dispatcher::class)->dispatch($this, $instance);
-    }
-
-    /**
-     * Send the given notification via the given channels.
-     *
-     * @param  array|string  $channels
-     * @param  mixed  $instance
-     * @return void
-     */
-    public function notifyVia($channels, $instance)
-    {
-        app(Dispatcher::class)->dispatch($this, $instance, $channels);
+        app(Dispatcher::class)->send([$this], $instance);
     }
 
     /**
diff --git a/src/Illuminate/Notifications/SendQueuedNotifications.php b/src/Illuminate/Notifications/SendQueuedNotifications.php
index deab7c803128..c829bec7f487 100644
--- a/src/Illuminate/Notifications/SendQueuedNotifications.php
+++ b/src/Illuminate/Notifications/SendQueuedNotifications.php
@@ -3,28 +3,38 @@
 namespace Illuminate\Notifications;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
 class SendQueuedNotifications implements ShouldQueue
 {
-    use Queueable;
+    use Queueable, SerializesModels;
 
     /**
-     * The notifications to be sent.
+     * The notifiable entities that should receive the notification.
      *
-     * @var array
+     * @var \Illuminate\Support\Collection
      */
-    protected $notifications;
+    protected $notifiables;
+
+    /**
+     * The notification to be sent.
+     *
+     * @var \Illuminate\Notifications\Notification
+     */
+    protected $notification;
 
     /**
      * Create a new job instance.
      *
-     * @param  array[\Illuminate\Notifications\Channels\Notification]  $notifications
+     * @param  \Illuminate\Support\Collection  $notifiables
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @return void
      */
-    public function __construct(array $notifications)
+    public function __construct($notifiables, $notification)
     {
-        $this->notifications = $notifications;
+        $this->notifiables = $notifiables;
+        $this->notification = $notification;
     }
 
     /**
@@ -35,8 +45,6 @@ public function __construct(array $notifications)
      */
     public function handle(ChannelManager $manager)
     {
-        foreach ($this->notifications as $notification) {
-            $manager->send($notification);
-        }
+        $manager->sendNow($this->notifiables, $this->notification);
     }
 }
diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json
index 6a9e29c66df2..c0dc101e9259 100644
--- a/src/Illuminate/Notifications/composer.json
+++ b/src/Illuminate/Notifications/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/notifications",
     "description": "The Illuminate Notifications package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -15,9 +15,11 @@
     ],
     "require": {
         "php": ">=5.6.4",
+        "illuminate/broadcasting": "5.3.*",
         "illuminate/bus": "5.3.*",
         "illuminate/contracts": "5.3.*",
-        "illuminate/support": "5.3.*"
+        "illuminate/support": "5.3.*",
+        "ramsey/uuid": "~3.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Illuminate/Notifications/resources/views/email.blade.php b/src/Illuminate/Notifications/resources/views/email.blade.php
index 5467e73fc557..65397fbbe650 100644
--- a/src/Illuminate/Notifications/resources/views/email.blade.php
+++ b/src/Illuminate/Notifications/resources/views/email.blade.php
@@ -1,240 +1,89 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
     <style type="text/css" rel="stylesheet" media="all">
-        /* Base ------------------------------ */
-
-        *:not(br):not(tr):not(html) {
-            font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
-            -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-        }
-        body {
-            width: 100% !important;
-            height: 100%;
-            margin: 0;
-            line-height: 1.4;
-            background-color: #F2F4F6;
-            color: #74787E;
-            -webkit-text-size-adjust: none;
-        }
-        a {
-            color: #3869D4;
+        /* Media Queries */
+        @media only screen and (max-width: 500px) {
+            .button {
+                width: 100% !important;
+            }
         }
+    </style>
+</head>
 
-        /* Layout ------------------------------ */
+<?php
 
-        .email-wrapper {
-            width: 100%;
-            margin: 0;
-            padding: 0;
-            background-color: #F2F4F6;
-        }
-        .email-content {
-            width: 100%;
-            margin: 0;
-            padding: 0;
-        }
+$style = [
+    /* Layout ------------------------------ */
 
-        /* Masthead ----------------------- */
+    'body' => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
+    'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;',
 
-        .email-masthead {
-            padding: 25px 0;
-            text-align: center;
-        }
-        .email-masthead_logo {
-            max-width: 400px;
-            border: 0;
-        }
-        .email-masthead_name {
-            font-size: 16px;
-            font-weight: bold;
-            color: #2F3133;
-            text-decoration: none;
-            text-shadow: 0 1px 0 white;
-        }
-        .email-logo {
-            max-height: 50px;
-        }
+    /* Masthead ----------------------- */
 
-        /* Body ------------------------------ */
+    'email-masthead' => 'padding: 25px 0; text-align: center;',
+    'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
 
-        .email-body {
-            width: 100%;
-            margin: 0;
-            padding: 0;
-            border-top: 1px solid #EDEFF2;
-            border-bottom: 1px solid #EDEFF2;
-            background-color: #FFF;
-        }
-        .email-body_inner {
-            width: 570px;
-            margin: 0 auto;
-            padding: 0;
-        }
-        .email-footer {
-            width: 570px;
-            margin: 0 auto;
-            padding: 0;
-            text-align: center;
-        }
-        .email-footer p {
-            color: #AEAEAE;
-        }
-        .body-action {
-            width: 100%;
-            margin: 30px auto;
-            padding: 0;
-            text-align: center;
-        }
-        .body-sub {
-            margin-top: 25px;
-            padding-top: 25px;
-            border-top: 1px solid #EDEFF2;
-        }
-        .content-cell {
-            padding: 35px;
-        }
-        .align-right {
-            text-align: right;
-        }
+    'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
+    'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;',
+    'email-body_cell' => 'padding: 35px;',
 
-        /* Type ------------------------------ */
+    'email-footer' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
+    'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;',
 
-        h1 {
-            margin-top: 0;
-            color: #2F3133;
-            font-size: 19px;
-            font-weight: bold;
-            text-align: left;
-        }
-        h2 {
-            margin-top: 0;
-            color: #2F3133;
-            font-size: 16px;
-            font-weight: bold;
-            text-align: left;
-        }
-        h3 {
-            margin-top: 0;
-            color: #2F3133;
-            font-size: 14px;
-            font-weight: bold;
-            text-align: left;
-        }
-        p {
-            margin-top: 0;
-            color: #74787E;
-            font-size: 16px;
-            line-height: 1.5em;
-        }
-        p.sub {
-            font-size: 12px;
-        }
-        p.center {
-            text-align: center;
-        }
+    /* Body ------------------------------ */
 
-        /* Data table ------------------------------ */
+    'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;',
+    'body_sub' => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
 
-        .data-wrapper {
-            width: 100%;
-            margin: 0;
-            padding: 35px 0;
-        }
-        .data-table {
-            width: 100%;
-            margin: 0;
-        }
-        .data-table th {
-            text-align: left;
-            padding: 0px 5px;
-            padding-bottom: 8px;
-            border-bottom: 1px solid #EDEFF2;
-        }
-        .data-table th p {
-            margin: 0;
-            color: #9BA2AB;
-            font-size: 12px;
-        }
-        .data-table td {
-            padding: 10px 5px;
-            color: #74787E;
-            font-size: 15px;
-            line-height: 18px;
-        }
+    /* Type ------------------------------ */
 
-        /* Buttons ------------------------------ */
+    'anchor' => 'color: #3869D4;',
+    'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
+    'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
+    'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
+    'paragraph-center' => 'text-align: center;',
 
-        .button {
-            display: inline-block;
-            width: 200px;
-            background-color: #3869D4;
-            border-radius: 3px;
-            color: #ffffff;
-            font-size: 15px;
-            line-height: 45px;
-            text-align: center;
-            text-decoration: none;
-            -webkit-text-size-adjust: none;
-            mso-hide: all;
-        }
-        .button--green {
-            background-color: #22BC66;
-        }
-        .button--red {
-            background-color: #dc4d2f;
-        }
-        .button--blue {
-            background-color: #3869D4;
-        }
+    /* Buttons ------------------------------ */
 
-        /*Media Queries ------------------------------ */
+    'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px;
+                 background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
+                 text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
 
-        @media only screen and (max-width: 600px) {
-            .email-body_inner,
-            .email-footer {
-                width: 100% !important;
-            }
-        }
-        @media only screen and (max-width: 500px) {
-            .button {
-                width: 100% !important;
-            }
-        }
-    </style>
-</head>
+    'button--green' => 'background-color: #22BC66;',
+    'button--red' => 'background-color: #dc4d2f;',
+    'button--blue' => 'background-color: #3869D4;',
+];
+?>
+
+<?php $fontFamily = 'font-family: Arial, \'Helvetica Neue\', Helvetica, sans-serif;'; ?>
 
-<body>
-    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0">
+<body style="{{ $style['body'] }}">
+    <table width="100%" cellpadding="0" cellspacing="0">
         <tr>
-            <td align="center">
-                <table class="email-content" width="100%" cellpadding="0" cellspacing="0">
+            <td style="{{ $style['email-wrapper'] }}" align="center">
+                <table width="100%" cellpadding="0" cellspacing="0">
                     <!-- Logo -->
                     <tr>
-                        <td class="email-masthead">
-                            <a class="email-masthead_name" href="{{ url('/') }}" target="_blank">
-                                @if (isset($logoUrl))
-                                    <img src="{{ $logoUrl }}" class="email-logo" />
-                                @else
-                                    {{ $application }}
-                                @endif
+                        <td style="{{ $style['email-masthead'] }}">
+                            <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
+                                {{ config('app.name') }}
                             </a>
                         </td>
                     </tr>
 
                     <!-- Email Body -->
                     <tr>
-                        <td class="email-body" width="100%">
-                            <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+                        <td style="{{ $style['email-body'] }}" width="100%">
+                            <table style="{{ $style['email-body_inner'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
                                 <tr>
-                                    <td class="content-cell">
+                                    <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
                                         <!-- Greeting -->
-                                        <h1>
+                                        <h1 style="{{ $style['header-1'] }}">
                                             @if ($level == 'error')
                                                 Whoops!
                                             @else
@@ -244,21 +93,35 @@
 
                                         <!-- Intro -->
                                         @foreach ($introLines as $line)
-                                            <p>
+                                            <p style="{{ $style['paragraph'] }}">
                                                 {{ $line }}
                                             </p>
                                         @endforeach
 
                                         <!-- Action Button -->
                                         @if (isset($actionText))
-                                            <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
+                                            <table style="{{ $style['body_action'] }}" align="center" width="100%" cellpadding="0" cellspacing="0">
                                                 <tr>
                                                     <td align="center">
-                                                        <div>
-                                                            <a href="{{ $actionUrl }}" class="button button--{{ $actionColor }}" target="_blank">
-                                                                {{ $actionText }}
-                                                            </a>
-                                                        </div>
+                                                        <?php
+                                                            switch ($level) {
+                                                                case 'success':
+                                                                    $actionColor = 'button--green';
+                                                                    break;
+                                                                case 'error':
+                                                                    $actionColor = 'button--red';
+                                                                    break;
+                                                                default:
+                                                                    $actionColor = 'button--blue';
+                                                            }
+                                                        ?>
+
+                                                        <a href="{{ $actionUrl }}"
+                                                            style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
+                                                            class="button"
+                                                            target="_blank">
+                                                            {{ $actionText }}
+                                                        </a>
                                                     </td>
                                                 </tr>
                                             </table>
@@ -266,28 +129,28 @@
 
                                         <!-- Outro -->
                                         @foreach ($outroLines as $line)
-                                            <p>
+                                            <p style="{{ $style['paragraph'] }}">
                                                 {{ $line }}
                                             </p>
                                         @endforeach
 
                                         <!-- Salutation -->
-                                        <p>
-                                            Regards,<br>{{ $application }}
+                                        <p style="{{ $style['paragraph'] }}">
+                                            Regards,<br>{{ config('app.name') }}
                                         </p>
 
                                         <!-- Sub Copy -->
                                         @if (isset($actionText))
-                                            <table class="body-sub">
+                                            <table style="{{ $style['body_sub'] }}">
                                                 <tr>
-                                                    <td>
-                                                        <p class="sub">
+                                                    <td style="{{ $fontFamily }}">
+                                                        <p style="{{ $style['paragraph-sub'] }}">
                                                             If you’re having trouble clicking the "{{ $actionText }}" button,
                                                             copy and paste the URL below into your web browser:
                                                         </p>
 
-                                                        <p class="sub">
-                                                            <a href="{{ $actionUrl }}" target="_blank">
+                                                        <p style="{{ $style['paragraph-sub'] }}">
+                                                            <a style="{{ $style['anchor'] }}" href="{{ $actionUrl }}" target="_blank">
                                                                 {{ $actionUrl }}
                                                             </a>
                                                         </p>
@@ -304,12 +167,12 @@
                     <!-- Footer -->
                     <tr>
                         <td>
-                            <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
+                            <table style="{{ $style['email-footer'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
                                 <tr>
-                                    <td class="content-cell">
-                                        <p class="sub center">
+                                    <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
+                                        <p style="{{ $style['paragraph-sub'] }}">
                                             &copy; {{ date('Y') }}
-                                            <a href="{{ url('/') }}" target="_blank">{{ $application }}</a>.
+                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
                                             All rights reserved.
                                         </p>
                                     </td>
diff --git a/src/Illuminate/Pagination/AbstractPaginator.php b/src/Illuminate/Pagination/AbstractPaginator.php
index 8025bcd2dc61..c52a27776ca8 100644
--- a/src/Illuminate/Pagination/AbstractPaginator.php
+++ b/src/Illuminate/Pagination/AbstractPaginator.php
@@ -85,14 +85,14 @@ abstract class AbstractPaginator implements Htmlable
      *
      * @var string
      */
-    public static $defaultView = 'pagination::bootstrap-3';
+    public static $defaultView = 'pagination::default';
 
     /**
      * The default "simple" pagination view.
      *
      * @var string
      */
-    public static $defaultSimpleView = 'pagination::simple-bootstrap-3';
+    public static $defaultSimpleView = 'pagination::simple-default';
 
     /**
      * Determine if the given value is a valid page number.
@@ -563,7 +563,7 @@ public function toHtml()
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->getCollection(), $method], $parameters);
+        return $this->getCollection()->$method(...$parameters);
     }
 
     /**
diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json
index 9211f1ade95a..96a5af138a77 100755
--- a/src/Illuminate/Pagination/composer.json
+++ b/src/Illuminate/Pagination/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/pagination",
     "description": "The Illuminate Pagination package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Pagination/resources/views/bootstrap-3.blade.php b/src/Illuminate/Pagination/resources/views/default.blade.php
similarity index 100%
rename from src/Illuminate/Pagination/resources/views/bootstrap-3.blade.php
rename to src/Illuminate/Pagination/resources/views/default.blade.php
diff --git a/src/Illuminate/Pagination/resources/views/simple-bootstrap-3.blade.php b/src/Illuminate/Pagination/resources/views/simple-default.blade.php
similarity index 100%
rename from src/Illuminate/Pagination/resources/views/simple-bootstrap-3.blade.php
rename to src/Illuminate/Pagination/resources/views/simple-default.blade.php
diff --git a/src/Illuminate/Pipeline/Pipeline.php b/src/Illuminate/Pipeline/Pipeline.php
index d15c78a761b7..ffc0f6d896bd 100644
--- a/src/Illuminate/Pipeline/Pipeline.php
+++ b/src/Illuminate/Pipeline/Pipeline.php
@@ -97,11 +97,11 @@ public function then(Closure $destination)
     {
         $firstSlice = $this->getInitialSlice($destination);
 
-        $pipes = array_reverse($this->pipes);
-
-        return call_user_func(
-            array_reduce($pipes, $this->getSlice(), $firstSlice), $this->passable
+        $callable = array_reduce(
+            array_reverse($this->pipes), $this->getSlice(), $firstSlice
         );
+
+        return $callable($this->passable);
     }
 
     /**
@@ -117,7 +117,7 @@ protected function getSlice()
                     // If the pipe is an instance of a Closure, we will just call it directly but
                     // otherwise we'll resolve the pipes out of the container and call it with
                     // the appropriate method and arguments, returning the results back out.
-                    return call_user_func($pipe, $passable, $stack);
+                    return $pipe($passable, $stack);
                 } elseif (! is_object($pipe)) {
                     list($name, $parameters) = $this->parsePipeString($pipe);
 
@@ -134,7 +134,7 @@ protected function getSlice()
                     $parameters = [$passable, $stack];
                 }
 
-                return call_user_func_array([$pipe, $this->method], $parameters);
+                return $pipe->{$this->method}(...$parameters);
             };
         };
     }
@@ -148,7 +148,7 @@ protected function getSlice()
     protected function getInitialSlice(Closure $destination)
     {
         return function ($passable) use ($destination) {
-            return call_user_func($destination, $passable);
+            return $destination($passable);
         };
     }
 
diff --git a/src/Illuminate/Pipeline/composer.json b/src/Illuminate/Pipeline/composer.json
index 4d90531b1f21..65aff924ff9c 100644
--- a/src/Illuminate/Pipeline/composer.json
+++ b/src/Illuminate/Pipeline/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/pipeline",
     "description": "The Illuminate Pipeline package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Queue/BeanstalkdQueue.php b/src/Illuminate/Queue/BeanstalkdQueue.php
index ad090acdda3d..a4d1a949e88c 100755
--- a/src/Illuminate/Queue/BeanstalkdQueue.php
+++ b/src/Illuminate/Queue/BeanstalkdQueue.php
@@ -45,6 +45,19 @@ public function __construct(Pheanstalk $pheanstalk, $default, $timeToRun)
         $this->pheanstalk = $pheanstalk;
     }
 
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        $queue = $this->getQueue($queue);
+
+        return (int) $this->pheanstalk->statsTube($queue)->total_jobs;
+    }
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Queue/Capsule/Manager.php b/src/Illuminate/Queue/Capsule/Manager.php
index 179be60ea082..9c32fe3f818b 100644
--- a/src/Illuminate/Queue/Capsule/Manager.php
+++ b/src/Illuminate/Queue/Capsule/Manager.php
@@ -166,7 +166,7 @@ public function getQueueManager()
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->manager, $method], $parameters);
+        return $this->manager->$method(...$parameters);
     }
 
     /**
@@ -178,6 +178,6 @@ public function __call($method, $parameters)
      */
     public static function __callStatic($method, $parameters)
     {
-        return call_user_func_array([static::connection(), $method], $parameters);
+        return static::connection()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Queue/Connectors/RedisConnector.php b/src/Illuminate/Queue/Connectors/RedisConnector.php
index 24dc5f2623b9..384d2d082241 100644
--- a/src/Illuminate/Queue/Connectors/RedisConnector.php
+++ b/src/Illuminate/Queue/Connectors/RedisConnector.php
@@ -3,15 +3,15 @@
 namespace Illuminate\Queue\Connectors;
 
 use Illuminate\Support\Arr;
-use Illuminate\Redis\Database;
 use Illuminate\Queue\RedisQueue;
+use Illuminate\Contracts\Redis\Database;
 
 class RedisConnector implements ConnectorInterface
 {
     /**
      * The Redis database instance.
      *
-     * @var \Illuminate\Redis\Database
+     * @var \Illuminate\Contracts\Redis\Database
      */
     protected $redis;
 
@@ -25,7 +25,7 @@ class RedisConnector implements ConnectorInterface
     /**
      * Create a new Redis queue connector instance.
      *
-     * @param  \Illuminate\Redis\Database  $redis
+     * @param  \Illuminate\Contracts\Redis\Database  $redis
      * @param  string|null  $connection
      * @return void
      */
diff --git a/src/Illuminate/Queue/Console/WorkCommand.php b/src/Illuminate/Queue/Console/WorkCommand.php
index eb6714836b60..42cba1d4023b 100755
--- a/src/Illuminate/Queue/Console/WorkCommand.php
+++ b/src/Illuminate/Queue/Console/WorkCommand.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Queue\Console;
 
 use Carbon\Carbon;
+use RuntimeException;
 use Illuminate\Queue\Worker;
 use Illuminate\Console\Command;
 use Illuminate\Queue\WorkerOptions;
@@ -104,9 +105,15 @@ protected function runWorker($connection, $queue)
      */
     protected function gatherWorkerOptions()
     {
+        $timeout = $this->option('timeout', 60);
+
+        if ($timeout && ! function_exists('pcntl_fork')) {
+            throw new RuntimeException('The pcntl extension is required in order to specify job timeouts.');
+        }
+
         return new WorkerOptions(
             $this->option('delay'), $this->option('memory'),
-            $this->option('timeout', 60), $this->option('sleep'),
+            $timeout, $this->option('sleep'),
             $this->option('tries')
         );
     }
@@ -191,6 +198,8 @@ protected function getOptions()
         return [
             ['queue', null, InputOption::VALUE_OPTIONAL, 'The queue to listen on'],
 
+            ['daemon', null, InputOption::VALUE_NONE, 'Run the worker in daemon mode (Deprecated)'],
+
             ['once', null, InputOption::VALUE_NONE, 'Only process the next job on the queue'],
 
             ['delay', null, InputOption::VALUE_OPTIONAL, 'Amount of time to delay failed jobs', 0],
diff --git a/src/Illuminate/Queue/Console/stubs/failed_jobs.stub b/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
index 6abff5864832..faa6c362025e 100644
--- a/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
+++ b/src/Illuminate/Queue/Console/stubs/failed_jobs.stub
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
diff --git a/src/Illuminate/Queue/Console/stubs/jobs.stub b/src/Illuminate/Queue/Console/stubs/jobs.stub
index 5428ce97e456..fc36c80f82e4 100644
--- a/src/Illuminate/Queue/Console/stubs/jobs.stub
+++ b/src/Illuminate/Queue/Console/stubs/jobs.stub
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
index 46ef36deeb7c..d6298db5b482 100644
--- a/src/Illuminate/Queue/DatabaseQueue.php
+++ b/src/Illuminate/Queue/DatabaseQueue.php
@@ -55,6 +55,19 @@ public function __construct(Connection $database, $table, $default = 'default',
         $this->database = $database;
     }
 
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        return $this->database->table($this->table)
+                    ->where('queue', $this->getQueue($queue))
+                    ->count();
+    }
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Queue/Jobs/RedisJob.php b/src/Illuminate/Queue/Jobs/RedisJob.php
index 942aef1092ac..72c751f7df58 100644
--- a/src/Illuminate/Queue/Jobs/RedisJob.php
+++ b/src/Illuminate/Queue/Jobs/RedisJob.php
@@ -114,7 +114,7 @@ public function getJobId()
     /**
      * Get the underlying queue driver instance.
      *
-     * @return \Illuminate\Redis\Database
+     * @return \Illuminate\Contracts\Redis\Database
      */
     public function getRedisQueue()
     {
diff --git a/src/Illuminate/Queue/Listener.php b/src/Illuminate/Queue/Listener.php
index b19d46c4479d..5ab42b05b076 100755
--- a/src/Illuminate/Queue/Listener.php
+++ b/src/Illuminate/Queue/Listener.php
@@ -72,17 +72,9 @@ protected function buildWorkerCommand()
     {
         $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
 
-        if (defined('HHVM_VERSION')) {
-            $binary .= ' --php';
-        }
-
-        if (defined('ARTISAN_BINARY')) {
-            $artisan = ProcessUtils::escapeArgument(ARTISAN_BINARY);
-        } else {
-            $artisan = 'artisan';
-        }
+        $artisan = defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan';
 
-        $command = 'queue:work %s --queue=%s --delay=%s --memory=%s --sleep=%s --tries=%s';
+        $command = 'queue:work %s --once --queue=%s --delay=%s --memory=%s --sleep=%s --tries=%s';
 
         return "{$binary} {$artisan} {$command}";
     }
diff --git a/src/Illuminate/Queue/LuaScripts.php b/src/Illuminate/Queue/LuaScripts.php
index 8aa942e005ed..2006bc7aeb24 100644
--- a/src/Illuminate/Queue/LuaScripts.php
+++ b/src/Illuminate/Queue/LuaScripts.php
@@ -18,7 +18,7 @@ public static function pop()
     reserved = cjson.decode(job)
     reserved['attempts'] = reserved['attempts'] + 1
     reserved = cjson.encode(reserved)
-    redis.call('zadd', KEYS[2], KEYS[3], reserved)
+    redis.call('zadd', KEYS[2], ARGV[1], reserved)
 end
 return {job, reserved}
 LUA;
@@ -32,8 +32,8 @@ public static function pop()
     public static function release()
     {
         return <<<'LUA'
-redis.call('zrem', KEYS[2], KEYS[3])
-redis.call('zadd', KEYS[1], KEYS[4], KEYS[3])
+redis.call('zrem', KEYS[2], ARGV[1])
+redis.call('zadd', KEYS[1], ARGV[2], ARGV[1])
 return true
 LUA;
     }
@@ -46,7 +46,7 @@ public static function release()
     public static function migrateExpiredJobs()
     {
         return <<<'LUA'
-local val = redis.call('zrangebyscore', KEYS[1], '-inf', KEYS[3])
+local val = redis.call('zrangebyscore', KEYS[1], '-inf', ARGV[1])
 if(next(val) ~= nil) then
     redis.call('zremrangebyrank', KEYS[1], 0, #val - 1)
     for i = 1, #val, 100 do
@@ -54,6 +54,18 @@ public static function migrateExpiredJobs()
     end
 end
 return true
+LUA;
+    }
+
+    /**
+     * Get the Lua script for computing the size of queue.
+     *
+     * @return string
+     */
+    public static function size()
+    {
+        return <<<'LUA'
+return redis.call('llen', KEYS[1]) + redis.call('zcard', KEYS[2]) + redis.call('zcard', KEYS[3])
 LUA;
     }
 }
diff --git a/src/Illuminate/Queue/NullQueue.php b/src/Illuminate/Queue/NullQueue.php
index bdef6cc4c05c..a42b8ce9b05b 100644
--- a/src/Illuminate/Queue/NullQueue.php
+++ b/src/Illuminate/Queue/NullQueue.php
@@ -6,6 +6,17 @@
 
 class NullQueue extends Queue implements QueueContract
 {
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        return 0;
+    }
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Queue/QueueManager.php b/src/Illuminate/Queue/QueueManager.php
index 4fb0c397e285..3be3309f5def 100755
--- a/src/Illuminate/Queue/QueueManager.php
+++ b/src/Illuminate/Queue/QueueManager.php
@@ -260,8 +260,6 @@ public function isDownForMaintenance()
      */
     public function __call($method, $parameters)
     {
-        $callable = [$this->connection(), $method];
-
-        return call_user_func_array($callable, $parameters);
+        return $this->connection()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Queue/README.md b/src/Illuminate/Queue/README.md
index e6a715bc8511..d0f2ba4af0be 100644
--- a/src/Illuminate/Queue/README.md
+++ b/src/Illuminate/Queue/README.md
@@ -31,4 +31,4 @@ $queue->push('SendEmail', array('message' => $message));
 Queue::push('SendEmail', array('message' => $message));
 ```
 
-For further documentation on using the queue, consult the [Laravel framework documentation](http://laravel.com/docs).
+For further documentation on using the queue, consult the [Laravel framework documentation](https://laravel.com/docs).
diff --git a/src/Illuminate/Queue/RedisQueue.php b/src/Illuminate/Queue/RedisQueue.php
index 54d567490cd2..249ac90c147f 100644
--- a/src/Illuminate/Queue/RedisQueue.php
+++ b/src/Illuminate/Queue/RedisQueue.php
@@ -4,8 +4,8 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Illuminate\Redis\Database;
 use Illuminate\Queue\Jobs\RedisJob;
+use Illuminate\Contracts\Redis\Database;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 
 class RedisQueue extends Queue implements QueueContract
@@ -13,7 +13,7 @@ class RedisQueue extends Queue implements QueueContract
     /**
      * The Redis database instance.
      *
-     * @var \Illuminate\Redis\Database
+     * @var \Illuminate\Contracts\Redis\Database
      */
     protected $redis;
 
@@ -41,7 +41,7 @@ class RedisQueue extends Queue implements QueueContract
     /**
      * Create a new Redis queue instance.
      *
-     * @param  \Illuminate\Redis\Database  $redis
+     * @param  \Illuminate\Contracts\Redis\Database  $redis
      * @param  string  $default
      * @param  string  $connection
      * @param  int  $expire
@@ -56,6 +56,19 @@ public function __construct(Database $redis, $default = 'default',
         $this->connection = $connection;
     }
 
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        $queue = $this->getQueue($queue);
+
+        return $this->getConnection()->eval(LuaScripts::size(), 3, $queue, $queue.':delayed', $queue.':reserved');
+    }
+
     /**
      * Push a new job onto the queue.
      *
@@ -123,7 +136,7 @@ public function pop($queue = null)
         }
 
         list($job, $reserved) = $this->getConnection()->eval(
-            LuaScripts::pop(), 3, $queue, $queue.':reserved', $this->getTime() + $this->expire
+            LuaScripts::pop(), 2, $queue, $queue.':reserved', $this->getTime() + $this->expire
         );
 
         if ($reserved) {
@@ -156,7 +169,7 @@ public function deleteAndRelease($queue, $job, $delay)
         $queue = $this->getQueue($queue);
 
         $this->getConnection()->eval(
-            LuaScripts::release(), 4, $queue.':delayed', $queue.':reserved',
+            LuaScripts::release(), 2, $queue.':delayed', $queue.':reserved',
             $job, $this->getTime() + $delay
         );
     }
@@ -171,7 +184,7 @@ public function deleteAndRelease($queue, $job, $delay)
     public function migrateExpiredJobs($from, $to)
     {
         $this->getConnection()->eval(
-            LuaScripts::migrateExpiredJobs(), 3, $from, $to, $this->getTime()
+            LuaScripts::migrateExpiredJobs(), 2, $from, $to, $this->getTime()
         );
     }
 
@@ -226,7 +239,7 @@ protected function getConnection()
     /**
      * Get the underlying Redis instance.
      *
-     * @return \Illuminate\Redis\Database
+     * @return \Illuminate\Contracts\Redis\Database
      */
     public function getRedis()
     {
diff --git a/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php b/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
new file mode 100644
index 000000000000..7a301c7dae13
--- /dev/null
+++ b/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Illuminate\Queue;
+
+use Illuminate\Contracts\Queue\QueueableEntity;
+use Illuminate\Contracts\Database\ModelIdentifier;
+use Illuminate\Contracts\Queue\QueueableCollection;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+
+trait SerializesAndRestoresModelIdentifiers
+{
+    /**
+     * Get the property value prepared for serialization.
+     *
+     * @param  mixed  $value
+     * @return mixed
+     */
+    protected function getSerializedPropertyValue($value)
+    {
+        if ($value instanceof QueueableCollection) {
+            return new ModelIdentifier($value->getQueueableClass(), $value->getQueueableIds());
+        }
+
+        if ($value instanceof QueueableEntity) {
+            return new ModelIdentifier(get_class($value), $value->getQueueableId());
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get the restored property value after deserialization.
+     *
+     * @param  mixed  $value
+     * @return mixed
+     */
+    protected function getRestoredPropertyValue($value)
+    {
+        if (! $value instanceof ModelIdentifier) {
+            return $value;
+        }
+
+        return is_array($value->id)
+                ? $this->restoreCollection($value)
+                : (new $value->class)->newQuery()->useWritePdo()->findOrFail($value->id);
+    }
+
+    /**
+     * Restore a queueable collection instance.
+     *
+     * @param  \Illuminate\Contracts\Database\ModelIdentifier  $value
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    protected function restoreCollection($value)
+    {
+        if (! $value->class || count($value->id) === 0) {
+            return new EloquentCollection;
+        }
+
+        $model = new $value->class;
+
+        return $model->newQuery()->useWritePdo()
+                    ->whereIn($model->getKeyName(), $value->id)->get();
+    }
+}
diff --git a/src/Illuminate/Queue/SerializesModels.php b/src/Illuminate/Queue/SerializesModels.php
index 9630f1022cc7..62f7e7218e9a 100644
--- a/src/Illuminate/Queue/SerializesModels.php
+++ b/src/Illuminate/Queue/SerializesModels.php
@@ -4,13 +4,11 @@
 
 use ReflectionClass;
 use ReflectionProperty;
-use Illuminate\Contracts\Queue\QueueableEntity;
-use Illuminate\Contracts\Database\ModelIdentifier;
-use Illuminate\Contracts\Queue\QueueableCollection;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 
 trait SerializesModels
 {
+    use SerializesAndRestoresModelIdentifiers;
+
     /**
      * Prepare the instance for serialization.
      *
@@ -45,60 +43,6 @@ public function __wakeup()
         }
     }
 
-    /**
-     * Get the property value prepared for serialization.
-     *
-     * @param  mixed  $value
-     * @return mixed
-     */
-    protected function getSerializedPropertyValue($value)
-    {
-        if ($value instanceof QueueableCollection) {
-            return new ModelIdentifier($value->getQueueableClass(), $value->getQueueableIds());
-        }
-
-        if ($value instanceof QueueableEntity) {
-            return new ModelIdentifier(get_class($value), $value->getQueueableId());
-        }
-
-        return $value;
-    }
-
-    /**
-     * Get the restored property value after deserialization.
-     *
-     * @param  mixed  $value
-     * @return mixed
-     */
-    protected function getRestoredPropertyValue($value)
-    {
-        if (! $value instanceof ModelIdentifier) {
-            return $value;
-        }
-
-        return is_array($value->id)
-                ? $this->restoreCollection($value)
-                : (new $value->class)->newQuery()->useWritePdo()->findOrFail($value->id);
-    }
-
-    /**
-     * Restore a queueable collection instance.
-     *
-     * @param  \Illuminate\Contracts\Database\ModelIdentifier  $value
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    protected function restoreCollection($value)
-    {
-        if (! $value->class || count($value->id) === 0) {
-            return new EloquentCollection;
-        }
-
-        $model = new $value->class;
-
-        return $model->newQuery()->useWritePdo()
-                    ->whereIn($model->getKeyName(), $value->id)->get();
-    }
-
     /**
      * Get the property value for the given property.
      *
diff --git a/src/Illuminate/Queue/SqsQueue.php b/src/Illuminate/Queue/SqsQueue.php
index 791b323be2a6..f7add815ce2e 100755
--- a/src/Illuminate/Queue/SqsQueue.php
+++ b/src/Illuminate/Queue/SqsQueue.php
@@ -44,6 +44,19 @@ public function __construct(SqsClient $sqs, $default, $prefix = '')
         $this->default = $default;
     }
 
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        return (int) $this->sqs->getQueueAttributes([
+            'QueueUrl' => $this->getQueue($queue),
+        ])->get('ApproximateNumberOfMessages');
+    }
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Queue/SyncQueue.php b/src/Illuminate/Queue/SyncQueue.php
index fac46a002946..75b023abbbe2 100755
--- a/src/Illuminate/Queue/SyncQueue.php
+++ b/src/Illuminate/Queue/SyncQueue.php
@@ -11,6 +11,17 @@
 
 class SyncQueue extends Queue implements QueueContract
 {
+    /**
+     * Get the size of the queue.
+     *
+     * @param  string  $queue
+     * @return int
+     */
+    public function size($queue = null)
+    {
+        return 0;
+    }
+
     /**
      * Push a new job onto the queue.
      *
diff --git a/src/Illuminate/Queue/TimeoutException.php b/src/Illuminate/Queue/TimeoutException.php
new file mode 100644
index 000000000000..1fe5e1e57985
--- /dev/null
+++ b/src/Illuminate/Queue/TimeoutException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\Queue;
+
+use RuntimeException;
+
+class TimeoutException extends RuntimeException
+{
+    //
+}
diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
index 537b5e8f4232..68ba9bd29ef8 100644
--- a/src/Illuminate/Queue/Worker.php
+++ b/src/Illuminate/Queue/Worker.php
@@ -103,7 +103,9 @@ protected function daemonShouldRun()
      */
     protected function runNextJobForDaemon($connectionName, $queue, WorkerOptions $options)
     {
-        if ($processId = pcntl_fork()) {
+        if (! $options->timeout) {
+            $this->runNextJob($connectionName, $queue, $options);
+        } elseif ($processId = pcntl_fork()) {
             $this->waitForChildProcess($processId, $options->timeout);
         } else {
             $this->runNextJob($connectionName, $queue, $options);
@@ -122,10 +124,10 @@ protected function runNextJobForDaemon($connectionName, $queue, WorkerOptions $o
     protected function waitForChildProcess($processId, $timeout)
     {
         declare(ticks=1) {
-            pcntl_signal(SIGALRM, function () use ($processId) {
+            pcntl_signal(SIGALRM, function () use ($processId, $timeout) {
                 posix_kill($processId, SIGKILL);
 
-                $this->exceptions->report(new Exception('Queue child process timed out.'));
+                $this->exceptions->report(new TimeoutException("Queue child process timed out after {$timeout} seconds."));
             }, true);
 
             pcntl_alarm($timeout);
diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json
index 0516bed51e18..18ee3ccab332 100644
--- a/src/Illuminate/Queue/composer.json
+++ b/src/Illuminate/Queue/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/queue",
     "description": "The Illuminate Queue package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Redis/Database.php b/src/Illuminate/Redis/Database.php
index 437427b17d23..006c27ef8ee3 100755
--- a/src/Illuminate/Redis/Database.php
+++ b/src/Illuminate/Redis/Database.php
@@ -2,69 +2,11 @@
 
 namespace Illuminate\Redis;
 
-use Closure;
-use Predis\Client;
 use Illuminate\Support\Arr;
 use Illuminate\Contracts\Redis\Database as DatabaseContract;
 
-class Database implements DatabaseContract
+abstract class Database implements DatabaseContract
 {
-    /**
-     * The host address of the database.
-     *
-     * @var array
-     */
-    protected $clients;
-
-    /**
-     * Create a new Redis connection instance.
-     *
-     * @param  array  $servers
-     * @return void
-     */
-    public function __construct(array $servers = [])
-    {
-        $cluster = Arr::pull($servers, 'cluster');
-
-        $options = (array) Arr::pull($servers, 'options');
-
-        if ($cluster) {
-            $this->clients = $this->createAggregateClient($servers, $options);
-        } else {
-            $this->clients = $this->createSingleClients($servers, $options);
-        }
-    }
-
-    /**
-     * Create a new aggregate client supporting sharding.
-     *
-     * @param  array  $servers
-     * @param  array  $options
-     * @return array
-     */
-    protected function createAggregateClient(array $servers, array $options = [])
-    {
-        return ['default' => new Client(array_values($servers), $options)];
-    }
-
-    /**
-     * Create an array of single connection clients.
-     *
-     * @param  array  $servers
-     * @param  array  $options
-     * @return array
-     */
-    protected function createSingleClients(array $servers, array $options = [])
-    {
-        $clients = [];
-
-        foreach ($servers as $key => $server) {
-            $clients[$key] = new Client($server, $options);
-        }
-
-        return $clients;
-    }
-
     /**
      * Get a specific Redis connection instance.
      *
@@ -88,43 +30,6 @@ public function command($method, array $parameters = [])
         return call_user_func_array([$this->clients['default'], $method], $parameters);
     }
 
-    /**
-     * Subscribe to a set of given channels for messages.
-     *
-     * @param  array|string  $channels
-     * @param  \Closure  $callback
-     * @param  string  $connection
-     * @param  string  $method
-     * @return void
-     */
-    public function subscribe($channels, Closure $callback, $connection = null, $method = 'subscribe')
-    {
-        $loop = $this->connection($connection)->pubSubLoop();
-
-        call_user_func_array([$loop, $method], (array) $channels);
-
-        foreach ($loop as $message) {
-            if ($message->kind === 'message' || $message->kind === 'pmessage') {
-                call_user_func($callback, $message->payload, $message->channel);
-            }
-        }
-
-        unset($loop);
-    }
-
-    /**
-     * Subscribe to a set of given channels with wildcards.
-     *
-     * @param  array|string  $channels
-     * @param  \Closure  $callback
-     * @param  string  $connection
-     * @return void
-     */
-    public function psubscribe($channels, Closure $callback, $connection = null)
-    {
-        return $this->subscribe($channels, $callback, $connection, __FUNCTION__);
-    }
-
     /**
      * Dynamically make a Redis command.
      *
diff --git a/src/Illuminate/Redis/PhpRedisDatabase.php b/src/Illuminate/Redis/PhpRedisDatabase.php
new file mode 100644
index 000000000000..9c60a8767f90
--- /dev/null
+++ b/src/Illuminate/Redis/PhpRedisDatabase.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Illuminate\Redis;
+
+use Redis;
+use Closure;
+use RedisCluster;
+use Illuminate\Support\Arr;
+
+class PhpRedisDatabase extends Database
+{
+    /**
+     * The host address of the database.
+     *
+     * @var array
+     */
+    protected $clients;
+
+    /**
+     * Create a new Redis connection instance.
+     *
+     * @param  array  $servers
+     * @return void
+     */
+    public function __construct(array $servers = [])
+    {
+        $cluster = Arr::pull($servers, 'cluster');
+
+        $options = (array) Arr::pull($servers, 'options');
+
+        if ($cluster) {
+            $this->clients = $this->createAggregateClient($servers, $options);
+        } else {
+            $this->clients = $this->createSingleClients($servers, $options);
+        }
+    }
+
+    /**
+     * Create a new aggregate client supporting sharding.
+     *
+     * @param  array  $servers
+     * @param  array  $options
+     * @return array
+     */
+    protected function createAggregateClient(array $servers, array $options = [])
+    {
+        $servers = array_map([$this, 'buildClusterSeed'], $servers);
+
+        $timeout = empty($options['timeout']) ? 0 : $options['timeout'];
+        $readTimeout = empty($options['read_write_timeout']) ? 0 : $options['read_write_timeout'];
+        $persistent = isset($options['persistent']) && $options['persistent'];
+
+        return ['default' => new RedisCluster(
+            null, array_values($servers), $timeout, $readTimeout, $persistent
+        )];
+    }
+
+    /**
+     * Create an array of single connection clients.
+     *
+     * @param  array  $servers
+     * @param  array  $options
+     * @return array
+     */
+    protected function createSingleClients(array $servers, array $options = [])
+    {
+        $clients = [];
+
+        foreach ($servers as $key => $server) {
+            $client = new Redis;
+
+            $timeout = empty($server['timeout']) ? 0 : $server['timeout'];
+
+            if (isset($server['persistent']) && $server['persistent']) {
+                $client->pconnect($server['host'], $server['port'], $timeout);
+            } else {
+                $client->connect($server['host'], $server['port'], $timeout);
+            }
+
+            if (! empty($server['prefix'])) {
+                $client->setOption(Redis::OPT_PREFIX, $server['prefix']);
+            }
+
+            if (! empty($server['read_write_timeout'])) {
+                $client->setOption(Redis::OPT_READ_TIMEOUT, $server['read_write_timeout']);
+            }
+
+            if (! empty($server['password'])) {
+                $client->auth($server['password']);
+            }
+
+            if (! empty($server['database'])) {
+                $client->select($server['database']);
+            }
+
+            $clients[$key] = $client;
+        }
+
+        return $clients;
+    }
+
+    /**
+     * Build a single cluster seed string from array.
+     *
+     * @param  array  $server
+     * @return string
+     */
+    protected function buildClusterSeed(array $server)
+    {
+        $parameters = [];
+
+        if (! empty($server['database'])) {
+            $parameters['database'] = $server['database'];
+        }
+
+        if (! empty($server['password'])) {
+            $parameters['auth'] = $server['password'];
+        }
+
+        if (! empty($server['prefix'])) {
+            $parameters['prefix'] = $server['prefix'];
+        }
+
+        if (! empty($server['timeout'])) {
+            $parameters['timeout'] = $server['timeout'];
+        }
+
+        if (! empty($server['read_write_timeout'])) {
+            $parameters['read_timeout'] = $server['read_write_timeout'];
+        }
+
+        return $server['host'].':'.$server['port'].'?'.http_build_query($parameters);
+    }
+
+    /**
+     * Subscribe to a set of given channels for messages.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @param  string  $connection
+     * @param  string  $method
+     * @return void
+     */
+    public function subscribe($channels, Closure $callback, $connection = null, $method = 'subscribe')
+    {
+        call_user_func_array([$this->connection($connection), $method], (array) $channels, $callback);
+    }
+
+    /**
+     * Subscribe to a set of given channels with wildcards.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @param  string  $connection
+     * @return void
+     */
+    public function psubscribe($channels, Closure $callback, $connection = null)
+    {
+        $this->psubscribe($channels, $callback, $connection, __FUNCTION__);
+    }
+}
diff --git a/src/Illuminate/Redis/PredisDatabase.php b/src/Illuminate/Redis/PredisDatabase.php
new file mode 100644
index 000000000000..4580b3d1f09b
--- /dev/null
+++ b/src/Illuminate/Redis/PredisDatabase.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Illuminate\Redis;
+
+use Closure;
+use Predis\Client;
+use Illuminate\Support\Arr;
+
+class PredisDatabase extends Database
+{
+    /**
+     * The host address of the database.
+     *
+     * @var array
+     */
+    protected $clients;
+
+    /**
+     * Create a new Redis connection instance.
+     *
+     * @param  array  $servers
+     * @return void
+     */
+    public function __construct(array $servers = [])
+    {
+        $cluster = Arr::pull($servers, 'cluster');
+
+        $options = array_merge(['timeout' => 10.0], (array) Arr::pull($servers, 'options'));
+
+        if ($cluster) {
+            $this->clients = $this->createAggregateClient($servers, $options);
+        } else {
+            $this->clients = $this->createSingleClients($servers, $options);
+        }
+    }
+
+    /**
+     * Create a new aggregate client supporting sharding.
+     *
+     * @param  array  $servers
+     * @param  array  $options
+     * @return array
+     */
+    protected function createAggregateClient(array $servers, array $options = [])
+    {
+        return ['default' => new Client(array_values($servers), $options)];
+    }
+
+    /**
+     * Create an array of single connection clients.
+     *
+     * @param  array  $servers
+     * @param  array  $options
+     * @return array
+     */
+    protected function createSingleClients(array $servers, array $options = [])
+    {
+        $clients = [];
+
+        foreach ($servers as $key => $server) {
+            $clients[$key] = new Client($server, $options);
+        }
+
+        return $clients;
+    }
+
+    /**
+     * Subscribe to a set of given channels for messages.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @param  string  $connection
+     * @param  string  $method
+     * @return void
+     */
+    public function subscribe($channels, Closure $callback, $connection = null, $method = 'subscribe')
+    {
+        $loop = $this->connection($connection)->pubSubLoop();
+
+        call_user_func_array([$loop, $method], (array) $channels);
+
+        foreach ($loop as $message) {
+            if ($message->kind === 'message' || $message->kind === 'pmessage') {
+                call_user_func($callback, $message->payload, $message->channel);
+            }
+        }
+
+        unset($loop);
+    }
+
+    /**
+     * Subscribe to a set of given channels with wildcards.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @param  string  $connection
+     * @return void
+     */
+    public function psubscribe($channels, Closure $callback, $connection = null)
+    {
+        $this->subscribe($channels, $callback, $connection, __FUNCTION__);
+    }
+}
diff --git a/src/Illuminate/Redis/RedisServiceProvider.php b/src/Illuminate/Redis/RedisServiceProvider.php
index 78e1cc1d830b..750ec26d8806 100755
--- a/src/Illuminate/Redis/RedisServiceProvider.php
+++ b/src/Illuminate/Redis/RedisServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Redis;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 
 class RedisServiceProvider extends ServiceProvider
@@ -21,7 +22,14 @@ class RedisServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('redis', function ($app) {
-            return new Database($app['config']['database.redis']);
+            $servers = $app['config']['database.redis'];
+            $client = Arr::pull($servers, 'client');
+
+            if ($client === 'phpredis') {
+                return new PhpRedisDatabase($servers);
+            }
+
+            return new PredisDatabase($servers);
         });
     }
 
diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json
index 120b16fea298..c06b4b10bf1d 100755
--- a/src/Illuminate/Redis/composer.json
+++ b/src/Illuminate/Redis/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/redis",
     "description": "The Illuminate Redis package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Routing/Pipeline.php b/src/Illuminate/Routing/Pipeline.php
index 1d928c7b0b93..665be660f63e 100644
--- a/src/Illuminate/Routing/Pipeline.php
+++ b/src/Illuminate/Routing/Pipeline.php
@@ -28,8 +28,9 @@ protected function getSlice()
             return function ($passable) use ($stack, $pipe) {
                 try {
                     $slice = parent::getSlice();
+                    $callable = $slice($stack, $pipe);
 
-                    return call_user_func($slice($stack, $pipe), $passable);
+                    return $callable($passable);
                 } catch (Exception $e) {
                     return $this->handleException($passable, $e);
                 } catch (Throwable $e) {
@@ -49,7 +50,7 @@ protected function getInitialSlice(Closure $destination)
     {
         return function ($passable) use ($destination) {
             try {
-                return call_user_func($destination, $passable);
+                return $destination($passable);
             } catch (Exception $e) {
                 return $this->handleException($passable, $e);
             } catch (Throwable $e) {
diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
index 1858bd30514d..a1666b2b96b2 100644
--- a/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -354,7 +354,7 @@ protected function addResourceEdit($name, $base, $controller, $options)
      * @param  string  $base
      * @param  string  $controller
      * @param  array   $options
-     * @return void
+     * @return \Illuminate\Routing\Route
      */
     protected function addResourceUpdate($name, $base, $controller, $options)
     {
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
index 2a25a891cba2..7d40afa48858 100755
--- a/src/Illuminate/Routing/Route.php
+++ b/src/Illuminate/Routing/Route.php
@@ -171,7 +171,9 @@ protected function runCallable()
             $this->parametersWithoutNulls(), new ReflectionFunction($this->action['uses'])
         );
 
-        return call_user_func_array($this->action['uses'], $parameters);
+        $callable = $this->action['uses'];
+
+        return $callable(...array_values($parameters));
     }
 
     /**
diff --git a/src/Illuminate/Routing/RouteCollection.php b/src/Illuminate/Routing/RouteCollection.php
index 313a0815d423..101befa6fd23 100644
--- a/src/Illuminate/Routing/RouteCollection.php
+++ b/src/Illuminate/Routing/RouteCollection.php
@@ -192,7 +192,7 @@ protected function checkForAlternateVerbs($request)
      * @param  array  $methods
      * @return \Illuminate\Routing\Route
      *
-     * @throws \Symfony\Component\Routing\Exception\MethodNotAllowedHttpException
+     * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      */
     protected function getRouteForMethods($request, array $methods)
     {
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
index 5154dcd9bec7..a56af31be4d8 100755
--- a/src/Illuminate/Routing/UrlGenerator.php
+++ b/src/Illuminate/Routing/UrlGenerator.php
@@ -483,9 +483,7 @@ protected function getRouteQueryString(array $parameters)
      */
     protected function getStringParameters(array $parameters)
     {
-        return Arr::where($parameters, function ($v, $k) {
-            return is_string($k);
-        });
+        return array_filter($parameters, 'is_string', ARRAY_FILTER_USE_KEY);
     }
 
     /**
@@ -496,9 +494,7 @@ protected function getStringParameters(array $parameters)
      */
     protected function getNumericParameters(array $parameters)
     {
-        return Arr::where($parameters, function ($v, $k) {
-            return is_numeric($k);
-        });
+        return array_filter($parameters, 'is_numeric', ARRAY_FILTER_USE_KEY);
     }
 
     /**
diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json
index 98758dbea197..2f98fce18212 100644
--- a/src/Illuminate/Routing/composer.json
+++ b/src/Illuminate/Routing/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/routing",
     "description": "The Illuminate Routing package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Session/Console/stubs/database.stub b/src/Illuminate/Session/Console/stubs/database.stub
index f1c84aa4b85a..b055c675b3d1 100755
--- a/src/Illuminate/Session/Console/stubs/database.stub
+++ b/src/Illuminate/Session/Console/stubs/database.stub
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json
index 1ed3116ece51..8fcbc6d9574e 100755
--- a/src/Illuminate/Session/composer.json
+++ b/src/Illuminate/Session/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/session",
     "description": "The Illuminate Session package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
index 074f48ff232a..4af77f675a08 100755
--- a/src/Illuminate/Support/Arr.php
+++ b/src/Illuminate/Support/Arr.php
@@ -263,31 +263,37 @@ public static function get($array, $key, $default = null)
     }
 
     /**
-     * Check if an item exists in an array using "dot" notation.
+     * Check if an item or items exist in an array using "dot" notation.
      *
      * @param  \ArrayAccess|array  $array
-     * @param  string  $key
+     * @param  string|array  $keys
      * @return bool
      */
-    public static function has($array, $key)
+    public static function has($array, $keys)
     {
-        if (! $array) {
+        if (is_null($keys)) {
             return false;
         }
 
-        if (is_null($key)) {
+        $keys = (array) $keys;
+
+        if (! $array) {
             return false;
         }
 
-        if (static::exists($array, $key)) {
-            return true;
+        if ($keys === []) {
+            return false;
         }
 
-        foreach (explode('.', $key) as $segment) {
-            if (static::accessible($array) && static::exists($array, $segment)) {
-                $array = $array[$segment];
-            } else {
-                return false;
+        foreach ($keys as $key) {
+            $subKeyArray = $array;
+
+            foreach (explode('.', $key) as $segment) {
+                if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
+                    $subKeyArray = $subKeyArray[$segment];
+                } else {
+                    return false;
+                }
             }
         }
 
@@ -485,14 +491,6 @@ public static function sortRecursive($array)
      */
     public static function where($array, callable $callback)
     {
-        $filtered = [];
-
-        foreach ($array as $key => $value) {
-            if (call_user_func($callback, $value, $key)) {
-                $filtered[$key] = $value;
-            }
-        }
-
-        return $filtered;
+        return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
     }
 }
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
index b9bc47d6702e..c12ab79c408f 100644
--- a/src/Illuminate/Support/Collection.php
+++ b/src/Illuminate/Support/Collection.php
@@ -4,6 +4,7 @@
 
 use Countable;
 use ArrayAccess;
+use Traversable;
 use ArrayIterator;
 use CachingIterator;
 use JsonSerializable;
@@ -171,6 +172,28 @@ public function contains($key, $value = null)
         return in_array($key, $this->items);
     }
 
+    /**
+     * Determine if an item exists in the collection using strict comparison.
+     *
+     * @param  mixed  $key
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function containsStrict($key, $value = null)
+    {
+        if (func_num_args() == 2) {
+            return $this->contains(function ($item) use ($key, $value) {
+                return data_get($item, $key) === $value;
+            });
+        }
+
+        if ($this->useAsCallable($key)) {
+            return ! is_null($this->first($key));
+        }
+
+        return in_array($key, $this->items, true);
+    }
+
     /**
      * Get the items in the collection that are not present in the given items.
      *
@@ -256,15 +279,7 @@ public function except($keys)
     public function filter(callable $callback = null)
     {
         if ($callback) {
-            $return = [];
-
-            foreach ($this->items as $key => $value) {
-                if ($callback($value, $key)) {
-                    $return[$key] = $value;
-                }
-            }
-
-            return new static($return);
+            return new static(Arr::where($this->items, $callback));
         }
 
         return new static(array_filter($this->items));
@@ -318,6 +333,18 @@ protected function operatorForWhere($key, $operator, $value)
         };
     }
 
+    /**
+     * Filter items by the given key value pair using strict comparison.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     * @return static
+     */
+    public function whereStrict($key, $value)
+    {
+        return $this->where($key, '===', $value);
+    }
+
     /**
      * Filter items by the given key value pair.
      *
@@ -572,6 +599,19 @@ public function map(callable $callback)
         return new static(array_combine($keys, $items));
     }
 
+    /**
+     * Run an associative map over each of the items.
+     *
+     * The callback should return an associative array with a single key/value pair.
+     *
+     * @param  callable  $callback
+     * @return static
+     */
+    public function mapToAssoc(callable $callback)
+    {
+        return $this->flatMap($callback);
+    }
+
     /**
      * Map a collection and flatten the result by a single level.
      *
@@ -1032,9 +1072,11 @@ public function transform(callable $callback)
      * Return only unique items from the collection array.
      *
      * @param  string|callable|null  $key
+     * @param  bool  $strict
+     *
      * @return static
      */
-    public function unique($key = null)
+    public function unique($key = null, $strict = false)
     {
         if (is_null($key)) {
             return new static(array_unique($this->items, SORT_REGULAR));
@@ -1044,8 +1086,8 @@ public function unique($key = null)
 
         $exists = [];
 
-        return $this->reject(function ($item) use ($key, &$exists) {
-            if (in_array($id = $key($item), $exists)) {
+        return $this->reject(function ($item) use ($key, $strict, &$exists) {
+            if (in_array($id = $key($item), $exists, $strict)) {
                 return true;
             }
 
@@ -1053,6 +1095,17 @@ public function unique($key = null)
         });
     }
 
+    /**
+     * Return only unique items from the collection array using strict comparison.
+     *
+     * @param  string|callable|null  $key
+     * @return static
+     */
+    public function uniqueStrict($key = null)
+    {
+        return $this->unique($key, true);
+    }
+
     /**
      * Reset the keys on the underlying array.
      *
@@ -1176,6 +1229,16 @@ public function count()
         return count($this->items);
     }
 
+    /**
+     * Get a base Support collection instance from this collection.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function toBase()
+    {
+        return is_subclass_of($this, self::class) ? new self($this) : $this;
+    }
+
     /**
      * Determine if an item exists at an offset.
      *
@@ -1253,6 +1316,8 @@ protected function getArrayableItems($items)
             return json_decode($items->toJson(), true);
         } elseif ($items instanceof JsonSerializable) {
             return $items->jsonSerialize();
+        } elseif ($items instanceof Traversable) {
+            return iterator_to_array($items);
         }
 
         return (array) $items;
diff --git a/src/Illuminate/Support/Composer.php b/src/Illuminate/Support/Composer.php
index 50bed398a136..11ce9caabe38 100644
--- a/src/Illuminate/Support/Composer.php
+++ b/src/Illuminate/Support/Composer.php
@@ -74,10 +74,6 @@ protected function findComposer()
 
         $binary = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false));
 
-        if (defined('HHVM_VERSION')) {
-            $binary .= ' --php';
-        }
-
         return "{$binary} composer.phar";
     }
 
diff --git a/src/Illuminate/Support/Facades/Redis.php b/src/Illuminate/Support/Facades/Redis.php
index 7160a26eaadb..581f282ce11a 100755
--- a/src/Illuminate/Support/Facades/Redis.php
+++ b/src/Illuminate/Support/Facades/Redis.php
@@ -4,6 +4,9 @@
 
 /**
  * @see \Illuminate\Redis\Database
+ * @see \Illuminate\Redis\PredisDatabase
+ * @see \Illuminate\Redis\PhpRedisDatabase
+ * @see \Illuminate\Contracts\Redis\Database
  */
 class Redis extends Facade
 {
diff --git a/src/Illuminate/Support/Manager.php b/src/Illuminate/Support/Manager.php
index ce484f0c5ae2..442098f04f9e 100755
--- a/src/Illuminate/Support/Manager.php
+++ b/src/Illuminate/Support/Manager.php
@@ -134,6 +134,6 @@ public function getDrivers()
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->driver(), $method], $parameters);
+        return $this->driver()->$method(...$parameters);
     }
 }
diff --git a/src/Illuminate/Support/Pluralizer.php b/src/Illuminate/Support/Pluralizer.php
index f95b99d85d8b..871257226add 100755
--- a/src/Illuminate/Support/Pluralizer.php
+++ b/src/Illuminate/Support/Pluralizer.php
@@ -32,6 +32,7 @@ class Pluralizer
         'nutrition',
         'offspring',
         'plankton',
+        'pokemon',
         'police',
         'rice',
         'series',
@@ -50,7 +51,7 @@ class Pluralizer
      */
     public static function plural($value, $count = 2)
     {
-        if ($count === 1 || static::uncountable($value)) {
+        if ((int) $count === 1 || static::uncountable($value)) {
             return $value;
         }
 
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
index e59809a09173..47c781ca6f2f 100644
--- a/src/Illuminate/Support/Str.php
+++ b/src/Illuminate/Support/Str.php
@@ -240,11 +240,17 @@ public static function random($length = 16)
      *
      * Should not be considered sufficient for cryptography, etc.
      *
+     * @deprecated since version 5.3. Use the "random" method directly.
+     *
      * @param  int  $length
      * @return string
      */
     public static function quickRandom($length = 16)
     {
+        if (PHP_MAJOR_VERSION > 5) {
+            return static::random($length);
+        }
+
         $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         return static::substr(str_shuffle(str_repeat($pool, $length)), 0, $length);
diff --git a/src/Illuminate/Support/ViewErrorBag.php b/src/Illuminate/Support/ViewErrorBag.php
index 9fe3b96115ea..97aac6b88647 100644
--- a/src/Illuminate/Support/ViewErrorBag.php
+++ b/src/Illuminate/Support/ViewErrorBag.php
@@ -79,7 +79,7 @@ public function count()
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array([$this->default, $method], $parameters);
+        return $this->default->$method(...$parameters);
     }
 
     /**
diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
index 12be11e2caa6..41096f1b8fef 100644
--- a/src/Illuminate/Support/composer.json
+++ b/src/Illuminate/Support/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/support",
     "description": "The Illuminate Support package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
@@ -38,7 +38,6 @@
     },
     "suggest": {
         "illuminate/filesystem": "Required to use the composer class (5.2.*).",
-        "jeremeamia/superclosure": "Required to be able to serialize closures (~2.2).",
         "symfony/process": "Required to use the composer class (3.1.*).",
         "symfony/var-dumper": "Required to use the dd function (3.1.*)."
     },
diff --git a/src/Illuminate/Translation/Translator.php b/src/Illuminate/Translation/Translator.php
index 5c40312e5d40..d68d63c90556 100755
--- a/src/Illuminate/Translation/Translator.php
+++ b/src/Illuminate/Translation/Translator.php
@@ -5,12 +5,15 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\NamespacedItemResolver;
 use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class Translator extends NamespacedItemResolver implements TranslatorInterface
 {
+    use Macroable;
+
     /**
      * The loader implementation.
      *
diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json
index 7a919da1e5d5..88a77c799166 100755
--- a/src/Illuminate/Translation/composer.json
+++ b/src/Illuminate/Translation/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/translation",
     "description": "The Illuminate Translation package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
index d2124f5e766b..d27b428576b2 100755
--- a/src/Illuminate/Validation/Validator.php
+++ b/src/Illuminate/Validation/Validator.php
@@ -538,7 +538,9 @@ public function valid()
             $this->passes();
         }
 
-        return array_diff_key($this->data, $this->messages()->toArray());
+        return array_diff_key(
+            $this->data, $this->attributesThatHaveMessages()
+        );
     }
 
     /**
@@ -552,7 +554,25 @@ public function invalid()
             $this->passes();
         }
 
-        return array_intersect_key($this->data, $this->messages()->toArray());
+        return array_intersect_key(
+            $this->data, $this->attributesThatHaveMessages()
+        );
+    }
+
+    /**
+     * Generate an array of all attributes that have messages.
+     *
+     * @return array
+     */
+    protected function attributesThatHaveMessages()
+    {
+        $results = [];
+
+        foreach ($this->messages()->toArray() as $key => $message) {
+            $results[] = explode('.', $key)[0];
+        }
+
+        return array_flip(array_unique($results));
     }
 
     /**
@@ -1149,7 +1169,7 @@ protected function validateDigits($attribute, $value, $parameters)
     {
         $this->requireParameterCount(1, $parameters, 'digits');
 
-        return $this->validateNumeric($attribute, $value)
+        return ! preg_match('/[^0-9]/', $value)
             && strlen((string) $value) == $parameters[0];
     }
 
@@ -1167,7 +1187,7 @@ protected function validateDigitsBetween($attribute, $value, $parameters)
 
         $length = strlen((string) $value);
 
-        return $this->validateNumeric($attribute, $value)
+        return ! preg_match('/[^0-9]/', $value)
           && $length >= $parameters[0] && $length <= $parameters[1];
     }
 
@@ -1274,6 +1294,12 @@ protected function getSize($attribute, $value)
     protected function validateIn($attribute, $value, $parameters)
     {
         if (is_array($value) && $this->hasRule($attribute, 'Array')) {
+            foreach ($value as $element) {
+                if (is_array($element)) {
+                    return false;
+                }
+            }
+
             return count(array_diff($value, $parameters)) == 0;
         }
 
diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
index d1523889b222..b5cfc39a5458 100755
--- a/src/Illuminate/Validation/composer.json
+++ b/src/Illuminate/Validation/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/validation",
     "description": "The Illuminate Validation package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
index 6f2b8597e953..df382b9f237e 100644
--- a/src/Illuminate/View/Compilers/BladeCompiler.php
+++ b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -579,7 +579,7 @@ protected function compileFor($expression)
      */
     protected function compileForeach($expression)
     {
-        preg_match('/\( *(.*) +as *([^\)]*)/', $expression, $matches);
+        preg_match('/\( *(.*) +as *([^\)]*)/i', $expression, $matches);
 
         $iteratee = trim($matches[1]);
 
diff --git a/src/Illuminate/View/Factory.php b/src/Illuminate/View/Factory.php
index 3d016f0ccd2d..2661b59528f8 100755
--- a/src/Illuminate/View/Factory.php
+++ b/src/Illuminate/View/Factory.php
@@ -11,6 +11,7 @@
 use Illuminate\View\Engines\EngineResolver;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\View\View as ViewContract;
 use Illuminate\Contracts\View\Factory as FactoryContract;
 
 class Factory implements FactoryContract
@@ -513,7 +514,7 @@ protected function parseClassEvent($class, $prefix)
      * @param  \Illuminate\Contracts\View\View  $view
      * @return void
      */
-    public function callComposer(View $view)
+    public function callComposer(ViewContract $view)
     {
         $this->events->fire('composing: '.$view->getName(), [$view]);
     }
@@ -524,7 +525,7 @@ public function callComposer(View $view)
      * @param  \Illuminate\Contracts\View\View  $view
      * @return void
      */
-    public function callCreator(View $view)
+    public function callCreator(ViewContract $view)
     {
         $this->events->fire('creating: '.$view->getName(), [$view]);
     }
@@ -801,6 +802,7 @@ public function addLoop($data)
         $parent = Arr::last($this->loopsStack);
 
         $this->loopsStack[] = [
+            'iteration' => 0,
             'index' => 0,
             'remaining' => isset($length) ? $length : null,
             'count' => $length,
@@ -820,14 +822,15 @@ public function incrementLoopIndices()
     {
         $loop = &$this->loopsStack[count($this->loopsStack) - 1];
 
-        $loop['index']++;
+        $loop['iteration']++;
+        $loop['index'] = $loop['iteration'] - 1;
 
-        $loop['first'] = $loop['index'] == 1;
+        $loop['first'] = $loop['iteration'] == 1;
 
         if (isset($loop['count'])) {
             $loop['remaining']--;
 
-            $loop['last'] = $loop['index'] == $loop['count'];
+            $loop['last'] = $loop['iteration'] == $loop['count'];
         }
     }
 
diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json
index 9df4c4a881da..383f43fee1c2 100644
--- a/src/Illuminate/View/composer.json
+++ b/src/Illuminate/View/composer.json
@@ -2,7 +2,7 @@
     "name": "illuminate/view",
     "description": "The Illuminate View package.",
     "license": "MIT",
-    "homepage": "http://laravel.com",
+    "homepage": "https://laravel.com",
     "support": {
         "issues": "https://github.com/laravel/framework/issues",
         "source": "https://github.com/laravel/framework"
@@ -10,7 +10,7 @@
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {
diff --git a/tests/Auth/AuthTokenGuardTest.php b/tests/Auth/AuthTokenGuardTest.php
index e820667f16a3..2f192f0cfd6c 100644
--- a/tests/Auth/AuthTokenGuardTest.php
+++ b/tests/Auth/AuthTokenGuardTest.php
@@ -80,6 +80,18 @@ public function testValidateCanDetermineIfCredentialsAreInvalid()
 
         $this->assertFalse($guard->validate(['api_token' => 'foo']));
     }
+
+    public function testValidateIfApiTokenIsEmpty()
+    {
+        $provider = Mockery::mock(UserProvider::class);
+        $user = new AuthTokenGuardTestUser;
+        $user->id = 1;
+        $request = Request::create('/', 'GET', ['api_token' => '']);
+
+        $guard = new TokenGuard($provider, $request);
+
+        $this->assertFalse($guard->validate(['api_token' => '']));
+    }
 }
 
 class AuthTokenGuardTestUser
diff --git a/tests/Cache/CacheRedisStoreTest.php b/tests/Cache/CacheRedisStoreTest.php
index 331643ec8a74..802ef1fdbc53 100755
--- a/tests/Cache/CacheRedisStoreTest.php
+++ b/tests/Cache/CacheRedisStoreTest.php
@@ -131,6 +131,6 @@ public function testGetAndSetPrefix()
 
     protected function getRedis()
     {
-        return new Illuminate\Cache\RedisStore(m::mock('Illuminate\Redis\Database'), 'prefix');
+        return new Illuminate\Cache\RedisStore(m::mock('Illuminate\Redis\PredisDatabase'), 'prefix');
     }
 }
diff --git a/tests/Console/ConsoleEventSchedulerTest.php b/tests/Console/ConsoleEventSchedulerTest.php
index 640d13db90d9..9e08544c6239 100644
--- a/tests/Console/ConsoleEventSchedulerTest.php
+++ b/tests/Console/ConsoleEventSchedulerTest.php
@@ -42,7 +42,7 @@ public function testCommandCreatesNewArtisanCommand()
         $schedule->command('queue:listen', ['--tries' => 3]);
 
         $events = $schedule->events();
-        $binary = $escape.PHP_BINARY.$escape.(defined('HHVM_VERSION') ? ' --php' : '');
+        $binary = $escape.PHP_BINARY.$escape;
         $this->assertEquals($binary.' artisan queue:listen', $events[0]->command);
         $this->assertEquals($binary.' artisan queue:listen --tries=3', $events[1]->command);
         $this->assertEquals($binary.' artisan queue:listen --tries=3', $events[2]->command);
diff --git a/tests/Console/ConsoleScheduledEventTest.php b/tests/Console/ConsoleScheduledEventTest.php
index 4ddf07a197b8..bdf3de170e4c 100644
--- a/tests/Console/ConsoleScheduledEventTest.php
+++ b/tests/Console/ConsoleScheduledEventTest.php
@@ -69,6 +69,25 @@ public function testBasicCronCompilation()
 
         $event = new Event('php foo');
         $this->assertEquals('0 15 4 * * *', $event->monthlyOn(4, '15:00')->getExpression());
+
+        $event = new Event('php foo');
+        $this->assertEquals('0 0 * * 1-5 *', $event->weekdays()->daily()->getExpression());
+
+        $event = new Event('php foo');
+        $this->assertEquals('0 * * * 1-5 *', $event->weekdays()->hourly()->getExpression());
+
+        // chained rules should be commutative
+        $eventA = new Event('php foo');
+        $eventB = new Event('php foo');
+        $this->assertEquals(
+            $eventA->daily()->hourly()->getExpression(),
+            $eventB->hourly()->daily()->getExpression());
+
+        $eventA = new Event('php foo');
+        $eventB = new Event('php foo');
+        $this->assertEquals(
+            $eventA->weekdays()->hourly()->getExpression(),
+            $eventB->hourly()->weekdays()->getExpression());
     }
 
     public function testEventIsDueCheck()
diff --git a/tests/Database/DatabaseEloquentBelongsToManyTest.php b/tests/Database/DatabaseEloquentBelongsToManyTest.php
index 3ef49981afe4..491852b3ef45 100755
--- a/tests/Database/DatabaseEloquentBelongsToManyTest.php
+++ b/tests/Database/DatabaseEloquentBelongsToManyTest.php
@@ -554,6 +554,50 @@ public function testTouchMethodSyncsTimestamps()
         $relation->touch();
     }
 
+    /**
+     * @dataProvider toggleMethodListProvider
+     */
+    public function testToggleMethodTogglesIntermediateTableWithGivenArray($list)
+    {
+        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach'])->setConstructorArgs($this->getRelationArguments())->getMock();
+        $query = m::mock('stdClass');
+        $query->shouldReceive('from')->once()->with('user_role')->andReturn($query);
+        $query->shouldReceive('where')->once()->with('user_id', 1)->andReturn($query);
+        $relation->getQuery()->shouldReceive('getQuery')->andReturn($mockQueryBuilder = m::mock('StdClass'));
+        $mockQueryBuilder->shouldReceive('newQuery')->once()->andReturn($query);
+        $query->shouldReceive('pluck')->once()->with('role_id')->andReturn(new BaseCollection([1, 2, 3]));
+        $relation->expects($this->once())->method('attach')->with($this->equalTo(['x' => []]), $this->equalTo([]), $this->equalTo(false));
+        $relation->expects($this->once())->method('detach')->with($this->equalTo([2, 3]));
+        $relation->getRelated()->shouldReceive('touches')->andReturn(false);
+        $relation->getParent()->shouldReceive('touches')->andReturn(false);
+
+        $this->assertEquals(['attached' => ['x'], 'detached' => [2, 3]], $relation->toggle($list));
+    }
+
+    public function toggleMethodListProvider()
+    {
+        return [
+            [[2, 3, 'x']],
+            [['2', '3', 'x']],
+        ];
+    }
+
+    public function testToggleMethodTogglesIntermediateTableWithGivenArrayAndAttributes()
+    {
+        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach', 'touchIfTouching', 'updateExistingPivot'])->setConstructorArgs($this->getRelationArguments())->getMock();
+        $query = m::mock('stdClass');
+        $query->shouldReceive('from')->once()->with('user_role')->andReturn($query);
+        $query->shouldReceive('where')->once()->with('user_id', 1)->andReturn($query);
+        $relation->getQuery()->shouldReceive('getQuery')->andReturn($mockQueryBuilder = m::mock('StdClass'));
+        $mockQueryBuilder->shouldReceive('newQuery')->once()->andReturn($query);
+        $query->shouldReceive('pluck')->once()->with('role_id')->andReturn(new BaseCollection([1, 2, 3]));
+        $relation->expects($this->once())->method('attach')->with($this->equalTo([4 => ['foo' => 'bar']]), [], $this->equalTo(false));
+        $relation->expects($this->once())->method('detach')->with($this->equalTo([2, 3]));
+        $relation->expects($this->once())->method('touchIfTouching');
+
+        $this->assertEquals(['attached' => [4], 'detached' => [2, 3]], $relation->toggle([2, 3, 4 => ['foo' => 'bar']]));
+    }
+
     public function testTouchIfTouching()
     {
         $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['touch', 'touchingParent'])->setConstructorArgs($this->getRelationArguments())->getMock();
@@ -567,7 +611,7 @@ public function testTouchIfTouching()
 
     public function testSyncMethodConvertsCollectionToArrayOfKeys()
     {
-        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach', 'touchIfTouching', 'formatSyncList'])->setConstructorArgs($this->getRelationArguments())->getMock();
+        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach', 'touchIfTouching', 'formatRecordsList'])->setConstructorArgs($this->getRelationArguments())->getMock();
         $query = m::mock('stdClass');
         $query->shouldReceive('from')->once()->with('user_role')->andReturn($query);
         $query->shouldReceive('where')->once()->with('user_id', 1)->andReturn($query);
@@ -580,13 +624,13 @@ public function testSyncMethodConvertsCollectionToArrayOfKeys()
             m::mock(['getKey' => 2]),
             m::mock(['getKey' => 3]),
         ]);
-        $relation->expects($this->once())->method('formatSyncList')->with([1, 2, 3])->will($this->returnValue([1 => [], 2 => [], 3 => []]));
+        $relation->expects($this->once())->method('formatRecordsList')->with([1, 2, 3])->will($this->returnValue([1 => [], 2 => [], 3 => []]));
         $relation->sync($collection);
     }
 
     public function testWherePivotParamsUsedForNewQueries()
     {
-        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach', 'touchIfTouching', 'formatSyncList'])->setConstructorArgs($this->getRelationArguments())->getMock();
+        $relation = $this->getMockBuilder('Illuminate\Database\Eloquent\Relations\BelongsToMany')->setMethods(['attach', 'detach', 'touchIfTouching', 'formatRecordsList'])->setConstructorArgs($this->getRelationArguments())->getMock();
 
         // we expect to call $relation->wherePivot()
         $relation->getQuery()->shouldReceive('where')->once()->andReturn($relation);
@@ -608,7 +652,7 @@ public function testWherePivotParamsUsedForNewQueries()
 
         // This is so $relation->sync() works
         $query->shouldReceive('pluck')->once()->with('role_id')->andReturn(new BaseCollection([1, 2, 3]));
-        $relation->expects($this->once())->method('formatSyncList')->with([1, 2, 3])->will($this->returnValue([1 => [], 2 => [], 3 => []]));
+        $relation->expects($this->once())->method('formatRecordsList')->with([1, 2, 3])->will($this->returnValue([1 => [], 2 => [], 3 => []]));
 
         $relation = $relation->wherePivot('foo', '=', 'bar'); // these params are to be stored
         $relation->sync([1, 2, 3]); // triggers the whole process above
diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php
index 3736c91214ca..67dc4d1fe4d7 100755
--- a/tests/Database/DatabaseEloquentBuilderTest.php
+++ b/tests/Database/DatabaseEloquentBuilderTest.php
@@ -365,6 +365,17 @@ public function testGetRelationProperlySetsNestedRelationshipsWithSimilarNames()
         $relation = $builder->getRelation('ordersGroups');
     }
 
+    /**
+     * @expectedException Illuminate\Database\Eloquent\RelationNotFoundException
+     */
+    public function testGetRelationThrowsException()
+    {
+        $builder = $this->getBuilder();
+        $builder->setModel($this->getMockModel());
+
+        $builder->getRelation('invalid');
+    }
+
     public function testEagerLoadParsingSetsProperRelationships()
     {
         $builder = $this->getBuilder();
diff --git a/tests/Database/DatabaseEloquentCollectionTest.php b/tests/Database/DatabaseEloquentCollectionTest.php
index ccea6437af44..0ddc4d7d3efd 100755
--- a/tests/Database/DatabaseEloquentCollectionTest.php
+++ b/tests/Database/DatabaseEloquentCollectionTest.php
@@ -146,6 +146,33 @@ public function testCollectionMergesWithGivenCollection()
         $this->assertEquals(new Collection([$one, $two, $three]), $c1->merge($c2));
     }
 
+    public function testMap()
+    {
+        $one = m::mock('Illuminate\Database\Eloquent\Model');
+        $two = m::mock('Illuminate\Database\Eloquent\Model');
+
+        $c = new Collection([$one, $two]);
+
+        $cAfterMap = $c->map(function ($item) {
+            return $item;
+        });
+
+        $this->assertEquals($c->all(), $cAfterMap->all());
+        $this->assertInstanceOf(Collection::class, $cAfterMap);
+    }
+
+    public function testMappingToNonModelsReturnsABaseCollection()
+    {
+        $one = m::mock('Illuminate\Database\Eloquent\Model');
+        $two = m::mock('Illuminate\Database\Eloquent\Model');
+
+        $c = (new Collection([$one, $two]))->map(function ($item) {
+            return 'not-a-model';
+        });
+
+        $this->assertEquals(BaseCollection::class, get_class($c));
+    }
+
     public function testCollectionDiffsWithGivenCollection()
     {
         $one = m::mock('Illuminate\Database\Eloquent\Model');
@@ -247,12 +274,12 @@ public function testNonModelRelatedMethods()
     {
         $a = new Collection([['foo' => 'bar'], ['foo' => 'baz']]);
         $b = new Collection(['a', 'b', 'c']);
-        $this->assertEquals(get_class($a->pluck('foo')), BaseCollection::class);
-        $this->assertEquals(get_class($a->keys()), BaseCollection::class);
-        $this->assertEquals(get_class($a->collapse()), BaseCollection::class);
-        $this->assertEquals(get_class($a->flatten()), BaseCollection::class);
-        $this->assertEquals(get_class($a->zip(['a', 'b'], ['c', 'd'])), BaseCollection::class);
-        $this->assertEquals(get_class($b->flip()), BaseCollection::class);
+        $this->assertEquals(BaseCollection::class, get_class($a->pluck('foo')));
+        $this->assertEquals(BaseCollection::class, get_class($a->keys()));
+        $this->assertEquals(BaseCollection::class, get_class($a->collapse()));
+        $this->assertEquals(BaseCollection::class, get_class($a->flatten()));
+        $this->assertEquals(BaseCollection::class, get_class($a->zip(['a', 'b'], ['c', 'd'])));
+        $this->assertEquals(BaseCollection::class, get_class($b->flip()));
     }
 
     public function testMakeVisibleRemovesHiddenAndIncludesVisible()
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
index 8e33364e4a8e..1167341f9cc7 100755
--- a/tests/Database/DatabaseEloquentModelTest.php
+++ b/tests/Database/DatabaseEloquentModelTest.php
@@ -46,6 +46,21 @@ public function testDirtyAttributes()
         $this->assertTrue($model->isDirty(['foo', 'bar']));
     }
 
+    public function testCleanAttributes()
+    {
+        $model = new EloquentModelStub(['foo' => '1', 'bar' => 2, 'baz' => 3]);
+        $model->syncOriginal();
+        $model->foo = 1;
+        $model->bar = 20;
+        $model->baz = 30;
+
+        $this->assertFalse($model->isClean());
+        $this->assertTrue($model->isClean('foo'));
+        $this->assertFalse($model->isClean('bar'));
+        $this->assertFalse($model->isClean('foo', 'bar'));
+        $this->assertFalse($model->isClean(['foo', 'bar']));
+    }
+
     public function testCalculatedAttributes()
     {
         $model = new EloquentModelStub;
@@ -252,8 +267,8 @@ public function testTimestampsAreReturnedAsObjects()
         $model = $this->getMockBuilder('EloquentDateModelStub')->setMethods(['getDateFormat'])->getMock();
         $model->expects($this->any())->method('getDateFormat')->will($this->returnValue('Y-m-d'));
         $model->setRawAttributes([
-            'created_at'    => '2012-12-04',
-            'updated_at'    => '2012-12-05',
+            'created_at' => '2012-12-04',
+            'updated_at' => '2012-12-05',
         ]);
 
         $this->assertInstanceOf('Carbon\Carbon', $model->created_at);
@@ -265,8 +280,8 @@ public function testTimestampsAreReturnedAsObjectsFromPlainDatesAndTimestamps()
         $model = $this->getMockBuilder('EloquentDateModelStub')->setMethods(['getDateFormat'])->getMock();
         $model->expects($this->any())->method('getDateFormat')->will($this->returnValue('Y-m-d H:i:s'));
         $model->setRawAttributes([
-            'created_at'    => '2012-12-04',
-            'updated_at'    => time(),
+            'created_at' => '2012-12-04',
+            'updated_at' => time(),
         ]);
 
         $this->assertInstanceOf('Carbon\Carbon', $model->created_at);
@@ -698,17 +713,6 @@ public function testVisible()
         $this->assertArrayNotHasKey('age', $array);
     }
 
-    public function testHiddenAreIgnoringWhenVisibleExists()
-    {
-        $model = new EloquentModelStub(['name' => 'foo', 'age' => 'bar', 'id' => 'baz']);
-        $model->setVisible(['name', 'id']);
-        $model->setHidden(['name', 'age']);
-        $array = $model->toArray();
-        $this->assertArrayHasKey('name', $array);
-        $this->assertArrayHasKey('id', $array);
-        $this->assertArrayNotHasKey('age', $array);
-    }
-
     public function testDynamicHidden()
     {
         $model = new EloquentModelDynamicHiddenStub(['name' => 'foo', 'age' => 'bar', 'id' => 'baz']);
@@ -728,6 +732,20 @@ public function testWithHidden()
         $this->assertArrayNotHasKey('id', $array);
     }
 
+    public function testMakeHidden()
+    {
+        $model = new EloquentModelStub(['name' => 'foo', 'age' => 'bar', 'id' => 'baz']);
+        $array = $model->toArray();
+        $this->assertArrayHasKey('name', $array);
+        $this->assertArrayHasKey('age', $array);
+        $this->assertArrayHasKey('id', $array);
+
+        $array = $model->makeHidden(['name', 'age'])->toArray();
+        $this->assertArrayNotHasKey('name', $array);
+        $this->assertArrayNotHasKey('age', $array);
+        $this->assertArrayHasKey('id', $array);
+    }
+
     public function testDynamicVisible()
     {
         $model = new EloquentModelDynamicVisibleStub(['name' => 'foo', 'age' => 'bar', 'id' => 'baz']);
diff --git a/tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php b/tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php
index 1f62de6e8ba4..51cc1651fd97 100644
--- a/tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php
+++ b/tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php
@@ -192,6 +192,21 @@ public function testOnlyTrashedOnlyReturnsTrashedRecords()
         $this->assertEquals(1, $users->first()->id);
     }
 
+    public function testOnlyWithoutTrashedOnlyReturnsTrashedRecords()
+    {
+        $this->createUsers();
+
+        $users = SoftDeletesTestUser::withoutTrashed()->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(2, $users->first()->id);
+
+        $users = SoftDeletesTestUser::withTrashed()->withoutTrashed()->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(2, $users->first()->id);
+    }
+
     public function testFirstOrNew()
     {
         $this->createUsers();
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
index 01a569f25caa..3c55d8331e23 100755
--- a/tests/Database/DatabaseQueryBuilderTest.php
+++ b/tests/Database/DatabaseQueryBuilderTest.php
@@ -193,6 +193,14 @@ public function testWhereYearMySql()
         $this->assertEquals([0 => 2014], $builder->getBindings());
     }
 
+    public function testWhereTimeMySql()
+    {
+        $builder = $this->getMySqlBuilder();
+        $builder->select('*')->from('users')->whereTime('created_at', '>=', '22:00');
+        $this->assertEquals('select * from `users` where time(`created_at`) >= ?', $builder->toSql());
+        $this->assertEquals([0 => '22:00'], $builder->getBindings());
+    }
+
     public function testWhereDatePostgres()
     {
         $builder = $this->getPostgresBuilder();
@@ -1237,7 +1245,7 @@ public function testUpdateOrInsertMethod()
         $builder->shouldReceive('exists')->once()->andReturn(false);
         $builder->shouldReceive('insert')->once()->with(['email' => 'foo', 'name' => 'bar'])->andReturn(true);
 
-        $this->assertEquals(true, $builder->updateOrInsert(['email' => 'foo'], ['name' => 'bar']));
+        $this->assertTrue($builder->updateOrInsert(['email' => 'foo'], ['name' => 'bar']));
 
         $builder = m::mock('Illuminate\Database\Query\Builder[where,exists,update]', [
             m::mock('Illuminate\Database\ConnectionInterface'),
@@ -1250,7 +1258,7 @@ public function testUpdateOrInsertMethod()
         $builder->shouldReceive('take')->andReturnSelf();
         $builder->shouldReceive('update')->once()->with(['name' => 'bar'])->andReturn(1);
 
-        $this->assertEquals(true, $builder->updateOrInsert(['email' => 'foo'], ['name' => 'bar']));
+        $this->assertTrue($builder->updateOrInsert(['email' => 'foo'], ['name' => 'bar']));
     }
 
     public function testDeleteMethod()
@@ -1704,6 +1712,19 @@ public function testChunkPaginatesUsingId()
         }, 'someIdField');
     }
 
+    public function testChunkPaginatesUsingIdWithAlias()
+    {
+        $builder = $this->getMockQueryBuilder();
+        $builder->shouldReceive('forPageAfterId')->once()->with(2, 0, 'table.id')->andReturn($builder);
+        $builder->shouldReceive('forPageAfterId')->once()->with(2, 10, 'table.id')->andReturn($builder);
+        $builder->shouldReceive('get')->times(2)->andReturn(
+            [(object) ['table_id' => 1], (object) ['table_id' => 10]],
+            []
+        );
+        $builder->chunkById(2, function ($results) {
+        }, 'table.id', 'table_id');
+    }
+
     public function testPaginate()
     {
         $perPage = 16;
diff --git a/tests/Database/DatabaseSoftDeletingScopeTest.php b/tests/Database/DatabaseSoftDeletingScopeTest.php
index 51808c696ba4..7a370d8a4826 100644
--- a/tests/Database/DatabaseSoftDeletingScopeTest.php
+++ b/tests/Database/DatabaseSoftDeletingScopeTest.php
@@ -84,4 +84,24 @@ public function testOnlyTrashedExtension()
 
         $this->assertEquals($givenBuilder, $result);
     }
+
+    public function testWithoutTrashedExtension()
+    {
+        $builder = m::mock('Illuminate\Database\Eloquent\Builder');
+        $builder->shouldDeferMissing();
+        $model = m::mock('Illuminate\Database\Eloquent\Model');
+        $model->shouldDeferMissing();
+        $scope = m::mock('Illuminate\Database\Eloquent\SoftDeletingScope[remove]');
+        $scope->extend($builder);
+        $callback = $builder->getMacro('withoutTrashed');
+        $givenBuilder = m::mock('Illuminate\Database\Eloquent\Builder');
+        $givenBuilder->shouldReceive('getQuery')->andReturn($query = m::mock('stdClass'));
+        $givenBuilder->shouldReceive('getModel')->andReturn($model);
+        $givenBuilder->shouldReceive('withoutGlobalScope')->with($scope)->andReturn($givenBuilder);
+        $model->shouldReceive('getQualifiedDeletedAtColumn')->andReturn('table.deleted_at');
+        $givenBuilder->shouldReceive('whereNull')->once()->with('table.deleted_at');
+        $result = $callback($givenBuilder);
+
+        $this->assertEquals($givenBuilder, $result);
+    }
 }
diff --git a/tests/Events/EventsDispatcherTest.php b/tests/Events/EventsDispatcherTest.php
index b9458785fca2..d8e2a7bdf634 100755
--- a/tests/Events/EventsDispatcherTest.php
+++ b/tests/Events/EventsDispatcherTest.php
@@ -180,6 +180,46 @@ public function testQueuedEventHandlersAreQueuedWithCustomHandlers()
         $d->listen('some.event', 'TestDispatcherQueuedHandlerCustomQueue@someMethod');
         $d->fire('some.event', ['foo', 'bar']);
     }
+
+    public function testClassesWork()
+    {
+        unset($_SERVER['__event.test']);
+        $d = new Dispatcher;
+        $d->listen('ExampleEvent', function () {
+            $_SERVER['__event.test'] = 'baz';
+        });
+        $d->fire(new ExampleEvent);
+
+        $this->assertSame('baz', $_SERVER['__event.test']);
+    }
+
+    public function testInterfacesWork()
+    {
+        unset($_SERVER['__event.test']);
+        $d = new Dispatcher;
+        $d->listen('SomeEventInterface', function () {
+            $_SERVER['__event.test'] = 'bar';
+        });
+        $d->fire(new AnotherEvent);
+
+        $this->assertSame('bar', $_SERVER['__event.test']);
+    }
+
+    public function testBothClassesAndInterfacesWork()
+    {
+        unset($_SERVER['__event.test']);
+        $d = new Dispatcher;
+        $d->listen('AnotherEvent', function () {
+            $_SERVER['__event.test1'] = 'fooo';
+        });
+        $d->listen('SomeEventInterface', function () {
+            $_SERVER['__event.test2'] = 'baar';
+        });
+        $d->fire(new AnotherEvent);
+
+        $this->assertSame('fooo', $_SERVER['__event.test1']);
+        $this->assertSame('baar', $_SERVER['__event.test2']);
+    }
 }
 
 class TestDispatcherQueuedHandler implements Illuminate\Contracts\Queue\ShouldQueue
@@ -200,3 +240,18 @@ public function queue($queue, $handler, array $payload)
         $queue->push($handler, $payload);
     }
 }
+
+class ExampleEvent
+{
+    //
+}
+
+interface SomeEventInterface
+{
+    //
+}
+
+class AnotherEvent implements SomeEventInterface
+{
+    //
+}
diff --git a/tests/Filesystem/FilesystemTest.php b/tests/Filesystem/FilesystemTest.php
index 017ea9e1ae5d..0ce7e9f9a3d1 100755
--- a/tests/Filesystem/FilesystemTest.php
+++ b/tests/Filesystem/FilesystemTest.php
@@ -312,12 +312,6 @@ public function testMakeDirectory()
      */
     public function testSharedGet()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Skip HHVM test due to bug: https://github.com/facebook/hhvm/issues/5657');
-
-            return;
-        }
-
         $content = '';
         for ($i = 0; $i < 1000000; ++$i) {
             $content .= $i;
diff --git a/tests/Foundation/FoundationComposerTest.php b/tests/Foundation/FoundationComposerTest.php
index 6e22afba7147..97cd12c57fc0 100755
--- a/tests/Foundation/FoundationComposerTest.php
+++ b/tests/Foundation/FoundationComposerTest.php
@@ -17,7 +17,7 @@ public function testDumpAutoloadRunsTheCorrectCommand()
         $files->shouldReceive('exists')->once()->with(__DIR__.'/composer.phar')->andReturn(true);
         $process = m::mock('stdClass');
         $composer->expects($this->once())->method('getProcess')->will($this->returnValue($process));
-        $process->shouldReceive('setCommandLine')->once()->with($escape.PHP_BINARY.$escape.(defined('HHVM_VERSION') ? ' --php' : '').' composer.phar dump-autoload');
+        $process->shouldReceive('setCommandLine')->once()->with($escape.PHP_BINARY.$escape.' composer.phar dump-autoload');
         $process->shouldReceive('run')->once();
 
         $composer->dumpAutoloads();
diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
index e555d0858388..333c459c5ac3 100644
--- a/tests/Http/HttpRequestTest.php
+++ b/tests/Http/HttpRequestTest.php
@@ -204,6 +204,10 @@ public function testExistsMethod()
         $request = Request::create('/', 'GET', ['foo' => '', 'bar' => null]);
         $this->assertTrue($request->exists('foo'));
         $this->assertTrue($request->exists('bar'));
+
+        $request = Request::create('/', 'GET', ['foo' => ['bar' => null, 'baz' => '']]);
+        $this->assertTrue($request->exists('foo.bar'));
+        $this->assertTrue($request->exists('foo.baz'));
     }
 
     public function testHasMethod()
@@ -220,6 +224,9 @@ public function testHasMethod()
         //test arrays within query string
         $request = Request::create('/', 'GET', ['foo' => ['bar', 'baz']]);
         $this->assertTrue($request->has('foo'));
+
+        $request = Request::create('/', 'GET', ['foo' => ['bar' => 'baz']]);
+        $this->assertTrue($request->has('foo.bar'));
     }
 
     public function testInputMethod()
@@ -594,6 +601,28 @@ public function testUserResolverMakesUserAvailableAsMagicProperty()
         $this->assertEquals('user', $request->user());
     }
 
+    public function testFingerprintMethod()
+    {
+        $request = Request::create('/', 'GET', [], [], [], []);
+        $request->setRouteResolver(function () use ($request) {
+            $route = new Route('GET', '/foo/bar/{id}', []);
+            $route->bind($request);
+
+            return $route;
+        });
+
+        $this->assertEquals(40, mb_strlen($request->fingerprint()));
+    }
+
+    /**
+     * @expectedException RuntimeException
+     */
+    public function testFingerprintWithoutRoute()
+    {
+        $request = Request::create('/', 'GET', [], [], [], []);
+        $request->fingerprint();
+    }
+
     public function testCreateFromBase()
     {
         $body = [
diff --git a/tests/Mail/MailHandleQueuedMessageTest.php b/tests/Mail/MailHandleQueuedMessageTest.php
new file mode 100644
index 000000000000..77b76fcb9589
--- /dev/null
+++ b/tests/Mail/MailHandleQueuedMessageTest.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Mail\Jobs\HandleQueuedMessage;
+use Illuminate\Contracts\Database\ModelIdentifier;
+
+class MailHandleQueuedMessageTest extends PHPUnit_Framework_TestCase
+{
+    public function test_it_serializes_models_to_model_identifiers_and_serializes_callback()
+    {
+        $job = new HandleQueuedMessage('view', ['user' => new HandleQueuedMessageModelStub], function () {
+            //
+        });
+
+        $job->__sleep();
+
+        $this->assertInstanceOf(ModelIdentifier::class, $job->data['user']);
+        $this->assertTrue(is_string($job->callback));
+    }
+
+    public function test_it_restores_models_and_callback()
+    {
+        $job = new HandleQueuedMessageWithFakeRestore('view', ['user' => new HandleQueuedMessageModelStub], function () {
+            //
+        });
+
+        $job->__sleep();
+
+        $this->assertInstanceOf(ModelIdentifier::class, $job->data['user']);
+        $this->assertTrue(is_string($job->callback));
+
+        $job->__wakeup();
+
+        $this->assertEquals(123, $job->data['user']);
+        $this->assertInstanceOf('Closure', $job->callback);
+    }
+}
+
+class HandleQueuedMessageModelStub extends Illuminate\Database\Eloquent\Model
+{
+}
+
+class HandleQueuedMessageWithFakeRestore extends HandleQueuedMessage
+{
+    protected function getRestoredPropertyValue($value)
+    {
+        return 123;
+    }
+}
diff --git a/tests/Mail/MailMailerTest.php b/tests/Mail/MailMailerTest.php
index 246e1d042a80..a88d25e68006 100755
--- a/tests/Mail/MailMailerTest.php
+++ b/tests/Mail/MailMailerTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Mockery as m;
-use SuperClosure\Serializer;
 
 class MailMailerTest extends PHPUnit_Framework_TestCase
 {
@@ -79,7 +78,7 @@ public function testMailerCanQueueMessagesToItself()
         list($view, $swift) = $this->getMocks();
         $mailer = new Illuminate\Mail\Mailer($view, $swift);
         $mailer->setQueue($queue = m::mock('Illuminate\Contracts\Queue\Factory'));
-        $queue->shouldReceive('push')->once()->with('mailer@handleQueuedMessage', ['view' => 'foo', 'data' => [1], 'callback' => 'callable'], null);
+        $queue->shouldReceive('pushOn')->once()->with(null, m::type('Illuminate\Mail\Jobs\HandleQueuedMessage'));
 
         $mailer->queue('foo', [1], 'callable');
     }
@@ -89,29 +88,17 @@ public function testMailerCanQueueMessagesToItselfOnAnotherQueue()
         list($view, $swift) = $this->getMocks();
         $mailer = new Illuminate\Mail\Mailer($view, $swift);
         $mailer->setQueue($queue = m::mock('Illuminate\Contracts\Queue\Factory'));
-        $queue->shouldReceive('push')->once()->with('mailer@handleQueuedMessage', ['view' => 'foo', 'data' => [1], 'callback' => 'callable'], 'queue');
+        $queue->shouldReceive('pushOn')->once()->with('queue', m::type('Illuminate\Mail\Jobs\HandleQueuedMessage'));
 
         $mailer->queueOn('queue', 'foo', [1], 'callable');
     }
 
-    public function testMailerCanQueueMessagesToItselfWithSerializedClosures()
-    {
-        list($view, $swift) = $this->getMocks();
-        $mailer = new Illuminate\Mail\Mailer($view, $swift);
-        $mailer->setQueue($queue = m::mock('Illuminate\Contracts\Queue\Factory'));
-        $serialized = (new Serializer)->serialize($closure = function () {
-        });
-        $queue->shouldReceive('push')->once()->with('mailer@handleQueuedMessage', ['view' => 'foo', 'data' => [1], 'callback' => $serialized], null);
-
-        $mailer->queue('foo', [1], $closure);
-    }
-
     public function testMailerCanQueueMessagesToItselfLater()
     {
         list($view, $swift) = $this->getMocks();
         $mailer = new Illuminate\Mail\Mailer($view, $swift);
         $mailer->setQueue($queue = m::mock('Illuminate\Contracts\Queue\Factory'));
-        $queue->shouldReceive('later')->once()->with(10, 'mailer@handleQueuedMessage', ['view' => 'foo', 'data' => [1], 'callback' => 'callable'], null);
+        $queue->shouldReceive('laterOn')->once()->with(null, 10, m::type('Illuminate\Mail\Jobs\HandleQueuedMessage'));
 
         $mailer->later(10, 'foo', [1], 'callable');
     }
@@ -121,7 +108,7 @@ public function testMailerCanQueueMessagesToItselfLaterOnAnotherQueue()
         list($view, $swift) = $this->getMocks();
         $mailer = new Illuminate\Mail\Mailer($view, $swift);
         $mailer->setQueue($queue = m::mock('Illuminate\Contracts\Queue\Factory'));
-        $queue->shouldReceive('later')->once()->with(10, 'mailer@handleQueuedMessage', ['view' => 'foo', 'data' => [1], 'callback' => 'callable'], 'queue');
+        $queue->shouldReceive('laterOn')->once()->with('queue', 10, m::type('Illuminate\Mail\Jobs\HandleQueuedMessage'));
 
         $mailer->laterOn('queue', 10, 'foo', [1], 'callable');
     }
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
new file mode 100644
index 000000000000..db7954fcb17e
--- /dev/null
+++ b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Channels\BroadcastChannel;
+
+class NotificationBroadcastChannelTest extends PHPUnit_Framework_TestCase
+{
+    public function tearDown()
+    {
+        Mockery::close();
+    }
+
+    public function testDatabaseChannelCreatesDatabaseRecordWithProperData()
+    {
+        $notification = new NotificationBroadcastChannelTestNotification;
+        $notification->id = 1;
+        $notifiable = Mockery::mock();
+
+        $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
+        $events->shouldReceive('fire')->once()->with(Mockery::type('Illuminate\Notifications\Events\BroadcastNotificationCreated'));
+        $channel = new BroadcastChannel($events);
+        $channel->send($notifiable, $notification);
+    }
+}
+
+class NotificationBroadcastChannelTestNotification extends Notification
+{
+    public function toArray($notifiable)
+    {
+        return ['invoice_id' => 1];
+    }
+}
diff --git a/tests/Notifications/NotificationChannelManagerTest.php b/tests/Notifications/NotificationChannelManagerTest.php
index 6d4e4157dd8a..792738881bd0 100644
--- a/tests/Notifications/NotificationChannelManagerTest.php
+++ b/tests/Notifications/NotificationChannelManagerTest.php
@@ -20,18 +20,27 @@ public function testNotificationCanBeDispatchedToDriver()
         Container::setInstance($container);
         $manager = Mockery::mock(ChannelManager::class.'[driver]', [$container]);
         $manager->shouldReceive('driver')->andReturn($driver = Mockery::mock());
-        $driver->shouldReceive('send')->andReturnUsing(function ($notification) {
-            $this->assertEquals('Name', $notification->application);
-            $this->assertEquals('Logo', $notification->logoUrl);
-            $this->assertEquals(['test'], $notification->via);
-            $this->assertEquals('Notification Channel Manager Test Notification', $notification->subject);
-            $this->assertEquals('test', $notification->introLines[0]);
-            $this->assertEquals('Text', $notification->actionText);
-            $this->assertEquals('url', $notification->actionUrl);
-        });
+        $events->shouldReceive('until')->with(Mockery::type(Illuminate\Notifications\Events\NotificationSending::class))->andReturn(true);
+        $driver->shouldReceive('send')->once();
         $events->shouldReceive('fire')->with(Mockery::type(Illuminate\Notifications\Events\NotificationSent::class));
 
-        $manager->dispatch(new NotificationChannelManagerTestNotifiable, new NotificationChannelManagerTestNotification);
+        $manager->send([new NotificationChannelManagerTestNotifiable], new NotificationChannelManagerTestNotification);
+    }
+
+    public function testNotificationNotSentOnHalt()
+    {
+        $container = new Container;
+        $container->instance('config', ['app.name' => 'Name', 'app.logo' => 'Logo']);
+        $container->instance('events', $events = Mockery::mock());
+        Container::setInstance($container);
+        $manager = Mockery::mock(ChannelManager::class.'[driver]', [$container]);
+        $events->shouldReceive('until')->once()->with(Mockery::type(Illuminate\Notifications\Events\NotificationSending::class))->andReturn(false);
+        $events->shouldReceive('until')->with(Mockery::type(Illuminate\Notifications\Events\NotificationSending::class))->andReturn(true);
+        $manager->shouldReceive('driver')->once()->andReturn($driver = Mockery::mock());
+        $driver->shouldReceive('send')->once();
+        $events->shouldReceive('fire')->with(Mockery::type(Illuminate\Notifications\Events\NotificationSent::class));
+
+        $manager->send([new NotificationChannelManagerTestNotifiable], new NotificationChannelManagerTestNotificationWithTwoChannels);
     }
 
     public function testNotificationCanBeQueued()
@@ -43,7 +52,7 @@ public function testNotificationCanBeQueued()
         Container::setInstance($container);
         $manager = Mockery::mock(ChannelManager::class.'[driver]', [$container]);
 
-        $manager->dispatch(new NotificationChannelManagerTestNotifiable, new NotificationChannelManagerTestQueuedNotification);
+        $manager->send([new NotificationChannelManagerTestNotifiable], new NotificationChannelManagerTestQueuedNotification);
     }
 }
 
@@ -65,6 +74,19 @@ public function message()
     }
 }
 
+class NotificationChannelManagerTestNotificationWithTwoChannels extends Notification
+{
+    public function via()
+    {
+        return ['test', 'test2'];
+    }
+
+    public function message()
+    {
+        return $this->line('test')->action('Text', 'url');
+    }
+}
+
 class NotificationChannelManagerTestQueuedNotification extends Notification implements Illuminate\Contracts\Queue\ShouldQueue
 {
     use Illuminate\Bus\Queueable;
diff --git a/tests/Notifications/NotificationDatabaseChannelTest.php b/tests/Notifications/NotificationDatabaseChannelTest.php
index 07a8f28bb9db..cb6da1a8049f 100644
--- a/tests/Notifications/NotificationDatabaseChannelTest.php
+++ b/tests/Notifications/NotificationDatabaseChannelTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Illuminate\Notifications\Channels\Notification;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Channels\DatabaseChannel;
+use Illuminate\Notifications\Messages\DatabaseMessage;
 
 class NotificationDatabaseChannelTest extends PHPUnit_Framework_TestCase
 {
@@ -11,17 +13,26 @@ public function tearDown()
 
     public function testDatabaseChannelCreatesDatabaseRecordWithProperData()
     {
-        $notification = new Notification([
-            $notifiable = Mockery::mock(),
-        ]);
+        $notification = new NotificationDatabaseChannelTestNotification;
+        $notification->id = 1;
+        $notifiable = Mockery::mock();
 
         $notifiable->shouldReceive('routeNotificationFor->create')->with([
-            'level' => 'info',
-            'intro' => [],
-            'outro' => [],
-            'action_text' => null,
-            'action_url' => null,
-            'read' => false,
+            'id' => 1,
+            'type' => get_class($notification),
+            'data' => ['invoice_id' => 1],
+            'read_at' => null,
         ]);
+
+        $channel = new DatabaseChannel;
+        $channel->send($notifiable, $notification);
+    }
+}
+
+class NotificationDatabaseChannelTestNotification extends Notification
+{
+    public function toDatabase($notifiable)
+    {
+        return new DatabaseMessage(['invoice_id' => 1]);
     }
 }
diff --git a/tests/Notifications/NotificationMailChannelTest.php b/tests/Notifications/NotificationMailChannelTest.php
index da50ec494159..d36ea8923585 100644
--- a/tests/Notifications/NotificationMailChannelTest.php
+++ b/tests/Notifications/NotificationMailChannelTest.php
@@ -1,6 +1,7 @@
 <?php
 
-use Illuminate\Notifications\Channels\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class NotificationMailChannelTest extends PHPUnit_Framework_TestCase
 {
@@ -11,20 +12,19 @@ public function tearDown()
 
     public function testMailIsSentByChannel()
     {
-        $notification = new Notification([
-            $notifiable = new NotificationMailChannelTestNotifiable,
-        ]);
+        $notification = new NotificationMailChannelTestNotification;
+        $notifiable = new NotificationMailChannelTestNotifiable;
 
-        $array = $notification->toArray();
-        $array['actionColor'] = 'blue';
+        $message = $notification->toMail($notifiable);
+        $data = $message->toArray();
 
         $channel = new Illuminate\Notifications\Channels\MailChannel(
             $mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
         );
 
-        $mailer->shouldReceive('send')->with('notifications::email', $array, Mockery::type('Closure'));
+        $mailer->shouldReceive('send')->with('notifications::email', $data, Mockery::type('Closure'));
 
-        $channel->send($notification);
+        $channel->send($notifiable, $notification);
     }
 }
 
@@ -34,3 +34,11 @@ class NotificationMailChannelTestNotifiable
 
     public $email = 'taylor@laravel.com';
 }
+
+class NotificationMailChannelTestNotification extends Notification
+{
+    public function toMail($notifiable)
+    {
+        return new MailMessage;
+    }
+}
diff --git a/tests/Notifications/NotificationMessageBuilderTest.php b/tests/Notifications/NotificationMessageBuilderTest.php
deleted file mode 100644
index d37c2ea9be88..000000000000
--- a/tests/Notifications/NotificationMessageBuilderTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-use Illuminate\Notifications\MessageBuilder;
-
-class MessageBuilderTest extends PHPUnit_Framework_TestCase
-{
-    public function testMessageBuilderAddsActionsCorrectly()
-    {
-        $builder = new MessageBuilder('line 1');
-        $builder->action('Text', 'url');
-        $builder->line('line 2');
-
-        $this->assertEquals('line 1', $builder->elements[0]);
-        $this->assertEquals('Text', $builder->elements[1]->text);
-        $this->assertEquals('url', $builder->elements[1]->url);
-        $this->assertEquals('line 2', $builder->elements[2]);
-    }
-}
diff --git a/tests/Notifications/NotificationMessageTest.php b/tests/Notifications/NotificationMessageTest.php
new file mode 100644
index 000000000000..128a436d4d57
--- /dev/null
+++ b/tests/Notifications/NotificationMessageTest.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Notifications\Messages\SimpleMessage as Message;
+
+class NotificationMessageTest extends PHPUnit_Framework_TestCase
+{
+    public function testLevelCanBeRetrieved()
+    {
+        $message = new Message;
+        $this->assertEquals('info', $message->level);
+
+        $message = new Message;
+        $message->level('error');
+        $this->assertEquals('error', $message->level);
+    }
+
+    public function testMessageFormatsMultiLineText()
+    {
+        $message = new Message;
+        $message->with('
+            This is a
+            single line of text.
+        ');
+
+        $this->assertEquals('This is a single line of text.', $message->introLines[0]);
+
+        $message = new Message;
+        $message->with([
+            'This is a',
+            'single line of text.',
+        ]);
+
+        $this->assertEquals('This is a single line of text.', $message->introLines[0]);
+    }
+}
diff --git a/tests/Notifications/NotificationNexmoChannelTest.php b/tests/Notifications/NotificationNexmoChannelTest.php
index cf06bf230098..abbe80692979 100644
--- a/tests/Notifications/NotificationNexmoChannelTest.php
+++ b/tests/Notifications/NotificationNexmoChannelTest.php
@@ -1,6 +1,7 @@
 <?php
 
-use Illuminate\Notifications\Channels\Notification;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\NexmoMessage;
 
 class NotificationNexmoChannelTest extends PHPUnit_Framework_TestCase
 {
@@ -11,14 +12,8 @@ public function tearDown()
 
     public function testSmsIsSentViaNexmo()
     {
-        $notification = new Notification([
-            $notifiable = new NotificationNexmoChannelTestNotifiable,
-        ]);
-
-        $notification->introLines = ['line 1'];
-        $notification->actionText = 'Text';
-        $notification->actionUrl = 'url';
-        $notification->outroLines = ['line 2'];
+        $notification = new NotificationNexmoChannelTestNotification;
+        $notifiable = new NotificationNexmoChannelTestNotifiable;
 
         $channel = new Illuminate\Notifications\Channels\NexmoSmsChannel(
             $nexmo = Mockery::mock(Nexmo\Client::class), '4444444444'
@@ -27,14 +22,28 @@ public function testSmsIsSentViaNexmo()
         $nexmo->shouldReceive('message->send')->with([
             'from' => '4444444444',
             'to' => '5555555555',
-            'text' => 'line 1
+            'text' => 'this is my message',
+        ]);
 
-Text: url
+        $channel->send($notifiable, $notification);
+    }
+
+    public function testSmsIsSentViaNexmoWithCustomFrom()
+    {
+        $notification = new NotificationNexmoChannelTestCustomFromNotification;
+        $notifiable = new NotificationNexmoChannelTestNotifiable;
 
-line 2',
+        $channel = new Illuminate\Notifications\Channels\NexmoSmsChannel(
+            $nexmo = Mockery::mock(Nexmo\Client::class), '4444444444'
+        );
+
+        $nexmo->shouldReceive('message->send')->with([
+            'from' => '5554443333',
+            'to' => '5555555555',
+            'text' => 'this is my message',
         ]);
 
-        $channel->send($notification);
+        $channel->send($notifiable, $notification);
     }
 }
 
@@ -43,3 +52,19 @@ class NotificationNexmoChannelTestNotifiable
     use Illuminate\Notifications\Notifiable;
     public $phone_number = '5555555555';
 }
+
+class NotificationNexmoChannelTestNotification extends Notification
+{
+    public function toNexmo($notifiable)
+    {
+        return new NexmoMessage('this is my message');
+    }
+}
+
+class NotificationNexmoChannelTestCustomFromNotification extends Notification
+{
+    public function toNexmo($notifiable)
+    {
+        return (new NexmoMessage('this is my message'))->from('5554443333');
+    }
+}
diff --git a/tests/Notifications/NotificationNotificationTest.php b/tests/Notifications/NotificationNotificationTest.php
deleted file mode 100644
index 1c3f650590b7..000000000000
--- a/tests/Notifications/NotificationNotificationTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-use Illuminate\Notifications\Notification;
-
-class NotificationNotificationTest extends PHPUnit_Framework_TestCase
-{
-    public function testLevelCanBeRetrieved()
-    {
-        $notification = new Notification;
-        $this->assertEquals('info', $notification->level());
-
-        $notification = new NotificationTestNotification;
-        $this->assertEquals('error', $notification->level());
-    }
-
-    public function testSubjectCanBeRetrieved()
-    {
-        $notification = new NotificationTestNotification;
-        $this->assertEquals('Notification Test Notification', $notification->subject());
-
-        $notification = new NotificationTestNotificationWithSubject;
-        $this->assertEquals('Zonda', $notification->subject());
-    }
-
-    public function testMessageBuilderCanBeRetrieved()
-    {
-        $notification = new Notification;
-        $this->assertInstanceOf('Illuminate\Notifications\MessageBuilder', $notification->line('Something'));
-    }
-}
-
-
-class NotificationTestNotification extends Notification
-{
-    public $level = 'error';
-}
-
-class NotificationTestNotificationWithSubject extends Notification
-{
-    public $subject = 'Zonda';
-}
diff --git a/tests/Notifications/NotificationRoutesNotificationsTest.php b/tests/Notifications/NotificationRoutesNotificationsTest.php
index f8740a430365..199b2bf8063e 100644
--- a/tests/Notifications/NotificationRoutesNotificationsTest.php
+++ b/tests/Notifications/NotificationRoutesNotificationsTest.php
@@ -17,25 +17,12 @@ public function testNotificationCanBeDispatched()
         $container->instance(Dispatcher::class, $factory);
         $notifiable = new RoutesNotificationsTestInstance;
         $instance = new StdClass;
-        $factory->shouldReceive('dispatch')->with($notifiable, $instance);
+        $factory->shouldReceive('send')->with([$notifiable], $instance);
         Container::setInstance($container);
 
         $notifiable->notify($instance);
     }
 
-    public function testNotificationCanBeDispatchedToGivenChannels()
-    {
-        $container = new Container;
-        $factory = Mockery::mock(Dispatcher::class);
-        $container->instance(Dispatcher::class, $factory);
-        $notifiable = new RoutesNotificationsTestInstance;
-        $instance = new StdClass;
-        $factory->shouldReceive('dispatch')->with($notifiable, $instance, ['channel']);
-        Container::setInstance($container);
-
-        $notifiable->notifyVia(['channel'], $instance);
-    }
-
     public function testNotificationOptionRouting()
     {
         $instance = new RoutesNotificationsTestInstance;
diff --git a/tests/Notifications/NotificationSendQueuedNotificationTest.php b/tests/Notifications/NotificationSendQueuedNotificationTest.php
index 63eea35f74e1..9991cdc04d6d 100644
--- a/tests/Notifications/NotificationSendQueuedNotificationTest.php
+++ b/tests/Notifications/NotificationSendQueuedNotificationTest.php
@@ -11,9 +11,9 @@ public function tearDown()
 
     public function testNotificationsCanBeSent()
     {
-        $job = new SendQueuedNotifications([$notification = new Illuminate\Notifications\Channels\Notification([])]);
+        $job = new SendQueuedNotifications('notifiables', 'notification');
         $manager = Mockery::mock('Illuminate\Notifications\ChannelManager');
-        $manager->shouldReceive('send')->once()->with($notification);
+        $manager->shouldReceive('sendNow')->once()->with('notifiables', 'notification');
         $job->handle($manager);
     }
 }
diff --git a/tests/Notifications/NotificationSlackChannelTest.php b/tests/Notifications/NotificationSlackChannelTest.php
index 74bb956d7a95..d91f75365d7b 100644
--- a/tests/Notifications/NotificationSlackChannelTest.php
+++ b/tests/Notifications/NotificationSlackChannelTest.php
@@ -1,6 +1,7 @@
 <?php
 
-use Illuminate\Notifications\Channels\Notification;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\SlackMessage;
 
 class NotificationSlackChannelTest extends PHPUnit_Framework_TestCase
 {
@@ -11,16 +12,8 @@ public function tearDown()
 
     public function testCorrectPayloadIsSentToSlack()
     {
-        $notification = new Notification([
-            $notifiable = new NotificationSlackChannelTestNotifiable,
-        ]);
-
-        $notification->subject = 'Subject';
-        $notification->level = 'success';
-        $notification->introLines = ['line 1'];
-        $notification->actionText = 'Text';
-        $notification->actionUrl = 'url';
-        $notification->outroLines = ['line 2'];
+        $notification = new NotificationSlackChannelTestNotification;
+        $notifiable = new NotificationSlackChannelTestNotifiable;
 
         $channel = new Illuminate\Notifications\Channels\SlackWebhookChannel(
             $http = Mockery::mock('GuzzleHttp\Client')
@@ -28,22 +21,25 @@ public function testCorrectPayloadIsSentToSlack()
 
         $http->shouldReceive('post')->with('url', [
             'json' => [
+                'text' => 'Content',
                 'attachments' => [
                     [
-                        'color' => 'good',
-                        'title' => 'Subject',
-                        'title_link' => 'url',
-                        'text' => 'line 1
-
-<url|Text>
-
-line 2',
+                        'title' => 'Laravel',
+                        'title_link' => 'https://laravel.com',
+                        'text' => 'Attachment Content',
+                        'fields' => [
+                            [
+                                'title' => 'Project',
+                                'value' => 'Laravel',
+                                'short' => true,
+                            ],
+                        ],
                     ],
                 ],
             ],
         ]);
 
-        $channel->send($notification);
+        $channel->send($notifiable, $notification);
     }
 }
 
@@ -51,10 +47,24 @@ class NotificationSlackChannelTestNotifiable
 {
     use Illuminate\Notifications\Notifiable;
 
-    public $phone_number = '5555555555';
-
     public function routeNotificationForSlack()
     {
         return 'url';
     }
 }
+
+class NotificationSlackChannelTestNotification extends Notification
+{
+    public function toSlack($notifiable)
+    {
+        return (new SlackMessage)
+                    ->content('Content')
+                    ->attachment(function ($attachment) {
+                        $attachment->title('Laravel', 'https://laravel.com')
+                                   ->content('Attachment Content')
+                                   ->fields([
+                                        'Project' => 'Laravel',
+                                    ]);
+                    });
+    }
+}
diff --git a/tests/Queue/QueueListenerTest.php b/tests/Queue/QueueListenerTest.php
index adf5cce44bcb..9a3734959a69 100755
--- a/tests/Queue/QueueListenerTest.php
+++ b/tests/Queue/QueueListenerTest.php
@@ -39,6 +39,6 @@ public function testMakeProcessCorrectlyFormatsCommandLine()
         $this->assertInstanceOf('Symfony\Component\Process\Process', $process);
         $this->assertEquals(__DIR__, $process->getWorkingDirectory());
         $this->assertEquals(3, $process->getTimeout());
-        $this->assertEquals($escape.PHP_BINARY.$escape.(defined('HHVM_VERSION') ? ' --php' : '')." artisan queue:work {$escape}connection{$escape} --queue={$escape}queue{$escape} --delay=1 --memory=2 --sleep=3 --tries=0", $process->getCommandLine());
+        $this->assertEquals($escape.PHP_BINARY.$escape." artisan queue:work {$escape}connection{$escape} --once --queue={$escape}queue{$escape} --delay=1 --memory=2 --sleep=3 --tries=0", $process->getCommandLine());
     }
 }
diff --git a/tests/Queue/QueueRedisQueueTest.php b/tests/Queue/QueueRedisQueueTest.php
index 573d32983a5d..abc0e5f86f9f 100644
--- a/tests/Queue/QueueRedisQueueTest.php
+++ b/tests/Queue/QueueRedisQueueTest.php
@@ -11,7 +11,7 @@ public function tearDown()
 
     public function testPushProperlyPushesJobOntoRedis()
     {
-        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\Database'), 'default'])->getMock();
+        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\PredisDatabase'), 'default'])->getMock();
         $queue->expects($this->once())->method('getRandomId')->will($this->returnValue('foo'));
         $redis->shouldReceive('connection')->once()->andReturn($redis);
         $redis->shouldReceive('rpush')->once()->with('queues:default', json_encode(['job' => 'foo', 'data' => ['data'], 'id' => 'foo', 'attempts' => 1]));
@@ -22,7 +22,7 @@ public function testPushProperlyPushesJobOntoRedis()
 
     public function testDelayedPushProperlyPushesJobOntoRedis()
     {
-        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getSeconds', 'getTime', 'getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\Database'), 'default'])->getMock();
+        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getSeconds', 'getTime', 'getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\PredisDatabase'), 'default'])->getMock();
         $queue->expects($this->once())->method('getRandomId')->will($this->returnValue('foo'));
         $queue->expects($this->once())->method('getSeconds')->with(1)->will($this->returnValue(1));
         $queue->expects($this->once())->method('getTime')->will($this->returnValue(1));
@@ -41,7 +41,7 @@ public function testDelayedPushProperlyPushesJobOntoRedis()
     public function testDelayedPushWithDateTimeProperlyPushesJobOntoRedis()
     {
         $date = Carbon\Carbon::now();
-        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getSeconds', 'getTime', 'getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\Database'), 'default'])->getMock();
+        $queue = $this->getMockBuilder('Illuminate\Queue\RedisQueue')->setMethods(['getSeconds', 'getTime', 'getRandomId'])->setConstructorArgs([$redis = m::mock('Illuminate\Redis\PredisDatabase'), 'default'])->getMock();
         $queue->expects($this->once())->method('getRandomId')->will($this->returnValue('foo'));
         $queue->expects($this->once())->method('getSeconds')->with($date)->will($this->returnValue(1));
         $queue->expects($this->once())->method('getTime')->will($this->returnValue(1));
diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
index 43a1126cbea9..2bea90f7e35e 100644
--- a/tests/Queue/RedisQueueIntegrationTest.php
+++ b/tests/Queue/RedisQueueIntegrationTest.php
@@ -1,13 +1,18 @@
 <?php
 
 use Mockery as m;
-use Illuminate\Redis\Database;
 use Illuminate\Queue\RedisQueue;
 use Illuminate\Container\Container;
 use Illuminate\Queue\Jobs\RedisJob;
+use Illuminate\Redis\PredisDatabase;
 
 class RedisQueueIntegrationTest extends PHPUnit_Framework_TestCase
 {
+    /**
+     * @var bool
+     */
+    private static $connectionFailedOnceWithDefaultsSkip = false;
+
     /**
      * @var Database
      */
@@ -21,15 +26,36 @@ class RedisQueueIntegrationTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->redis = new Database([
+
+        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
+        $port = getenv('REDIS_PORT') ?: 6379;
+
+        if (static::$connectionFailedOnceWithDefaultsSkip) {
+            $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
+
+            return;
+        }
+
+        $this->redis = new PredisDatabase([
             'cluster' => false,
             'default' => [
-                'host' => '127.0.0.1',
-                'port' => 6379,
+                'host' => $host,
+                'port' => $port,
                 'database' => 5,
+                'timeout' => 0.5,
             ],
         ]);
-        $this->redis->connection()->flushdb();
+
+        try {
+            $this->redis->connection()->flushdb();
+        } catch (\Exception $e) {
+            if ($host === '127.0.0.1' && $port === 6379 && getenv('REDIS_HOST') === false) {
+                $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
+                static::$connectionFailedOnceWithDefaultsSkip = true;
+
+                return;
+            }
+        }
 
         $this->queue = new RedisQueue($this->redis);
         $this->queue->setContainer(m::mock(Container::class));
@@ -39,7 +65,9 @@ public function tearDown()
     {
         parent::tearDown();
         m::close();
-        $this->redis->connection()->flushdb();
+        if ($this->redis) {
+            $this->redis->connection()->flushdb();
+        }
     }
 
     public function testExpiredJobsArePopped()
@@ -263,6 +291,21 @@ public function testDelete()
 
         $this->assertNull($this->queue->pop());
     }
+
+    public function testSize()
+    {
+        $this->assertEquals(0, $this->queue->size());
+        $this->queue->push(new RedisQueueIntegrationTestJob(1));
+        $this->assertEquals(1, $this->queue->size());
+        $this->queue->later(60, new RedisQueueIntegrationTestJob(2));
+        $this->assertEquals(2, $this->queue->size());
+        $this->queue->push(new RedisQueueIntegrationTestJob(3));
+        $this->assertEquals(3, $this->queue->size());
+        $job = $this->queue->pop();
+        $this->assertEquals(3, $this->queue->size());
+        $job->delete();
+        $this->assertEquals(2, $this->queue->size());
+    }
 }
 
 class RedisQueueIntegrationTestJob
diff --git a/tests/Redis/RedisConnectionTest.php b/tests/Redis/RedisConnectionTest.php
index 9d42c7406942..a777e006a086 100644
--- a/tests/Redis/RedisConnectionTest.php
+++ b/tests/Redis/RedisConnectionTest.php
@@ -35,6 +35,6 @@ protected function getRedis($cluster = false)
             ],
         ];
 
-        return new Illuminate\Redis\Database($servers);
+        return new Illuminate\Redis\PredisDatabase($servers);
     }
 }
diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php
index 68ca2ba798bd..9f6db0fbfc43 100644
--- a/tests/Support/SupportArrTest.php
+++ b/tests/Support/SupportArrTest.php
@@ -252,6 +252,17 @@ public function testHas()
 
         $this->assertFalse(Arr::has(null, null));
         $this->assertFalse(Arr::has([], null));
+
+        $array = ['products' => ['desk' => ['price' => 100]]];
+        $this->assertTrue(Arr::has($array, ['products.desk']));
+        $this->assertTrue(Arr::has($array, ['products.desk', 'products.desk.price']));
+        $this->assertTrue(Arr::has($array, ['products', 'products']));
+        $this->assertFalse(Arr::has($array, ['foo']));
+        $this->assertFalse(Arr::has($array, []));
+        $this->assertFalse(Arr::has($array, ['products.desk', 'products.price']));
+
+        $this->assertFalse(Arr::has([], [null]));
+        $this->assertFalse(Arr::has(null, [null]));
     }
 
     public function testIsAssoc()
@@ -426,6 +437,17 @@ public function testWhere()
         $this->assertEquals([1 => 200, 3 => 400], $array);
     }
 
+    public function testWhereKey()
+    {
+        $array = ['10' => 1, 'foo' => 3, 20 => 2];
+
+        $array = Arr::where($array, function ($value, $key) {
+            return is_numeric($key);
+        });
+
+        $this->assertEquals(['10' => 1, 20 => 2], $array);
+    }
+
     public function testForget()
     {
         $array = ['products' => ['desk' => ['price' => 100]]];
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
index de893a7430bd..3f9d5d5c7f69 100755
--- a/tests/Support/SupportCollectionTest.php
+++ b/tests/Support/SupportCollectionTest.php
@@ -335,6 +335,16 @@ public function testWhere()
         );
     }
 
+    public function testWhereStrict()
+    {
+        $c = new Collection([['v' => 3], ['v' => '3']]);
+
+        $this->assertEquals(
+            [['v' => 3]],
+            $c->whereStrict('v', 3)->values()->all()
+        );
+    }
+
     public function testWhereIn()
     {
         $c = new Collection([['v' => 1], ['v' => 2], ['v' => 3], ['v' => '3'], ['v' => 4]]);
@@ -533,6 +543,35 @@ public function testUniqueWithCallback()
         })->all());
     }
 
+    public function testUniqueStrict()
+    {
+        $c = new Collection([
+            [
+                'id' => '0',
+                'name' => 'zero',
+            ],
+            [
+                'id' => '00',
+                'name' => 'double zero',
+            ],
+            [
+                'id' => '0',
+                'name' => 'again zero',
+            ],
+        ]);
+
+        $this->assertEquals([
+            [
+                'id' => '0',
+                'name' => 'zero',
+            ],
+            [
+                'id' => '00',
+                'name' => 'double zero',
+            ],
+        ], $c->uniqueStrict('id')->all());
+    }
+
     public function testCollapse()
     {
         $data = new Collection([[$object1 = new StdClass], [$object2 = new StdClass]]);
@@ -856,6 +895,22 @@ public function testFlatMap()
         $this->assertEquals(['programming', 'basketball', 'music', 'powerlifting'], $data->all());
     }
 
+    public function testMapToAssoc()
+    {
+        $data = new Collection([
+            ['name' => 'Blastoise', 'type' => 'Water', 'idx' => 9],
+            ['name' => 'Charmander', 'type' => 'Fire', 'idx' => 4],
+            ['name' => 'Dragonair', 'type' => 'Dragon', 'idx' => 148],
+        ]);
+        $data = $data->mapToAssoc(function ($pokemon) {
+            return [$pokemon['name'] => $pokemon['type']];
+        });
+        $this->assertEquals(
+            ['Blastoise' => 'Water', 'Charmander' => 'Fire', 'Dragonair' => 'Dragon'],
+            $data->all()
+        );
+    }
+
     public function testTransform()
     {
         $data = new Collection(['first' => 'taylor', 'last' => 'otwell']);
@@ -1024,7 +1079,7 @@ public function testKeyByClosure()
         });
         $this->assertEquals([
             '0-taylorotwell' => ['firstname' => 'Taylor', 'lastname' => 'Otwell', 'locale' => 'US'],
-            '1-lucasmichot'  => ['firstname' => 'Lucas', 'lastname' => 'Michot', 'locale' => 'FR'],
+            '1-lucasmichot' => ['firstname' => 'Lucas', 'lastname' => 'Michot', 'locale' => 'FR'],
         ], $result->all());
     }
 
@@ -1053,6 +1108,36 @@ public function testContains()
         $this->assertFalse($c->contains('foo'));
     }
 
+    public function testContainsStrict()
+    {
+        $c = new Collection([1, 3, 5, '02']);
+
+        $this->assertTrue($c->containsStrict(1));
+        $this->assertFalse($c->containsStrict(2));
+        $this->assertTrue($c->containsStrict('02'));
+        $this->assertTrue($c->containsStrict(function ($value) {
+            return $value < 5;
+        }));
+        $this->assertFalse($c->containsStrict(function ($value) {
+            return $value > 5;
+        }));
+
+        $c = new Collection([['v' => 1], ['v' => 3], ['v' => '04'], ['v' => 5]]);
+
+        $this->assertTrue($c->containsStrict('v', 1));
+        $this->assertFalse($c->containsStrict('v', 2));
+        $this->assertFalse($c->containsStrict('v', 4));
+        $this->assertTrue($c->containsStrict('v', '04'));
+
+        $c = new Collection(['date', 'class', (object) ['foo' => 50], '']);
+
+        $this->assertTrue($c->containsStrict('date'));
+        $this->assertTrue($c->containsStrict('class'));
+        $this->assertFalse($c->containsStrict('foo'));
+        $this->assertFalse($c->containsStrict(null));
+        $this->assertTrue($c->containsStrict(''));
+    }
+
     public function testGettingSumFromCollection()
     {
         $c = new Collection([(object) ['foo' => 50], (object) ['foo' => 50]]);
@@ -1421,6 +1506,54 @@ public function testWithMultipleModeValues()
         $collection = new Collection([1, 2, 2, 1]);
         $this->assertEquals([1, 2], $collection->mode());
     }
+
+    public function testSliceOffset()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([4, 5, 6, 7, 8], $collection->slice(3)->values()->toArray());
+    }
+
+    public function testSliceNegativeOffset()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([6, 7, 8], $collection->slice(-3)->values()->toArray());
+    }
+
+    public function testSliceOffsetAndLength()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([4, 5, 6], $collection->slice(3, 3)->values()->toArray());
+    }
+
+    public function testSliceOffsetAndNegativeLength()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([4, 5, 6, 7], $collection->slice(3, -1)->values()->toArray());
+    }
+
+    public function testSliceNegativeOffsetAndLength()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([4, 5, 6], $collection->slice(-5, 3)->values()->toArray());
+    }
+
+    public function testSliceNegativeOffsetAndNegativeLength()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8]);
+        $this->assertEquals([3, 4, 5, 6], $collection->slice(-6, -2)->values()->toArray());
+    }
+
+    public function testCollectonFromTraversable()
+    {
+        $collection = new Collection(new \ArrayObject([1, 2, 3]));
+        $this->assertEquals([1, 2, 3], $collection->toArray());
+    }
+
+    public function testCollectonFromTraversableWithKeys()
+    {
+        $collection = new Collection(new \ArrayObject(['foo' => 1, 'bar' => 2, 'baz' => 3]));
+        $this->assertEquals(['foo' => 1, 'bar' => 2, 'baz' => 3], $collection->toArray());
+    }
 }
 
 class TestAccessorEloquentTestStub
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
index 767b01a9acb2..d7ed1a7b2cfe 100755
--- a/tests/Validation/ValidationValidatorTest.php
+++ b/tests/Validation/ValidationValidatorTest.php
@@ -1016,6 +1016,12 @@ public function testValidateDigits()
         $v = new Validator($trans, ['foo' => '123'], ['foo' => 'Digits:200']);
         $this->assertFalse($v->passes());
 
+        $v = new Validator($trans, ['foo' => '+2.37'], ['foo' => 'Digits:5']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['foo' => '2e7'], ['foo' => 'Digits:3']);
+        $this->assertTrue($v->fails());
+
         $trans = $this->getRealTranslator();
         $v = new Validator($trans, ['foo' => '12345'], ['foo' => 'digits_between:1,6']);
         $this->assertTrue($v->passes());
@@ -1025,6 +1031,9 @@ public function testValidateDigits()
 
         $v = new Validator($trans, ['foo' => '123'], ['foo' => 'digits_between:4,5']);
         $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['foo' => '+12.3'], ['foo' => 'digits_between:1,6']);
+        $this->assertFalse($v->passes());
     }
 
     public function testValidateSize()
@@ -1221,6 +1230,9 @@ public function testValidateIn()
 
         $v = new Validator($trans, ['name' => ['foo', 'bar']], ['name' => 'Alpha|In:foo,bar']);
         $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['name' => ['foo', []]], ['name' => 'Array|In:foo,bar']);
+        $this->assertFalse($v->passes());
     }
 
     public function testValidateNotIn()
@@ -1660,16 +1672,16 @@ public function validUrls()
             ['https://google.com'],
             ['http://illuminate.dev'],
             ['http://localhost'],
-            ['http://laravel.com/?'],
+            ['https://laravel.com/?'],
             ['http://президент.рф/'],
             ['http://스타벅스코리아.com'],
             ['http://xn--d1abbgf6aiiy.xn--p1ai/'],
-            ['http://laravel.com?'],
-            ['http://laravel.com?q=1'],
-            ['http://laravel.com/?q=1'],
-            ['http://laravel.com#'],
-            ['http://laravel.com#fragment'],
-            ['http://laravel.com/#fragment'],
+            ['https://laravel.com?'],
+            ['https://laravel.com?q=1'],
+            ['https://laravel.com/?q=1'],
+            ['https://laravel.com#'],
+            ['https://laravel.com#fragment'],
+            ['https://laravel.com/#fragment'],
         ];
     }
 
@@ -3035,6 +3047,76 @@ public function testUsingSettersWithImplicitRules()
         $this->assertFalse($v->passes());
     }
 
+    public function testInvalidMethod()
+    {
+        $trans = $this->getRealTranslator();
+
+        $v = new Validator($trans,
+            [
+                ['name' => 'John'],
+                ['name' => null],
+                ['name' => ''],
+            ],
+            [
+                '*.name' => 'required',
+            ]);
+
+        $this->assertEquals($v->invalid(), [
+            1 => ['name' => null],
+            2 => ['name' => ''],
+        ]);
+
+        $v = new Validator($trans,
+            [
+                'name' => '',
+            ],
+            [
+                'name' => 'required',
+            ]);
+
+        $this->assertEquals($v->invalid(), [
+            'name' => '',
+        ]);
+    }
+
+    public function testValidMethod()
+    {
+        $trans = $this->getRealTranslator();
+
+        $v = new Validator($trans,
+            [
+                ['name' => 'John'],
+                ['name' => null],
+                ['name' => ''],
+                ['name' => 'Doe'],
+            ],
+            [
+                '*.name' => 'required',
+            ]);
+
+        $this->assertEquals($v->valid(), [
+            0 => ['name' => 'John'],
+            3 => ['name' => 'Doe'],
+        ]);
+
+        $v = new Validator($trans,
+            [
+                'name' => 'Carlos',
+                'age' => 'unknown',
+                'gender' => 'male',
+            ],
+            [
+                'name' => 'required',
+                'gender' => 'in:male,female',
+                'age' => 'required|int',
+            ]);
+
+        $this->assertEquals($v->valid(), [
+            'name' => 'Carlos',
+            'gender' => 'male',
+        ]);
+    }
+
     protected function getTranslator()
     {
         return m::mock('Symfony\Component\Translation\TranslatorInterface');
diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
index 8a663eb0cb19..71ed30662bdd 100644
--- a/tests/View/ViewBladeCompilerTest.php
+++ b/tests/View/ViewBladeCompilerTest.php
@@ -439,6 +439,18 @@ public function testForeachStatementsAreCompiled()
         $this->assertEquals($expected, $compiler->compileString($string));
     }
 
+    public function testForeachStatementsAreCompileWithUppercaseSyntax()
+    {
+        $compiler = new BladeCompiler($this->getFiles(), __DIR__);
+        $string = '@foreach ($this->getUsers() AS $user)
+test
+@endforeach';
+        $expected = '<?php $__currentLoopData = $this->getUsers(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $user): $__env->incrementLoopIndices(); $loop = $__env->getFirstLoop(); ?>
+test
+<?php endforeach; $__env->popLoop(); $loop = $__env->getFirstLoop(); ?>';
+        $this->assertEquals($expected, $compiler->compileString($string));
+    }
+
     public function testNestedForeachStatementsAreCompiled()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
index 3115be8cec72..640f497dd3fe 100755
--- a/tests/View/ViewFactoryTest.php
+++ b/tests/View/ViewFactoryTest.php
@@ -455,6 +455,7 @@ public function testAddingLoops()
         $factory->addLoop([1, 2, 3]);
 
         $expectedLoop = [
+            'iteration' => 0,
             'index' => 0,
             'remaining' => 3,
             'count' => 3,
@@ -469,6 +470,7 @@ public function testAddingLoops()
         $factory->addLoop([1, 2, 3, 4]);
 
         $secondExpectedLoop = [
+            'iteration' => 0,
             'index' => 0,
             'remaining' => 4,
             'count' => 4,
@@ -491,6 +493,7 @@ public function testAddingUncountableLoop()
         $factory->addLoop('');
 
         $expectedLoop = [
+            'iteration' => 0,
             'index' => 0,
             'remaining' => null,
             'count' => null,
@@ -513,7 +516,8 @@ public function testIncrementingLoopIndices()
 
         $factory->incrementLoopIndices();
 
-        $this->assertEquals(2, $factory->getLoopStack()[0]['index']);
+        $this->assertEquals(2, $factory->getLoopStack()[0]['iteration']);
+        $this->assertEquals(1, $factory->getLoopStack()[0]['index']);
         $this->assertEquals(2, $factory->getLoopStack()[0]['remaining']);
     }
 
@@ -540,7 +544,8 @@ public function testIncrementingLoopIndicesOfUncountable()
 
         $factory->incrementLoopIndices();
 
-        $this->assertEquals(2, $factory->getLoopStack()[0]['index']);
+        $this->assertEquals(2, $factory->getLoopStack()[0]['iteration']);
+        $this->assertEquals(1, $factory->getLoopStack()[0]['index']);
         $this->assertFalse($factory->getLoopStack()[0]['first']);
         $this->assertNull($factory->getLoopStack()[0]['remaining']);
         $this->assertNull($factory->getLoopStack()[0]['last']);