Adjust config (#181)

samdark · web-flow · commit f86c9281fd21 · 2021-08-23T20:41:13.000+03:00
See yiisoft/config#73
diff --git a/public/index-test.php b/public/index-test.php
@@ -21,6 +21,8 @@
     $_SERVER['SCRIPT_NAME'] = '/index-test.php';
 }
 
+define('YII_ENV', getenv('env') ?: 'test');
+
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 $runner = new ApplicationRunner();
diff --git a/public/index.php b/public/index.php
@@ -15,6 +15,8 @@
     $_SERVER['SCRIPT_NAME'] = '/index.php';
 }
 
+define('YII_ENV', getenv('env') ?: 'production');
+
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 $runner = new ApplicationRunner();
diff --git a/src/ApplicationRunner.php b/src/ApplicationRunner.php
@@ -45,7 +45,14 @@ public function run(): void
 
         $config = new Config(
             dirname(__DIR__),
-            '/config/packages', // Configs path.
+            '/config/packages',
+            null,
+            [
+                'params',
+                'events',
+                'events-web',
+                'events-console',
+            ]
         );
 
         $container = new Container(
diff --git a/tests/Functional/EventListenerConfigurationTest.php b/tests/Functional/EventListenerConfigurationTest.php
@@ -17,6 +17,13 @@ public function testConsoleListenerConfiguration(): void
         $config = new Config(
             dirname(__DIR__, 2),
             '/config/packages', // Configs path.
+            null,
+            [
+                'params',
+                'events',
+                'events-web',
+                'events-console',
+            ]
         );
 
         $container = (new Container($config->get('console')))->get(ContainerInterface::class);
diff --git a/tests/Unit/HelloCest.php b/tests/Unit/HelloCest.php
@@ -56,6 +56,13 @@ private function getConfig(): Config
         return new Config(
             dirname(__DIR__, 2),
             '/config/packages', // Configs path.
+            null,
+            [
+                'params',
+                'events',
+                'events-web',
+                'events-console',
+            ]
         );
     }
 }
diff --git a/yii b/yii
@@ -16,6 +16,13 @@ require_once 'vendor/autoload.php';
 $config = new Config(
     __DIR__,
     '/config/packages',
+    null,
+    [
+        'params',
+        'events',
+        'events-web',
+        'events-console',
+    ]
 );
 
 $container = new Container(

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`$_SERVER['SCRIPT_NAME'] = '/index-test.php';`
`22`	`22`	`}`
`23`	`23`
	`24`	`+define('YII_ENV', getenv('env') ?: 'test');`
	`25`	`+`
`24`	`26`	`require_once dirname(__DIR__) . '/vendor/autoload.php';`
`25`	`27`
`26`	`28`	`$runner = new ApplicationRunner();`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`$_SERVER['SCRIPT_NAME'] = '/index.php';`
`16`	`16`	`}`
`17`	`17`
	`18`	`+define('YII_ENV', getenv('env') ?: 'production');`
	`19`	`+`
`18`	`20`	`require_once dirname(__DIR__) . '/vendor/autoload.php';`
`19`	`21`
`20`	`22`	`$runner = new ApplicationRunner();`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,13 @@ private function getConfig(): Config`
`56`	`56`	`return new Config(`
`57`	`57`	`dirname(__DIR__, 2),`
`58`	`58`	`'/config/packages', // Configs path.`
	`59`	`+ null,`
	`60`	`+ [`
	`61`	`+ 'params',`
	`62`	`+ 'events',`
	`63`	`+ 'events-web',`
	`64`	`+ 'events-console',`
	`65`	`+ ]`
`59`	`66`	`);`
`60`	`67`	`}`
`61`	`68`	`}`