php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-22 01:30:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4993 from creocoder/aliases-to-bootstrap

Browse Source 
Adv template `aliases.php` => `bootstrap.php` (common + specific for apps)
This commit is contained in:
Alexander Makarov
2014-09-12 12:47:23 +04:00
parent 24b74e2b18 5190fbfe37
commit 2938cf727e
18 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/advanced/backend/config/bootstrap.php Normal file
View File

@@ -0,0 +1 @@
<?php

0
apps/advanced/common/config/aliases.php → apps/advanced/common/config/bootstrap.php
View File

1
apps/advanced/console/config/bootstrap.php Normal file
View File

@@ -0,0 +1 @@
<?php

4
apps/advanced/environments/dev/backend/web/index-test.php
View File

@@ -10,7 +10,9 @@ defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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'); $config = require(__DIR__ . '/../../tests/codeception/config/backend/acceptance.php');

3
apps/advanced/environments/dev/backend/web/index.php
View File

@@ -4,7 +4,8 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../common/config/main.php'), require(__DIR__ . '/../../common/config/main.php'),

3
apps/advanced/environments/dev/frontend/web/index-test.php
View File

@@ -10,7 +10,8 @@ defined('YII_ENV') or define('YII_ENV', 'test');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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'); $config = require(__DIR__ . '/../../tests/codeception/config/frontend/acceptance.php');

3
apps/advanced/environments/dev/frontend/web/index.php
View File

@@ -4,7 +4,8 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../common/config/main.php'), require(__DIR__ . '/../../common/config/main.php'),

3
apps/advanced/environments/dev/yii
View File

@@ -17,7 +17,8 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),

3
apps/advanced/environments/prod/backend/web/index.php
View File

@@ -4,7 +4,8 @@ defined('YII_ENV') or define('YII_ENV', 'prod');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../common/config/main.php'), require(__DIR__ . '/../../common/config/main.php'),

3
apps/advanced/environments/prod/frontend/web/index.php
View File

@@ -4,7 +4,8 @@ defined('YII_ENV') or define('YII_ENV', 'prod');
require(__DIR__ . '/../../vendor/autoload.php'); require(__DIR__ . '/../../vendor/autoload.php');
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../common/config/main.php'), require(__DIR__ . '/../../common/config/main.php'),

3
apps/advanced/environments/prod/yii
View File

@@ -17,7 +17,8 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.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( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),

1
apps/advanced/frontend/config/bootstrap.php Normal file
View File

@@ -0,0 +1 @@
<?php

3
apps/advanced/tests/codeception/backend/_bootstrap.php
View File

@@ -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/autoload.php');
require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.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 // set correct script paths

4
apps/advanced/tests/codeception/bin/_bootstrap.php
View File

@@ -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/autoload.php');
require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.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_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
Yii::setAlias('@tests', dirname(dirname(__DIR__))); Yii::setAlias('@tests', dirname(dirname(__DIR__)));

4
apps/advanced/tests/codeception/common/_bootstrap.php
View File

@@ -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/autoload.php');
require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.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 // set correct script paths
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
Yii::setAlias('@tests', dirname(dirname(__DIR__))); Yii::setAlias('@tests', dirname(dirname(__DIR__)));

5
apps/advanced/tests/codeception/console/_bootstrap.php
View File

@@ -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/autoload.php');
require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.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 // set correct script paths
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
Yii::setAlias('@tests', dirname(dirname(__DIR__))); Yii::setAlias('@tests', dirname(dirname(__DIR__)));

5
apps/advanced/tests/codeception/frontend/_bootstrap.php
View File

@@ -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/autoload.php');
require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.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 // set correct script paths
@@ -18,4 +19,4 @@ $_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL; $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
Yii::setAlias('@tests', dirname(dirname(__DIR__))); Yii::setAlias('@tests', dirname(dirname(__DIR__)));

2
docs/guide/tutorial-advanced-app.md
View File

@@ -90,7 +90,7 @@ Predefined path aliases
- `@webroot` - web root directory of currently running web application. - `@webroot` - web root directory of currently running web application.
The aliases specific to the directory structure of the advanced 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 Applications