chore: Merged laravel:master to master branch, Updated Laravel version to 5.6.7

Author: medz

composer.json

@@ -113,8 +113,7 @@
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "~1.0",
         "nunomaduro/collision": "~2.0",
-        "phpunit/phpunit": "~7.0",
-        "symfony/thanks": "^1.0"
+        "phpunit/phpunit": "~7.0"
     },
     "autoload": {
         "files": [

config/filesystems.php

@@ -53,7 +53,7 @@
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
-    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
     |
     */
 

docs/merge-laravel-master-branch-to-plus-master-guide.md

@@ -28,7 +28,7 @@ Plus（ThinkSNS Plus 缩写） 是基于 [laravel/laravel](https://github.com/la
 
 上次 Merge 的 Larave 版本 | 上次 Merge 操作执行时间
 ------------------------|----------------------
-5.6.5 | 2018-02-23
+5.6.7 | 2018-03-06
 
 <a name="add-laravel-repo"></a>
 ## 添加 Laravel 远端到本地仓库