Merge remote-tracking branch 'origin/5.5' into 5.5

Author: taylorotwell

CHANGELOG-5.5.md

@@ -1,5 +1,20 @@
 # Release Notes for 5.5.x
 
+## [Unreleased]
+
+### Added
+- Added `:input` placeholder in validation error messages ([#21175](https://github.com/laravel/framework/pull/21175))
+- Added `@includeFirst` Blade directive ([#21172](https://github.com/laravel/framework/pull/21172))
+- Allow setting column styles for tables in Artisan commands ([#21169](https://github.com/laravel/framework/pull/21169))
+
+### Changed
+- Support `null` on `Model::UPDATED_AT` ([#21178](https://github.com/laravel/framework/pull/21178))
+- Render views from config while building error views ([#21145](https://github.com/laravel/framework/pull/21145))
+
+### Fixed
+- Ignore `SELECT` bindings in `prepareBindingsForUpdate()` ([#21173](https://github.com/laravel/framework/pull/21173))
+
+
 ## v5.5.4 (2017-09-13)
 
 ### Added

README.md

@@ -26,7 +26,7 @@ Laravel is accessible, yet powerful, providing tools needed for large, robust ap
 
 Laravel has the most extensive and thorough documentation and video tutorial library of any modern web application framework. The [Laravel documentation](https://laravel.com/docs) is thorough, complete, and makes it a breeze to get started learning the framework.
 
-If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 900 video tutorials covering a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
+If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials covering a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
 
 ## Contributing
 

src/Illuminate/Console/Command.php

@@ -378,18 +378,25 @@ public function choice($question, array $choices, $default = null, $attempts = n
      *
      * @param  array   $headers
      * @param  \Illuminate\Contracts\Support\Arrayable|array  $rows
-     * @param  string  $style
+     * @param  string  $tableStyle
+     * @param  array   $columnStyles
      * @return void
      */
-    public function table($headers, $rows, $style = 'default')
+    public function table($headers, $rows, $tableStyle = 'default', array $columnStyles = [])
     {
         $table = new Table($this->output);
 
         if ($rows instanceof Arrayable) {
             $rows = $rows->toArray();
         }
 
-        $table->setHeaders((array) $headers)->setRows($rows)->setStyle($style)->render();
+        $table->setHeaders((array) $headers)->setRows($rows)->setStyle($tableStyle);
+
+        foreach ($columnStyles as $columnIndex => $columnStyle) {
+            $table->setColumnStyle($columnIndex, $columnStyle);
+        }
+
+        $table->render();
     }
 
     /**

src/Illuminate/Database/Console/Factories/FactoryMakeCommand.php

@@ -78,7 +78,7 @@ protected function getPath($name)
     protected function getOptions()
     {
         return [
-            ['model', null, InputOption::VALUE_OPTIONAL, 'The name of the model'],
+            ['model', 'm', InputOption::VALUE_OPTIONAL, 'The name of the model'],
         ];
     }
 }

src/Illuminate/Foundation/Auth/AuthenticatesUsers.php

@@ -24,7 +24,7 @@ public function showLoginForm()
      * Handle a login request to the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      */
     public function login(Request $request)
     {
@@ -74,7 +74,7 @@ protected function validateLogin(Request $request)
     protected function attemptLogin(Request $request)
     {
         return $this->guard()->attempt(
-            $this->credentials($request), $request->has('remember')
+            $this->credentials($request), $request->filled('remember')
         );
     }
 
@@ -121,7 +121,9 @@ protected function authenticated(Request $request, $user)
      * Get the failed login response instance.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws ValidationException
      */
     protected function sendFailedLoginResponse(Request $request)
     {

src/Illuminate/Foundation/Auth/ResetsPasswords.php

@@ -33,7 +33,7 @@ public function showResetForm(Request $request, $token = null)
      * Reset the given user's password.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     public function reset(Request $request)
     {
@@ -117,7 +117,7 @@ protected function resetPassword($user, $password)
      * Get the response for a successful password reset.
      *
      * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetResponse($response)
     {
@@ -130,7 +130,7 @@ protected function sendResetResponse($response)
      *
      * @param  \Illuminate\Http\Request
      * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetFailedResponse(Request $request, $response)
     {

src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php

@@ -21,7 +21,7 @@ public function showLinkRequestForm()
      * Send a reset link to the given user.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     public function sendResetLinkEmail(Request $request)
     {
@@ -54,7 +54,7 @@ protected function validateEmail(Request $request)
      * Get the response for a successful password reset link.
      *
      * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetLinkResponse($response)
     {
@@ -66,7 +66,7 @@ protected function sendResetLinkResponse($response)
      *
      * @param  \Illuminate\Http\Request
      * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendResetLinkFailedResponse(Request $request, $response)
     {

src/Illuminate/Support/Collection.php

@@ -1348,7 +1348,7 @@ public function sortBy($callback, $options = SORT_REGULAR, $descending = false)
         // function which we were given. Then, we will sort the returned values and
         // and grab the corresponding values for the sorted keys from this array.
         foreach ($this->items as $key => $value) {
-            $results[$key] = $callback($value, $key);
+            $results[$key] = [$callback($value, $key), $key];
         }
 
         $descending ? arsort($results, $options)

src/Illuminate/Support/Str.php

@@ -118,7 +118,7 @@ public static function contains($haystack, $needles)
     public static function endsWith($haystack, $needles)
     {
         foreach ((array) $needles as $needle) {
-            if (substr($haystack, -strlen($needle)) === (string) $needle) {
+            if (mb_substr($haystack, -mb_strlen($needle)) === (string) $needle) {
                 return true;
             }
         }
@@ -328,10 +328,10 @@ public static function replaceFirst($search, $replace, $subject)
             return $subject;
         }
 
-        $position = strpos($subject, $search);
+        $position = mb_strpos($subject, $search);
 
         if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
+            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position + mb_strlen($search));
         }
 
         return $subject;
@@ -347,10 +347,10 @@ public static function replaceFirst($search, $replace, $subject)
      */
     public static function replaceLast($search, $replace, $subject)
     {
-        $position = strrpos($subject, $search);
+        $position = mb_strrpos($subject, $search);
 
         if ($position !== false) {
-            return substr_replace($subject, $replace, $position, strlen($search));
+            return mb_substr($subject, 0, $position).$replace.mb_substr($subject, $position + mb_strlen($search));
         }
 
         return $subject;
@@ -466,7 +466,7 @@ public static function snake($value, $delimiter = '_')
     public static function startsWith($haystack, $needles)
     {
         foreach ((array) $needles as $needle) {
-            if ($needle !== '' && substr($haystack, 0, strlen($needle)) === (string) $needle) {
+            if ($needle !== '' && mb_substr($haystack, 0, mb_strlen($needle)) === (string) $needle) {
                 return true;
             }
         }

tests/Support/SupportCollectionTest.php

@@ -817,6 +817,15 @@ public function testSortByAlwaysReturnsAssoc()
         $this->assertEquals([1 => 'dayle', 0 => 'taylor'], $data->all());
     }
 
+    public function testSortByMaintainsOriginalOrderOfItemsWithIdenticalValues()
+    {
+        $data = new Collection([['name' => 'taylor'], ['name' => 'dayle'], ['name' => 'dayle']]);
+        $data = $data->sortBy('name');
+
+        $this->assertEquals([['name' => 'dayle'], ['name' => 'dayle'], ['name' => 'taylor']], array_values($data->all()));
+        $this->assertEquals([1, 2, 0], $data->keys()->all());
+    }
+
     public function testReverse()
     {
         $data = new Collection(['zaeed', 'alan']);