Merge remote-tracking branch 'laravel/master'

# Conflicts: #	.gitattributes #	app/Http/Controllers/Auth/RegisterController.php #	package.json #	public/css/app.css

Author: 徐志勇

.env.example

@@ -1,3 +1,4 @@
+APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
@@ -23,7 +24,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
-*.scss linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.gitignore

@@ -1,11 +1,14 @@
 /node_modules
-/public/storage
 /public/hot
+/public/storage
 /storage/*.key
 /vendor
 /.idea
+/.vagrant
 Homestead.json
 Homestead.yaml
+npm-debug.log
+yarn-error.log
 .env
 .idea
 _ide_helper.php

CHANGELOG.md

@@ -0,0 +1,56 @@
+# Release Notes
+
+## v5.4.23 (2017-05-11)
+
+### Added
+- Added SQL Server connection ([#4253](https://github.com/laravel/laravel/pull/4253), [#4254](https://github.com/laravel/laravel/pull/4254))
+
+### Changed
+- Switch to using meta
+- Use CSRF token from `meta` tag, instead of `window.Laravel` object ([#4260](https://github.com/laravel/laravel/pull/4260))
+- Log console error if CSRF token cannot be found ([1155245](https://github.com/laravel/laravel/commit/1155245a596113dc2cd0e9083603fa11df2eacd9))
+
+### Fixed
+- Added missing `ipv4` and `ipv6` validation messages ([#4261](https://github.com/laravel/laravel/pull/4261))
+
+
+## v5.4.21 (2017-04-28)
+
+### Added
+- Added `FILESYSTEM_DRIVER` and `FILESYSTEM_CLOUD` environment variables ([#4236](https://github.com/laravel/laravel/pull/4236))
+
+### Changed
+- Use lowercase doctype ([#4241](https://github.com/laravel/laravel/pull/4241))
+
+
+## v5.4.19 (2017-04-20)
+
+### Added
+- Added `optimize-autoloader` to `config` in `composer.json` ([#4189](https://github.com/laravel/laravel/pull/4189))
+- Added `.vagrant` directory to `.gitignore` ([#4191](https://github.com/laravel/laravel/pull/4191))
+- Added `npm run development` and `npm run prod` commands ([#4190](https://github.com/laravel/laravel/pull/4190), [#4193](https://github.com/laravel/laravel/pull/4193))
+- Added `APP_NAME` environment variable ([#4204](https://github.com/laravel/laravel/pull/4204))
+
+### Changed
+- Changed Laravel Mix version to `0.*` ([#4188](https://github.com/laravel/laravel/pull/4188))
+- Add to axios defaults instead of overwriting them ([#4208](https://github.com/laravel/laravel/pull/4208))
+- Added `string` validation rule to `RegisterController` ([#4212](https://github.com/laravel/laravel/pull/4212))
+- Moved Vue inclusion from `bootstrap.js` to `app.js` ([17ec5c5](https://github.com/laravel/laravel/commit/17ec5c51d60bb05985f287f09041c56fcd41d9ce))
+- Only load libraries if present ([d905b2e](https://github.com/laravel/laravel/commit/d905b2e7bede2967d37ed7b260cd9d526bb9cabd))
+- Ignore the NPM debug log ([#4232](https://github.com/laravel/laravel/pull/4232))
+- Use fluent middleware definition in `LoginController` ([#4229](https://github.com/laravel/laravel/pull/4229))
+
+
+## v5.4.16 (2017-03-17)
+
+### Added
+- Added `unix_socket` to `mysql` in `config/database.php` ()[#4179](https://github.com/laravel/laravel/pull/4179))
+- Added Pusher example code to `bootstrap.js` ([31c2623](https://github.com/laravel/laravel/commit/31c262301899b6cd1a4ce2631ad0e313b444b131))
+
+### Changed
+- Use `smtp.mailtrap.io` as default `MAIL_HOST` ([#4182](https://github.com/laravel/laravel/pull/4182))
+- Use `resource_path()` in `config/view.php` ([#4165](https://github.com/laravel/laravel/pull/4165))
+- Use `cross-env` binary ([#4167](https://github.com/laravel/laravel/pull/4167))
+
+### Removed
+- Remove index from password reset `token` column ([#4180](https://github.com/laravel/laravel/pull/4180))

app/Http/Controllers/Auth/LoginController.php

@@ -34,6 +34,6 @@ class LoginController extends Controller
  */
  public function __construct()
  {
- $this->middleware('guest', ['except' => 'logout']);
+ $this->middleware('guest')->except('logout');
  }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -49,18 +49,17 @@ public function __construct()
  protected function validator(array $data)
  {
  return Validator::make($data, [
- 'name'  => 'required|max:255',
- 'email'  => 'required|email|max:255|unique:users',
- 'password' => 'required|min:6|confirmed',
+ 'name' => 'required|string|max:255',
+ 'email' => 'required|string|email|max:255|unique:users',
+ 'password' => 'required|string|min:6|confirmed',
  ]);
  }
 
  /**
  * Create a new user instance after a valid registration.
  *
- * @param array $data
- *
- * @return User
+ * @param array $data
+ * @return \App\User
  */
  protected function create(array $data)
  {

app/Providers/EventServiceProvider.php

@@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider
  * @var array
  */
  protected $listen = [
- 'App\Events\SomeEvent' => [
+ 'App\Events\Event' => [
  'App\Listeners\EventListener',
  ],
  ];

artisan

@@ -40,7 +40,7 @@ $status = $kernel->handle(
 | Shutdown The Application
 |--------------------------------------------------------------------------
 |
-| Once Artisan has finished running. We will fire off the shutdown events
+| Once Artisan has finished running, we will fire off the shutdown events
 | so that any final work may be done by the application before we shut
 | down the process. This is the last thing to happen to the request.
 |

bootstrap/autoload.php

@@ -9,8 +9,8 @@
 |
 | Composer provides a convenient, automatically generated class loader
 | for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
+| into the script here so we do not have to manually load any of
+| our application's PHP classes. It just feels great to relax.
 |
 */
 

composer.json

@@ -58,6 +58,7 @@
  },
  "config": {
  "preferred-install": "dist",
- "sort-packages": true
+ "sort-packages": true,
+ "optimize-autoloader": true
  }
 }