add support for customizing providers to be reset in every request.

Author: albertcht

config/swoole_http.php

@@ -18,4 +18,7 @@
             'daemonize' => env('SWOOLE_HTTP_DAEMONIZE', 0),
         ],
     ],
+    'providers' => [
+        // App\Providers\AuthServiceProvider::class,
+    ]
 ];

src/Server/Application.php

@@ -2,6 +2,7 @@
 
 namespace SwooleTW\Http\Server;
 
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
@@ -34,6 +35,13 @@ class Application
      */
     protected $kernel;
 
+    /**
+     * Preserved service providers to be reset.
+     *
+     * @var array
+     */
+    protected $providers = [];
+
     /**
      * Make an application.
      *
@@ -58,6 +66,7 @@ public function __construct($framework, $basePath = null)
         $this->setBasePath($basePath);
 
         $this->bootstrap();
+        $this->initProviders();
     }
 
     /**
@@ -71,6 +80,38 @@ protected function bootstrap()
         }
     }
 
+    /**
+     * Initialize customized service providers.
+     */
+    protected function initProviders()
+    {
+        $app = $this->getApplication();
+        $providers = $app['config']->get('swoole_http.providers');
+
+        foreach ($providers as $provider) {
+            if (! $provider instanceof ServiceProvider) {
+                $provider = new $provider($app);
+            }
+            $this->providers[get_class($provider)] = $provider;
+        }
+    }
+
+    /**
+     * Re-register and reboot service providers.
+     */
+    public function resetProviders()
+    {
+        foreach ($this->providers as $key => $provider) {
+            if (method_exists($provider, 'register')) {
+                $provider->register();
+            }
+
+            if (method_exists($provider, 'boot')) {
+                $this->getApplication()->call([$provider, 'boot']);
+            }
+        }
+    }
+
     /**
      * Load application.
      *

src/Server/Manager.php

@@ -175,6 +175,9 @@ public function onRequest($swooleRequest, $swooleResponse)
     {
         $this->container['events']->fire('http.onRequest');
 
+        // Reset user-customized providers
+        $this->getApplication()->resetProviders();
+
         $illuminateRequest = Request::make($swooleRequest)->toIlluminate();
         $illuminateResponse = $this->getApplication()->run($illuminateRequest);
 

tests/Server/ApplicationTest.php

@@ -60,4 +60,46 @@ public function testTerminate()
 
         $this->assertTrue($flag);
     }
+
+    public function testLaravelResetProvider()
+    {
+        $application = Application::make('laravel', $this->basePath . '/laravel');
+        $response = $application->run(Request::create('/'));
+
+        $app = $application->getApplication();
+
+        $this->assertSame('bar', $app['singleton.test']->foo);
+
+        $app->singleton('singleton.test', function () {
+            $obj = new \stdClass;
+            $obj->foo = 'foo';
+
+            return $obj;
+        });
+        $this->assertSame('foo', $app['singleton.test']->foo);
+
+        $response = $application->resetProviders();
+        $this->assertSame('bar', $app['singleton.test']->foo);
+    }
+
+    public function testLumenResetProvider()
+    {
+        $application = Application::make('lumen', $this->basePath . '/lumen');
+        $response = $application->run(Request::create('/'));
+
+        $app = $application->getApplication();
+
+        $this->assertSame('bar', $app['singleton.test']->foo);
+
+        $app->singleton('singleton.test', function () {
+            $obj = new \stdClass;
+            $obj->foo = 'foo';
+
+            return $obj;
+        });
+        $this->assertSame('foo', $app['singleton.test']->foo);
+
+        $response = $application->resetProviders();
+        $this->assertSame('bar', $app['singleton.test']->foo);
+    }
 }

tests/fixtures/laravel/app/Providers/TestServiceProvider.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace SwooleTW\Http\Tests\Fixtures\Laravel\App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class TestServiceProvider extends ServiceProvider
+{
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton('singleton.test', function () {
+            $obj = new \stdClass;
+            $obj->foo = 'bar';
+
+            return $obj;
+        });
+    }
+}

tests/fixtures/laravel/config/app.php

@@ -51,6 +51,7 @@
 
         SwooleTW\Http\LaravelServiceProvider::class,
         SwooleTW\Http\Tests\Fixtures\Laravel\App\Providers\RouteServiceProvider::class,
+        SwooleTW\Http\Tests\Fixtures\Laravel\App\Providers\TestServiceProvider::class,
 
     ],
 

tests/fixtures/lumen/config/http.php renamed to tests/fixtures/laravel/config/swoole_http.php

@@ -12,19 +12,14 @@
     */
 
     'server' => [
-
         'host' => '127.0.0.1',
-
         'port' => '1215',
-
         'options' => [
-
-            'pid_file' => base_path('storage/logs/http.pid'),
-
+            'pid_file' => base_path('storage/logs/swoole_http.pid'),
             'daemonize' => 0,
-
         ],
-
     ],
-
+    'providers' => [
+        SwooleTW\Http\Tests\Fixtures\Laravel\App\Providers\TestServiceProvider::class,
+    ]
 ];

tests/fixtures/lumen/app/providers/TestServiceProvider.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace SwooleTW\Http\Tests\Fixtures\Lumen\App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class TestServiceProvider extends ServiceProvider
+{
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton('singleton.test', function () {
+            $obj = new \stdClass;
+            $obj->foo = 'bar';
+
+            return $obj;
+        });
+    }
+}

tests/fixtures/lumen/bootstrap/app.php

@@ -15,6 +15,9 @@
 );
 
 $app->register(SwooleTW\Http\LumenServiceProvider::class);
+$app->register(SwooleTW\Http\Tests\Fixtures\Lumen\App\Providers\TestServiceProvider::class);
+
+$app->configure('swoole_http');
 
 $app->group(['namespace' => 'App\Http\Controllers'], function ($app) {
     require __DIR__ . '/../routes/web.php';

tests/fixtures/laravel/config/http.php renamed to tests/fixtures/lumen/config/swoole_http.php

@@ -12,19 +12,14 @@
     */
 
     'server' => [
-
         'host' => '127.0.0.1',
-
         'port' => '1215',
-
         'options' => [
-
-            'pid_file' => base_path('storage/logs/http.pid'),
-
+            'pid_file' => base_path('storage/logs/swoole_http.pid'),
             'daemonize' => 0,
-
         ],
-
     ],
-
+    'providers' => [
+        SwooleTW\Http\Tests\Fixtures\Lumen\App\Providers\TestServiceProvider::class,
+    ]
 ];