5.8 兼容问题。 (overtrue#301)

* laravel 5.4 起弃用 Event 的 fire 方法。5.8 起正式移除该方法。

* laravel 5.8 起弃用 str_* 和 arr_* 助手方法，5.9 起移除。

Author: jinchun

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 composer.lock
-.php_cs.cache
+.php_cs.cache
+.idea

README.md

@@ -181,13 +181,14 @@ Route::group(['middleware' => ['wechat.oauth:default,snsapi_userinfo']], functio
 > 以下字段在 scope 为 `snsapi_userinfo` 时尽可能配置齐全哦，当然，如果你的模式只是 `snsapi_base` 的话只需要 `openid` 就好了。
 
 ```php
+use Illuminate\Support\Arr;
 use Overtrue\Socialite\User as SocialiteUser;
 
 $user = new SocialiteUser([
-                'id' => array_get($user, 'openid'),
-                'name' => array_get($user, 'nickname'),
-                'nickname' => array_get($user, 'nickname'),
-                'avatar' => array_get($user, 'headimgurl'),
+                'id' => Arr::get($user, 'openid'),
+                'name' => Arr::get($user, 'nickname'),
+                'nickname' => Arr::get($user, 'nickname'),
+                'avatar' => Arr::get($user, 'headimgurl'),
                 'email' => null,
                 'original' => [],
                 'provider' => 'WeChat',

src/Controllers/OpenPlatformController.php

@@ -13,7 +13,6 @@
 
 use EasyWeChat\OpenPlatform\Application;
 use EasyWeChat\OpenPlatform\Server\Guard;
-use Event;
 use Overtrue\LaravelWeChat\Events\OpenPlatform as Events;
 
 class OpenPlatformController extends Controller
@@ -30,16 +29,16 @@ public function __invoke(Application $application)
         $server = $application->server;
 
         $server->on(Guard::EVENT_AUTHORIZED, function ($payload) {
-            Event::fire(new Events\Authorized($payload));
+            event(new Events\Authorized($payload));
         });
         $server->on(Guard::EVENT_UNAUTHORIZED, function ($payload) {
-            Event::fire(new Events\Unauthorized($payload));
+            event(new Events\Unauthorized($payload));
         });
         $server->on(Guard::EVENT_UPDATE_AUTHORIZED, function ($payload) {
-            Event::fire(new Events\UpdateAuthorized($payload));
+            event(new Events\UpdateAuthorized($payload));
         });
         $server->on(Guard::EVENT_COMPONENT_VERIFY_TICKET, function ($payload) {
-            Event::fire(new Events\VerifyTicketRefreshed($payload));
+            event(new Events\VerifyTicketRefreshed($payload));
         });
 
         return $server->serve();

src/Middleware/OAuthAuthenticate.php

@@ -12,8 +12,9 @@
 namespace Overtrue\LaravelWeChat\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Event;
 use http\Env\Request;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Overtrue\LaravelWeChat\Events\WeChatUserAuthorized;
 
 /**
@@ -33,7 +34,7 @@ class OAuthAuthenticate
     public function handle($request, Closure $next, $account = 'default', $scopes = null)
     {
         // $account 与 $scopes 写反的情况
-        if (is_array($scopes) || (\is_string($account) && str_is('snsapi_*', $account))) {
+        if (is_array($scopes) || (\is_string($account) && Str::is('snsapi_*', $account))) {
             list($account, $scopes) = [$scopes, $account];
             $account || $account = 'default';
         }
@@ -42,7 +43,7 @@ public function handle($request, Closure $next, $account = 'default', $scopes =
         $sessionKey = \sprintf('wechat.oauth_user.%s', $account);
         $config = config(\sprintf('wechat.official_account.%s', $account), []);
         $officialAccount = app(\sprintf('wechat.official_account.%s', $account));
-        $scopes = $scopes ?: array_get($config, 'oauth.scopes', ['snsapi_base']);
+        $scopes = $scopes ?: Arr::get($config, 'oauth.scopes', ['snsapi_base']);
 
         if (is_string($scopes)) {
             $scopes = array_map('trim', explode(',', $scopes));
@@ -55,7 +56,7 @@ public function handle($request, Closure $next, $account = 'default', $scopes =
                 session([$sessionKey => $officialAccount->oauth->user() ?? []]);
                 $isNewSession = true;
 
-                Event::fire(new WeChatUserAuthorized(session($sessionKey), $isNewSession, $account));
+                event(new WeChatUserAuthorized(session($sessionKey), $isNewSession, $account));
 
                 return redirect()->to($this->getTargetUrl($request));
             }
@@ -65,7 +66,7 @@ public function handle($request, Closure $next, $account = 'default', $scopes =
             return $officialAccount->oauth->scopes($scopes)->redirect($request->fullUrl());
         }
 
-        Event::fire(new WeChatUserAuthorized(session($sessionKey), $isNewSession, $account));
+        event(new WeChatUserAuthorized(session($sessionKey), $isNewSession, $account));
 
         return $next($request);
     }
@@ -79,7 +80,7 @@ public function handle($request, Closure $next, $account = 'default', $scopes =
      */
     protected function getTargetUrl($request)
     {
-        $queries = array_except($request->query(), ['code', 'state']);
+        $queries = Arr::except($request->query(), ['code', 'state']);
 
         return $request->url().(empty($queries) ? '' : '?'.http_build_query($queries));
     }