From 5190fbfe37bfedf3bf46bc645908af8226cfa6ff Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 12 Sep 2014 11:29:48 +0400
Subject: [PATCH] `aliases.php` renamed to `bootstrap.php` (introduced to
 specific applications too)

---
 apps/advanced/backend/config/bootstrap.php                 | 1 +
 apps/advanced/common/config/{aliases.php => bootstrap.php} | 0
 apps/advanced/console/config/bootstrap.php                 | 1 +
 apps/advanced/environments/dev/backend/web/index-test.php  | 4 +++-
 apps/advanced/environments/dev/backend/web/index.php       | 3 ++-
 apps/advanced/environments/dev/frontend/web/index-test.php | 3 ++-
 apps/advanced/environments/dev/frontend/web/index.php      | 3 ++-
 apps/advanced/environments/dev/yii                         | 3 ++-
 apps/advanced/environments/prod/backend/web/index.php      | 3 ++-
 apps/advanced/environments/prod/frontend/web/index.php     | 3 ++-
 apps/advanced/environments/prod/yii                        | 3 ++-
 apps/advanced/frontend/config/bootstrap.php                | 1 +
 apps/advanced/tests/codeception/backend/_bootstrap.php     | 3 ++-
 apps/advanced/tests/codeception/bin/_bootstrap.php         | 4 ++--
 apps/advanced/tests/codeception/common/_bootstrap.php      | 4 ++--
 apps/advanced/tests/codeception/console/_bootstrap.php     | 5 +++--
 apps/advanced/tests/codeception/frontend/_bootstrap.php    | 5 +++--
 docs/guide/tutorial-advanced-app.md                        | 2 +-
 18 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 apps/advanced/backend/config/bootstrap.php
 rename apps/advanced/common/config/{aliases.php => bootstrap.php} (100%)
 create mode 100644 apps/advanced/console/config/bootstrap.php
 create mode 100644 apps/advanced/frontend/config/bootstrap.php

diff --git a/apps/advanced/backend/config/bootstrap.php b/apps/advanced/backend/config/bootstrap.php
new file mode 100644
index 0000000000..b3d9bbc7f3
--- /dev/null
+++ b/apps/advanced/backend/config/bootstrap.php
@@ -0,0 +1 @@
+<?php
diff --git a/apps/advanced/common/config/aliases.php b/apps/advanced/common/config/bootstrap.php
similarity index 100%
rename from apps/advanced/common/config/aliases.php
rename to apps/advanced/common/config/bootstrap.php
diff --git a/apps/advanced/console/config/bootstrap.php b/apps/advanced/console/config/bootstrap.php
new file mode 100644
index 0000000000..b3d9bbc7f3
--- /dev/null
+++ b/apps/advanced/console/config/bootstrap.php
@@ -0,0 +1 @@
+<?php
diff --git a/apps/advanced/environments/dev/backend/web/index-test.php b/apps/advanced/environments/dev/backend/web/index-test.php
index ff8cc5e257..8b967072de 100644
--- a/apps/advanced/environments/dev/backend/web/index-test.php
+++ b/apps/advanced/environments/dev/backend/web/index-test.php
@@ -10,7 +10,9 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require(__DIR__ . '/../../common/config/aliases.php');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
+
 
 $config = require(__DIR__ . '/../../tests/codeception/config/backend/acceptance.php');
 
diff --git a/apps/advanced/environments/dev/backend/web/index.php b/apps/advanced/environments/dev/backend/web/index.php
index b4748ba7e2..60381674f2 100644
--- a/apps/advanced/environments/dev/backend/web/index.php
+++ b/apps/advanced/environments/dev/backend/web/index.php
@@ -4,7 +4,8 @@ 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');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../common/config/main.php'),
diff --git a/apps/advanced/environments/dev/frontend/web/index-test.php b/apps/advanced/environments/dev/frontend/web/index-test.php
index 1e2ac2faa3..66a9520cb4 100644
--- a/apps/advanced/environments/dev/frontend/web/index-test.php
+++ b/apps/advanced/environments/dev/frontend/web/index-test.php
@@ -10,7 +10,8 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 
 require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require(__DIR__ . '/../../common/config/aliases.php');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
 
 $config = require(__DIR__ . '/../../tests/codeception/config/frontend/acceptance.php');
 
diff --git a/apps/advanced/environments/dev/frontend/web/index.php b/apps/advanced/environments/dev/frontend/web/index.php
index b4748ba7e2..60381674f2 100644
--- a/apps/advanced/environments/dev/frontend/web/index.php
+++ b/apps/advanced/environments/dev/frontend/web/index.php
@@ -4,7 +4,8 @@ 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');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../common/config/main.php'),
diff --git a/apps/advanced/environments/dev/yii b/apps/advanced/environments/dev/yii
index a282824ebb..277814f257 100644
--- a/apps/advanced/environments/dev/yii
+++ b/apps/advanced/environments/dev/yii
@@ -17,7 +17,8 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
-require(__DIR__ . '/common/config/aliases.php');
+require(__DIR__ . '/common/config/bootstrap.php');
+require(__DIR__ . '/common/console/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/common/config/main.php'),
diff --git a/apps/advanced/environments/prod/backend/web/index.php b/apps/advanced/environments/prod/backend/web/index.php
index 7217747905..674803a5d9 100644
--- a/apps/advanced/environments/prod/backend/web/index.php
+++ b/apps/advanced/environments/prod/backend/web/index.php
@@ -4,7 +4,8 @@ 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');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../common/config/main.php'),
diff --git a/apps/advanced/environments/prod/frontend/web/index.php b/apps/advanced/environments/prod/frontend/web/index.php
index 7217747905..674803a5d9 100644
--- a/apps/advanced/environments/prod/frontend/web/index.php
+++ b/apps/advanced/environments/prod/frontend/web/index.php
@@ -4,7 +4,8 @@ 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');
+require(__DIR__ . '/../../common/config/bootstrap.php');
+require(__DIR__ . '/../config/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../common/config/main.php'),
diff --git a/apps/advanced/environments/prod/yii b/apps/advanced/environments/prod/yii
index 7f738bd1fd..8343827238 100644
--- a/apps/advanced/environments/prod/yii
+++ b/apps/advanced/environments/prod/yii
@@ -17,7 +17,8 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
-require(__DIR__ . '/common/config/aliases.php');
+require(__DIR__ . '/common/config/bootstrap.php');
+require(__DIR__ . '/common/console/bootstrap.php');
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/common/config/main.php'),
diff --git a/apps/advanced/frontend/config/bootstrap.php b/apps/advanced/frontend/config/bootstrap.php
new file mode 100644
index 0000000000..b3d9bbc7f3
--- /dev/null
+++ b/apps/advanced/frontend/config/bootstrap.php
@@ -0,0 +1 @@
+<?php
diff --git a/apps/advanced/tests/codeception/backend/_bootstrap.php b/apps/advanced/tests/codeception/backend/_bootstrap.php
index 69c38520d6..30bd718c23 100644
--- a/apps/advanced/tests/codeception/backend/_bootstrap.php
+++ b/apps/advanced/tests/codeception/backend/_bootstrap.php
@@ -9,7 +9,8 @@ defined('YII_TEST_BACKEND_ENTRY_FILE') or define('YII_TEST_BACKEND_ENTRY_FILE',
 
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-require(YII_APP_BASE_PATH . '/common/config/aliases.php');
+require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
+require_once(YII_APP_BASE_PATH . '/backend/config/bootstrap.php');
 
 // set correct script paths
 
diff --git a/apps/advanced/tests/codeception/bin/_bootstrap.php b/apps/advanced/tests/codeception/bin/_bootstrap.php
index 5cf50b090b..2afc172cb5 100644
--- a/apps/advanced/tests/codeception/bin/_bootstrap.php
+++ b/apps/advanced/tests/codeception/bin/_bootstrap.php
@@ -15,9 +15,9 @@ defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirn
 
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-require_once(YII_APP_BASE_PATH . '/common/config/aliases.php');
+require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/apps/advanced/tests/codeception/common/_bootstrap.php b/apps/advanced/tests/codeception/common/_bootstrap.php
index 3e768208cc..b1659df4c6 100644
--- a/apps/advanced/tests/codeception/common/_bootstrap.php
+++ b/apps/advanced/tests/codeception/common/_bootstrap.php
@@ -6,9 +6,9 @@ defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirn
 
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-require(YII_APP_BASE_PATH . '/common/config/aliases.php');
+require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
 
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/apps/advanced/tests/codeception/console/_bootstrap.php b/apps/advanced/tests/codeception/console/_bootstrap.php
index 3e768208cc..d49dd68e12 100644
--- a/apps/advanced/tests/codeception/console/_bootstrap.php
+++ b/apps/advanced/tests/codeception/console/_bootstrap.php
@@ -6,9 +6,10 @@ defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirn
 
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-require(YII_APP_BASE_PATH . '/common/config/aliases.php');
+require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
+require_once(YII_APP_BASE_PATH . '/console/config/bootstrap.php');
 
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/apps/advanced/tests/codeception/frontend/_bootstrap.php b/apps/advanced/tests/codeception/frontend/_bootstrap.php
index 06bfd20181..ed3bf91355 100644
--- a/apps/advanced/tests/codeception/frontend/_bootstrap.php
+++ b/apps/advanced/tests/codeception/frontend/_bootstrap.php
@@ -9,7 +9,8 @@ defined('FRONTEND_ENTRY_FILE') or define('FRONTEND_ENTRY_FILE', YII_APP_BASE_PAT
 
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-require(YII_APP_BASE_PATH . '/common/config/aliases.php');
+require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
+require_once(YII_APP_BASE_PATH . '/frontend/config/bootstrap.php');
 
 // set correct script paths
 
@@ -18,4 +19,4 @@ $_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/docs/guide/tutorial-advanced-app.md b/docs/guide/tutorial-advanced-app.md
index 2f9554cfea..ae32e73335 100644
--- a/docs/guide/tutorial-advanced-app.md
+++ b/docs/guide/tutorial-advanced-app.md
@@ -90,7 +90,7 @@ Predefined path aliases
 - `@webroot` - web root directory of currently running web application.
 
 The aliases specific to the directory structure of the advanced application
-(`@common`,  `@frontend`, `@backend`, and `@console`) are defined in `common/config/aliases.php`.
+(`@common`,  `@frontend`, `@backend`, and `@console`) are defined in `common/config/bootstrap.php`.
 
 
 Applications