Use runner packages and HTTP application class (#389)

yiisoft · Nov 11, 2021 · 648c774 · 648c774
1 parent 89cbbad
commit 648c774
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 291 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -4,8 +4,6 @@ checks:
 filter:
   paths:
     - "src/*"
-  excluded_paths:
-    - "src/ApplicationRunner.php"
 
 build:
   image: default-bionic

diff --git a/composer.json b/composer.json
@@ -77,6 +77,9 @@
         "yiisoft/yii-debug": "^3.0@dev",
         "yiisoft/yii-debug-api": "^3.0@dev",
         "yiisoft/yii-event": "^1.0",
+        "yiisoft/yii-http": "dev-master",
+        "yiisoft/yii-runner-console": "dev-master",
+        "yiisoft/yii-runner-http": "dev-master",
         "yiisoft/yii-swagger": "^3.0@dev",
         "yiisoft/yii-view": "^4.0",
         "yiisoft/yii-web": "^3.0@dev"

diff --git a/config/events-web.php b/config/events-web.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use App\Timer;
-use Yiisoft\Yii\Web\Event\ApplicationStartup;
+use Yiisoft\Yii\Http\Event\ApplicationStartup;
 
 return [
     ApplicationStartup::class => [

diff --git a/config/web/application.php b/config/web/application.php
@@ -9,8 +9,10 @@
 use Yiisoft\Injector\Injector;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 
+/** @var array $params */
+
 return [
-    Yiisoft\Yii\Web\Application::class => [
+    Yiisoft\Yii\Http\Application::class => [
         '__construct()' => [
             'dispatcher' => DynamicReference::to(static function (Injector $injector) use ($params) {
                 return ($injector->make(MiddlewareDispatcher::class))

diff --git a/public/index.php b/public/index.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Runner\WebApplicationRunner;
+use Yiisoft\Yii\Runner\Http\HttpApplicationRunner;
 
 /**
  * @psalm-var string $_SERVER['REQUEST_URI']
@@ -30,6 +30,6 @@
     }
 }
 
-// Run web application runner
-$runner = new WebApplicationRunner($_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
+// Run HTTP application runner
+$runner = new HttpApplicationRunner(dirname(__DIR__), $_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
 $runner->run();
diff --git a/src/Runner/BootstrapRunner.php b/src/Runner/BootstrapRunner.php
diff --git a/src/Runner/ConfigFactory.php b/src/Runner/ConfigFactory.php
diff --git a/src/Runner/ConsoleApplicationRunner.php b/src/Runner/ConsoleApplicationRunner.php
diff --git a/src/Runner/WebApplicationRunner.php b/src/Runner/WebApplicationRunner.php
diff --git a/tests/Functional/EventListenerConfigurationTest.php b/tests/Functional/EventListenerConfigurationTest.php
@@ -4,17 +4,19 @@
 
 namespace App\Tests\Functional;
 
-use App\Runner\ConfigFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Yiisoft\Di\Container;
 use Yiisoft\Yii\Event\ListenerConfigurationChecker;
+use Yiisoft\Yii\Runner\ConfigFactory;
+
+use function dirname;
 
 class EventListenerConfigurationTest extends TestCase
 {
     public function testConsoleListenerConfiguration(): void
     {
-        $config = ConfigFactory::create(null);
+        $config = ConfigFactory::create(dirname(__DIR__, 2), null);
 
         $container = (new Container($config->get('console')))->get(ContainerInterface::class);
         $checker = $container->get(ListenerConfigurationChecker::class);

diff --git a/yii b/yii
@@ -3,10 +3,10 @@
 
 declare(strict_types=1);
 
-use App\Runner\ConsoleApplicationRunner;
+use Yiisoft\Yii\Runner\Console\ConsoleApplicationRunner;
 
 require_once __DIR__ . '/preload.php';
 
 // Run console application runner
-$runner = new ConsoleApplicationRunner($_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
+$runner = new ConsoleApplicationRunner(__DIR__, $_ENV['YII_DEBUG'], $_ENV['YII_ENV']);
 $runner->run();