[5.3] Added support for PhpRedis

.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

.gitignore

@@ -4,3 +4,4 @@ composer.lock
 .php_cs.cache
 .DS_Store
 Thumbs.db
+/phpunit.xml

.travis.yml

@@ -3,7 +3,6 @@ language: php
 php:
   - 5.6
   - 7.0
-  - hhvm
 
 env:
   global:

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

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.

composer.json

@@ -3,15 +3,15 @@
     "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"
     },
     "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.*",

phpunit.xml → 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>

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
 

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);
             }
 

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

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">

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">

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();
     }
 
     /**

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.');
     }
 }

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;

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)) {

src/Illuminate/Auth/composer.json

@@ -2,15 +2,15 @@
     "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"
     },
     "authors": [
         {
             "name": "Taylor Otwell",
-            "email": "taylorotwell@gmail.com"
+            "email": "taylor@laravel.com"
         }
     ],
     "require": {

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);
     }
 }

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();