Merge pull request #7082 from githubjeka/faker-config

apps/advanced/tests/codeception/bin/yii

@@ -15,17 +15,7 @@ $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
     require(YII_APP_BASE_PATH . '/console/config/main.php'),
     require(YII_APP_BASE_PATH . '/console/config/main-local.php'),
-    require(dirname(__DIR__) . '/config/config.php'),
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@tests/codeception/common/fixtures/data',
-                'templatePath' => '@tests/codeception/common/templates/fixtures',
-                'namespace' => 'tests\codeception\common\fixtures',
-            ],
-        ],
-    ]
+    require(dirname(__DIR__) . '/config/config.php')
 );
 
 $application = new yii\console\Application($config);

apps/advanced/tests/codeception/config/config.php

@@ -3,6 +3,14 @@
  * Application configuration shared by all applications and test types
  */
 return [
+    'controllerMap' => [
+        'fixture' => [
+            'class' => 'yii\faker\FixtureController',
+            'fixtureDataPath' => '@tests/codeception/common/fixtures/data',
+            'templatePath' => '@tests/codeception/common/templates/fixtures',
+            'namespace' => 'tests\codeception\common\fixtures',
+        ],
+    ],
     'components' => [
         'db' => [
             'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_tests',

apps/basic/tests/codeception/bin/yii

@@ -12,17 +12,7 @@ require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/config/console.php'),
-    require(__DIR__ . '/../config/config.php'),
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@tests/codeception/fixtures',
-                'templatePath' => '@tests/codeception/templates',
-                'namespace' => 'tests\codeception\fixtures',
-            ],
-        ],
-    ]
+    require(__DIR__ . '/../config/config.php')
 );
 
 $application = new yii\console\Application($config);

apps/basic/tests/codeception/config/config.php

@@ -3,6 +3,14 @@
  * Application configuration shared by all test types
  */
 return [
+    'controllerMap' => [
+        'fixture' => [
+            'class' => 'yii\faker\FixtureController',
+            'fixtureDataPath' => '@tests/codeception/fixtures',
+            'templatePath' => '@tests/codeception/templates',
+            'namespace' => 'tests\codeception\fixtures',
+        ],
+    ],
     'components' => [
         'db' => [
             'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',