Merge pull request #2107 from creocoder/yii2-advanced-app-env-improvement

apps/advanced/backend/config/main.php

 <?php
-$rootDir = dirname(dirname(__DIR__));
-
 $params = array_merge(
-	require($rootDir . '/common/config/params.php'),
-	require($rootDir . '/common/config/params-local.php'),
+	require(__DIR__ . '/../../common/config/params.php'),
+	require(__DIR__ . '/../../common/config/params-local.php'),
 	require(__DIR__ . '/params.php'),
 	require(__DIR__ . '/params-local.php')
 );
@@ -11,15 +9,10 @@ $params = array_merge(
 return [
 	'id' => 'app-backend',
 	'basePath' => dirname(__DIR__),
-	'vendorPath' => $rootDir . '/vendor',
 	'preload' => ['log'],
 	'controllerNamespace' => 'backend\controllers',
 	'modules' => [],
-	'extensions' => require($rootDir . '/vendor/yiisoft/extensions.php'),
 	'components' => [
-		'db' => $params['components.db'],
-		'cache' => $params['components.cache'],
-		'mail' => $params['components.mail'],
 		'user' => [
 			'identityClass' => 'common\models\User',
 			'enableAutoLogin' => true,

apps/advanced/common/config/aliases.php

+<?php
+Yii::setAlias('common', dirname(__DIR__));
+Yii::setAlias('frontend', dirname(dirname(__DIR__)) . '/frontend');
+Yii::setAlias('backend', dirname(dirname(__DIR__)) . '/backend');
+Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');

apps/advanced/common/config/main.php

+<?php
+return [
+	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
+	'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'),
+	'components' => [
+		'cache' => [
+			'class' => 'yii\caching\FileCache',
+		],
+		'mail' => [
+			'class' => 'yii\swiftmailer\Mailer',
+			'viewPath' => '@common/mails',
+		],
+	],
+];

apps/advanced/common/config/params.php

 <?php
-
-Yii::setAlias('common', dirname(__DIR__));
-Yii::setAlias('frontend', dirname(dirname(__DIR__)) . '/frontend');
-Yii::setAlias('backend', dirname(dirname(__DIR__)) . '/backend');
-Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
-
 return [
 	'adminEmail' => 'admin@example.com',
 	'supportEmail' => 'support@example.com',
-
-	'components.cache' => [
-		'class' => 'yii\caching\FileCache',
-	],
-
-	'components.mail' => [
-		'class' => 'yii\swiftmailer\Mailer',
-		'viewPath' => '@common/mails',
-	],
 ];

apps/advanced/console/config/main.php

 <?php
-$rootDir = __DIR__ . '/../..';
-
 $params = array_merge(
-	require($rootDir . '/common/config/params.php'),
-	require($rootDir . '/common/config/params-local.php'),
+	require(__DIR__ . '/../../common/config/params.php'),
+	require(__DIR__ . '/../../common/config/params-local.php'),
 	require(__DIR__ . '/params.php'),
 	require(__DIR__ . '/params-local.php')
 );
@@ -11,15 +9,9 @@ $params = array_merge(
 return [
 	'id' => 'app-console',
 	'basePath' => dirname(__DIR__),
-	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'controllerNamespace' => 'console\controllers',
-	'modules' => [
-	],
-	'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'),
+	'modules' => [],
 	'components' => [
-		'db' => $params['components.db'],
-		'cache' => $params['components.cache'],
-		'mail' => $params['components.mail'],
 		'log' => [
 			'targets' => [
 				[

apps/advanced/environments/dev/backend/config/main-local.php

 <?php
 return [
-	'preload' => [
-		//'debug',
-	],
-	'modules' => [
-//		'debug' => 'yii\debug\Module',
-//		'gii' => 'yii\gii\Module',
-	],
 ];

apps/advanced/environments/dev/backend/web/index.php

@@ -4,8 +4,11 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/aliases.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../../common/config/main.php'),
+	require(__DIR__ . '/../../common/config/main-local.php'),
 	require(__DIR__ . '/../config/main.php'),
 	require(__DIR__ . '/../config/main-local.php')
 );

apps/advanced/environments/dev/common/config/main-local.php

+<?php
+return [
+	'preload' => [
+		//'debug',
+	],
+	'modules' => [
+		//		'debug' => 'yii\debug\Module',
+		//		'gii' => 'yii\gii\Module',
+	],
+	'components' => [
+		'db' => [
+			'class' => 'yii\db\Connection',
+			'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
+			'username' => 'root',
+			'password' => '',
+			'charset' => 'utf8',
+		],
+	],
+];

apps/advanced/environments/dev/common/config/params-local.php

 <?php
 return [
-	'components.db' => [
-		'class' => 'yii\db\Connection',
-		'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
-		'username' => 'root',
-		'password' => '',
-		'charset' => 'utf8',
-	],
 ];

apps/advanced/environments/dev/frontend/config/main-local.php

 <?php
 return [
-	'preload' => [
-		//'debug',
-	],
-	'modules' => [
-//		'debug' => 'yii\debug\Module',
-//		'gii' => 'yii\gii\Module',
-	],
 ];

apps/advanced/environments/dev/frontend/web/index.php

@@ -4,8 +4,11 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/aliases.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../../common/config/main.php'),
+	require(__DIR__ . '/../../common/config/main-local.php'),
 	require(__DIR__ . '/../config/main.php'),
 	require(__DIR__ . '/../config/main-local.php')
 );

apps/advanced/environments/dev/yii

@@ -19,6 +19,8 @@ require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/common/config/main.php'),
+	require(__DIR__ . '/common/config/main-local.php'),
 	require(__DIR__ . '/console/config/main.php'),
 	require(__DIR__ . '/console/config/main-local.php')
 );

apps/advanced/environments/prod/backend/web/index.php

@@ -4,8 +4,11 @@ defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/aliases.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../../common/config/main.php'),
+	require(__DIR__ . '/../../common/config/main-local.php'),
 	require(__DIR__ . '/../config/main.php'),
 	require(__DIR__ . '/../config/main-local.php')
 );

apps/advanced/environments/prod/common/config/main-local.php

+<?php
+return [
+	'components' => [
+		'db' => [
+			'class' => 'yii\db\Connection',
+			'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
+			'username' => 'root',
+			'password' => '',
+			'charset' => 'utf8',
+		],
+	],
+];

apps/advanced/environments/prod/common/config/params-local.php

 <?php
 return [
-	'components.db' => [
-		'class' => 'yii\db\Connection',
-		'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
-		'username' => 'root',
-		'password' => '',
-		'charset' => 'utf8',
-	],
 ];

apps/advanced/environments/prod/frontend/web/index.php

@@ -4,8 +4,11 @@ defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../../common/config/aliases.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../../common/config/main.php'),
+	require(__DIR__ . '/../../common/config/main-local.php'),
 	require(__DIR__ . '/../config/main.php'),
 	require(__DIR__ . '/../config/main-local.php')
 );

apps/advanced/environments/prod/yii

@@ -19,6 +19,8 @@ require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/common/config/main.php'),
+	require(__DIR__ . '/common/config/main-local.php'),
 	require(__DIR__ . '/console/config/main.php'),
 	require(__DIR__ . '/console/config/main-local.php')
 );

apps/advanced/frontend/config/main.php

 <?php
-$rootDir = __DIR__ . '/../..';
-
 $params = array_merge(
-	require($rootDir . '/common/config/params.php'),
-	require($rootDir . '/common/config/params-local.php'),
+	require(__DIR__ . '/../../common/config/params.php'),
+	require(__DIR__ . '/../../common/config/params-local.php'),
 	require(__DIR__ . '/params.php'),
 	require(__DIR__ . '/params-local.php')
 );
@@ -11,13 +9,8 @@ $params = array_merge(
 return [
 	'id' => 'app-frontend',
 	'basePath' => dirname(__DIR__),
-	'vendorPath' => $rootDir . '/vendor',
 	'controllerNamespace' => 'frontend\controllers',
-	'extensions' => require($rootDir . '/vendor/yiisoft/extensions.php'),
 	'components' => [
-		'db' => $params['components.db'],
-		'cache' => $params['components.cache'],
-		'mail' => $params['components.mail'],
 		'user' => [
 			'identityClass' => 'common\models\User',
 			'enableAutoLogin' => true,