Merge branch 'master' of github.com:overtrue/laravel-wechat

overtrue · overtrue · commit 305b7510a3d5 · 2016-09-05T18:48:54.000+08:00
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -37,7 +37,6 @@ protected function setupConfig()
         $source = realpath(__DIR__.'/config.php');
 
         if ($this->app instanceof LaravelApplication) {
-
             if ($this->app->runningInConsole()) {
                 $this->publishes([
                     $source => config_path('wechat.php'),
@@ -82,7 +81,7 @@ public function provides()
     }
 
     /**
-     * 创建模拟登录
+     * 创建模拟登录.
      */
     protected function setUpMockAuthUser()
     {
diff --git a/src/config.php b/src/config.php
@@ -58,7 +58,7 @@
     //     // ...
     // ],
 
-    /**
+    /*
      * 开发模式下的免授权模拟授权用户资料
      *
      * 当 enable_mock 为 true 则会启用模拟微信授权，用于开发时使用，开发完成请删除或者改为 false 即可

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ protected function setupConfig()`
`37`	`37`	`$source = realpath(__DIR__.'/config.php');`
`38`	`38`
`39`	`39`	`if ($this->app instanceof LaravelApplication) {`
`40`		`-`
`41`	`40`	`if ($this->app->runningInConsole()) {`
`42`	`41`	`$this->publishes([`
`43`	`42`	`$source => config_path('wechat.php'),`
`@@ -82,7 +81,7 @@ public function provides()`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`/**`
`85`		`- * 创建模拟登录`
	`84`	`+ * 创建模拟登录.`
`86`	`85`	`*/`
`87`	`86`	`protected function setUpMockAuthUser()`
`88`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`// // ...`
`59`	`59`	`// ],`
`60`	`60`
`61`		`- /**`
	`61`	`+ /*`
`62`	`62`	`* 开发模式下的免授权模拟授权用户资料`
`63`	`63`	`*`
`64`	`64`	`* 当 enable_mock 为 true 则会启用模拟微信授权，用于开发时使用，开发完成请删除或者改为 false 即可`