Merge pull request #114 from mingyoung/routes-for-lumen

Support Lumen routes.

src/Controllers/OpenPlatformController.php

@@ -4,10 +4,9 @@
 
 use Event;
 use EasyWeChat\Foundation\Application;
-use Illuminate\Routing\Controller;
 use Overtrue\LaravelWechat\Events\OpenPlatform as Events;
 
-class OpenPlatformController extends Controller
+class OpenPlatformController
 {
     /**
      * Events.
@@ -29,11 +28,7 @@ class OpenPlatformController extends Controller
      */
     public function index(Application $application)
     {
-        $server = $application->open_platform->server;
-
-        $server->setMessageHandler([$this, 'handle']);
-
-        return $server->serve();
+        return $application->open_platform->server->setMessageHandler([$this, 'handle'])->serve();
     }
 
     /**

src/Routing/Adapters/Adapter.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Overtrue\LaravelWechat\Routing\Adapters;
+
+use Illuminate\Container\Container;
+
+abstract class Adapter
+{
+    /**
+     * @var \Illuminate\Container\Container
+     */
+    protected $app;
+
+    /**
+     * Adapter constructor.
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+    }
+
+    abstract public function group(array $attributes, $callback);
+
+    abstract public function any($uri, $action);
+}

src/Routing/Adapters/Laravel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Overtrue\LaravelWechat\Routing\Adapters;
+
+class Laravel extends Adapter
+{
+    public function group(array $attributes, $callback)
+    {
+        $this->app->router->group($attributes, $callback);
+    }
+
+    public function any($uri, $action)
+    {
+        $this->app->router->any($uri, $action);
+    }
+}

src/Routing/Adapters/Lumen.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Overtrue\LaravelWechat\Routing\Adapters;
+
+class Lumen extends Adapter
+{
+    public function group(array $attributes, $callback)
+    {
+        $this->app->group($attributes, $callback);
+    }
+
+    public function any($uri, $action)
+    {
+        $verbs = ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'];
+
+        $this->app->addRoute($verbs, $uri, $action);
+    }
+}

src/Routing/Router.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Overtrue\LaravelWechat\Routing;
+
+use Illuminate\Container\Container;
+use Illuminate\Foundation\Application as LaravelApplication;
+use Laravel\Lumen\Application as LumenApplication;
+
+class Router
+{
+    /**
+     * Routing adapter instance.
+     *
+     * @var \Overtrue\LaravelWechat\Routing\Adapters\Adapter
+     */
+    protected $adapter;
+
+    /**
+     * Create a new route registrar instance.
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        if ($app instanceof LaravelApplication) {
+            $this->adapter = new Adapters\Laravel($app);
+        } elseif ($app instanceof LumenApplication) {
+            $this->adapter = new Adapters\Lumen($app);
+        }
+    }
+
+    /**
+     * @param string $method
+     * @param array  $arguments
+     */
+    public function __call($method, $arguments)
+    {
+        call_user_func_array([$this->adapter, $method], $arguments);
+    }
+}

src/ServiceProvider.php

@@ -2,11 +2,11 @@
 
 namespace Overtrue\LaravelWechat;
 
-use EasyWeChat\Foundation\Application as EasyWeChatApplication;
+use EasyWeChat\Foundation\Application as EasyWeChat;
 use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 use Laravel\Lumen\Application as LumenApplication;
-use Overtrue\LaravelWechat\Providers\RouteServiceProvider;
+use Overtrue\LaravelWechat\Routing\Router;
 use Overtrue\Socialite\User as SocialiteUser;
 
 class ServiceProvider extends LaravelServiceProvider
@@ -20,7 +20,9 @@ public function boot()
     {
         $this->setupConfig();
 
-        $this->app->register(RouteServiceProvider::class);
+        if ($this->config('route.enabled')) {
+            $this->registerRoutes();
+        }
     }
 
     /**
@@ -55,18 +57,18 @@ protected function setupConfig()
      */
     public function register()
     {
-        $this->app->singleton(EasyWeChatApplication::class, function ($laravelApp) {
-            $app = new EasyWeChatApplication(config('wechat'));
+        $this->app->singleton(EasyWeChat::class, function ($app) {
+            $easywechat = new EasyWeChat(config('wechat'));
             if (config('wechat.use_laravel_cache')) {
-                $app->cache = new CacheBridge();
+                $easywechat->cache = new CacheBridge();
             }
-            $app->server->setRequest($laravelApp['request']);
+            $easywechat->server->setRequest($app['request']);
 
-            return $app;
+            return $easywechat;
         });
 
-        $this->app->alias(EasyWeChatApplication::class, 'wechat');
-        $this->app->alias(EasyWeChatApplication::class, 'easywechat');
+        $this->app->alias(EasyWeChat::class, 'wechat');
+        $this->app->alias(EasyWeChat::class, 'easywechat');
     }
 
     /**
@@ -89,4 +91,42 @@ protected function setUpMockAuthUser()
             session(['wechat.oauth_user' => $user]);
         }
     }
+
+    /**
+     * Register routes.
+     */
+    protected function registerRoutes()
+    {
+        $router = new Router($this->app);
+
+        $router->group($this->routeAttributes(), function () use ($router) {
+            $router->any($this->config('route.open_platform_serve_url'), 'OpenPlatformController@index');
+        });
+    }
+
+
+    /**
+     * Get Route attributes.
+     *
+     * @return array
+     */
+    public function routeAttributes()
+    {
+        return array_merge($this->config('route.attributes', []), [
+            'namespace' => '\\Overtrue\\LaravelWechat\\Controllers',
+        ]);
+    }
+
+    /**
+     * Get config value by key.
+     *
+     * @param string $key
+     * @param mixed|null $default
+     *
+     * @return mixed
+     */
+    private function config($key, $default = null)
+    {
+        return $this->app->make('config')->get("wechat.{$key}", $default);
+    }
 }