yiisoft
diff --git a/‎.scrutinizer.yml‎
Lines changed: 0 additions & 1 deletion b/‎.scrutinizer.yml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎composer.json‎
Lines changed: 3 additions & 0 deletions b/‎composer.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎config/web/application.php‎
Lines changed: 3 additions & 1 deletion b/‎config/web/application.php‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎public/index.php‎
Lines changed: 3 additions & 3 deletions b/‎public/index.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Runner/BootstrapRunner.php‎
Lines changed: 0 additions & 34 deletions b/‎src/Runner/BootstrapRunner.php‎
Lines changed: 0 additions & 34 deletions
diff --git a/‎src/Runner/ConfigFactory.php‎
Lines changed: 0 additions & 33 deletions b/‎src/Runner/ConfigFactory.php‎
Lines changed: 0 additions & 33 deletions
diff --git a/‎src/Runner/ConsoleApplicationRunner.php‎
Lines changed: 0 additions & 71 deletions b/‎src/Runner/ConsoleApplicationRunner.php‎
Lines changed: 0 additions & 71 deletions
diff --git a/‎src/Runner/WebApplicationRunner.php‎
Lines changed: 0 additions & 140 deletions b/‎src/Runner/WebApplicationRunner.php‎
Lines changed: 0 additions & 140 deletions
diff --git a/‎tests/Functional/EventListenerConfigurationTest.php‎
Lines changed: 4 additions & 2 deletions b/‎tests/Functional/EventListenerConfigurationTest.php‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎tests/Unit/HelloCest.php‎
Lines changed: 4 additions & 2 deletions b/‎tests/Unit/HelloCest.php‎
Lines changed: 4 additions & 2 deletions
@@ -5,7 +5,6 @@ filter:
   paths:
     - "src/*"
   excluded_paths:
-    - "src/ApplicationRunner.php"
     - "src/Installer.php"
 
 build:
 
@@ -52,6 +52,9 @@
         "yiisoft/yii-console": "^1.0",
         "yiisoft/yii-debug": "^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-view": "^4.0",
         "yiisoft/yii-web": "^3.0@dev"
     },
 
@@ -8,8 +8,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))
 
@@ -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();
@@ -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);
 
@@ -4,7 +4,6 @@
 
 namespace App\Tests\Unit;
 
-use App\Runner\ConfigFactory;
 use App\Tests\UnitTester;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application;
@@ -13,6 +12,9 @@
 use Yiisoft\Config\Config;
 use Yiisoft\Di\Container;
 use Yiisoft\Yii\Console\ExitCode;
+use Yiisoft\Yii\Runner\ConfigFactory;
+
+use function dirname;
 
 final class HelloCest
 {
@@ -55,6 +57,6 @@ public function testExecute(UnitTester $I): void
 
     private function getConfig(): Config
     {
-        return ConfigFactory::create(null);
+        return ConfigFactory::create(dirname(__DIR__, 2), null);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-use App\Runner\WebApplicationRunner;`
	`5`	`+use Yiisoft\Yii\Runner\Http\HttpApplicationRunner;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* @psalm-var string $_SERVER['REQUEST_URI']`
`@@ -30,6 +30,6 @@`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-// Run web application runner`
`34`		`-$runner = new WebApplicationRunner($_ENV['YII_DEBUG'], $_ENV['YII_ENV']);`
	`33`	`+// Run HTTP application runner`
	`34`	`+$runner = new HttpApplicationRunner(dirname(__DIR__), $_ENV['YII_DEBUG'], $_ENV['YII_ENV']);`
`35`	`35`	`$runner->run();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace App\Tests\Unit;`
`6`	`6`
`7`		`-use App\Runner\ConfigFactory;`
`8`	`7`	`use App\Tests\UnitTester;`
`9`	`8`	`use Psr\Container\ContainerInterface;`
`10`	`9`	`use Symfony\Component\Console\Application;`
`@@ -13,6 +12,9 @@`
`13`	`12`	`use Yiisoft\Config\Config;`
`14`	`13`	`use Yiisoft\Di\Container;`
`15`	`14`	`use Yiisoft\Yii\Console\ExitCode;`
	`15`	`+use Yiisoft\Yii\Runner\ConfigFactory;`
	`16`	`+`
	`17`	`+use function dirname;`
`16`	`18`
`17`	`19`	`final class HelloCest`
`18`	`20`	`{`
`@@ -55,6 +57,6 @@ public function testExecute(UnitTester $I): void`
`55`	`57`
`56`	`58`	`private function getConfig(): Config`
`57`	`59`	`{`
`58`		`- return ConfigFactory::create(null);`
	`60`	`+ return ConfigFactory::create(dirname(__DIR__, 2), null);`
`59`	`61`	`}`
`60`	`62`	`}`