diff --git a/apps/advanced/tests/codeception/backend/_bootstrap.php b/apps/advanced/tests/codeception/backend/_bootstrap.php index 2833fe277d..1594258a75 100644 --- a/apps/advanced/tests/codeception/backend/_bootstrap.php +++ b/apps/advanced/tests/codeception/backend/_bootstrap.php @@ -2,20 +2,20 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_ENV') or define('YII_ENV', 'test'); -defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); +defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__)))); -defined('BACKEND_ENTRY_URL') or define('BACKEND_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']); -defined('BACKEND_ENTRY_FILE') or define('BACKEND_ENTRY_FILE', ROOT_DIR . '/backend/web/index-test.php'); +defined('YII_BACKEND_TEST_ENTRY_URL') or define('YII_BACKEND_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']); +defined('YII_TEST_BACKEND_ENTRY_FILE') or define('YII_TEST_BACKEND_ENTRY_FILE', YII_ROOT_DIR . '/backend/web/index-test.php'); -require_once(ROOT_DIR . '/vendor/autoload.php'); -require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); -require(ROOT_DIR . '/common/config/aliases.php'); +require_once(YII_ROOT_DIR . '/vendor/autoload.php'); +require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); +require(YII_ROOT_DIR . '/common/config/aliases.php'); // set correct script paths // the entry script file path for functional and acceptance tests -$_SERVER['SCRIPT_FILENAME'] = BACKEND_ENTRY_FILE; -$_SERVER['SCRIPT_NAME'] = BACKEND_ENTRY_URL; +$_SERVER['SCRIPT_FILENAME'] = YII_TEST_BACKEND_ENTRY_FILE; +$_SERVER['SCRIPT_NAME'] = YII_BACKEND_TEST_ENTRY_URL; $_SERVER['SERVER_NAME'] = 'localhost'; Yii::setAlias('@codeception', dirname(__DIR__)); diff --git a/apps/advanced/tests/codeception/bin/_bootstrap.php b/apps/advanced/tests/codeception/bin/_bootstrap.php index a9cbe29f98..23fc9d2115 100644 --- a/apps/advanced/tests/codeception/bin/_bootstrap.php +++ b/apps/advanced/tests/codeception/bin/_bootstrap.php @@ -11,11 +11,11 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w')); -defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); +defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__)))); -require_once(ROOT_DIR . '/vendor/autoload.php'); -require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); -require_once(ROOT_DIR . '/common/config/aliases.php'); +require_once(YII_ROOT_DIR . '/vendor/autoload.php'); +require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); +require_once(YII_ROOT_DIR . '/common/config/aliases.php'); defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_ENV') or define('YII_ENV', 'test'); diff --git a/apps/advanced/tests/codeception/bin/yii_acceptance b/apps/advanced/tests/codeception/bin/yii_acceptance index b6dfafc758..21a768d12f 100644 --- a/apps/advanced/tests/codeception/bin/yii_acceptance +++ b/apps/advanced/tests/codeception/bin/yii_acceptance @@ -11,10 +11,10 @@ require_once __DIR__ . '/_bootstrap.php'; $config = yii\helpers\ArrayHelper::merge( - require(ROOT_DIR . '/common/config/main.php'), - require(ROOT_DIR . '/common/config/main-local.php'), - require(ROOT_DIR . '/console/config/main.php'), - require(ROOT_DIR . '/console/config/main-local.php'), + require(YII_ROOT_DIR . '/common/config/main.php'), + require(YII_ROOT_DIR . '/common/config/main-local.php'), + require(YII_ROOT_DIR . '/console/config/main.php'), + require(YII_ROOT_DIR . '/console/config/main-local.php'), require(dirname(__DIR__) . '/config/acceptance.php'), [ 'controllerMap' => [ diff --git a/apps/advanced/tests/codeception/bin/yii_functional b/apps/advanced/tests/codeception/bin/yii_functional index abf755ed28..7d00ac752e 100644 --- a/apps/advanced/tests/codeception/bin/yii_functional +++ b/apps/advanced/tests/codeception/bin/yii_functional @@ -11,10 +11,10 @@ require_once __DIR__ . '/_bootstrap.php'; $config = yii\helpers\ArrayHelper::merge( - require(ROOT_DIR . '/common/config/main.php'), - require(ROOT_DIR . '/common/config/main-local.php'), - require(ROOT_DIR . '/console/config/main.php'), - require(ROOT_DIR . '/console/config/main-local.php'), + require(YII_ROOT_DIR . '/common/config/main.php'), + require(YII_ROOT_DIR . '/common/config/main-local.php'), + require(YII_ROOT_DIR . '/console/config/main.php'), + require(YII_ROOT_DIR . '/console/config/main-local.php'), require(dirname(__DIR__) . '/config/functional.php'), [ 'controllerMap' => [ diff --git a/apps/advanced/tests/codeception/bin/yii_unit b/apps/advanced/tests/codeception/bin/yii_unit index 1187c6d50c..e42e0e4ef9 100644 --- a/apps/advanced/tests/codeception/bin/yii_unit +++ b/apps/advanced/tests/codeception/bin/yii_unit @@ -11,10 +11,10 @@ require_once __DIR__ . '/_bootstrap.php'; $config = yii\helpers\ArrayHelper::merge( - require(ROOT_DIR . '/common/config/main.php'), - require(ROOT_DIR . '/common/config/main-local.php'), - require(ROOT_DIR . '/console/config/main.php'), - require(ROOT_DIR . '/console/config/main-local.php'), + require(YII_ROOT_DIR . '/common/config/main.php'), + require(YII_ROOT_DIR . '/common/config/main-local.php'), + require(YII_ROOT_DIR . '/console/config/main.php'), + require(YII_ROOT_DIR . '/console/config/main-local.php'), require(dirname(__DIR__) . '/config/unit.php'), [ 'controllerMap' => [ diff --git a/apps/advanced/tests/codeception/common/_bootstrap.php b/apps/advanced/tests/codeception/common/_bootstrap.php index 2225ef0519..4647242e0f 100644 --- a/apps/advanced/tests/codeception/common/_bootstrap.php +++ b/apps/advanced/tests/codeception/common/_bootstrap.php @@ -2,11 +2,11 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_ENV') or define('YII_ENV', 'test'); -defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); +defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__)))); -require_once(ROOT_DIR . '/vendor/autoload.php'); -require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); -require(ROOT_DIR . '/common/config/aliases.php'); +require_once(YII_ROOT_DIR . '/vendor/autoload.php'); +require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); +require(YII_ROOT_DIR . '/common/config/aliases.php'); // set correct script paths $_SERVER['SERVER_NAME'] = 'localhost'; diff --git a/apps/advanced/tests/codeception/config/backend/acceptance.php b/apps/advanced/tests/codeception/config/backend/acceptance.php index 63f5af5b66..146f0a6f15 100644 --- a/apps/advanced/tests/codeception/config/backend/acceptance.php +++ b/apps/advanced/tests/codeception/config/backend/acceptance.php @@ -1,10 +1,10 @@ [ diff --git a/apps/basic/tests/codeception/bin/yii_functional b/apps/basic/tests/codeception/bin/yii_functional index 148420fe00..af5563e4d9 100644 --- a/apps/basic/tests/codeception/bin/yii_functional +++ b/apps/basic/tests/codeception/bin/yii_functional @@ -11,7 +11,7 @@ require_once __DIR__ . '/_bootstrap.php'; $config = yii\helpers\ArrayHelper::merge( - require(ROOT_DIR . '/config/console.php'), + require(YII_ROOT_DIR . '/config/console.php'), require(__DIR__ . '/../config/config.php'), [ 'components' => [ diff --git a/apps/basic/tests/codeception/bin/yii_unit b/apps/basic/tests/codeception/bin/yii_unit index 5fb938e517..92750bb151 100644 --- a/apps/basic/tests/codeception/bin/yii_unit +++ b/apps/basic/tests/codeception/bin/yii_unit @@ -11,7 +11,7 @@ require_once __DIR__ . '/_bootstrap.php'; $config = yii\helpers\ArrayHelper::merge( - require(ROOT_DIR . '/config/console.php'), + require(YII_ROOT_DIR . '/config/console.php'), require(__DIR__ . '/../config/config.php'), [ 'components' => [ diff --git a/apps/basic/tests/codeception/config/functional.php b/apps/basic/tests/codeception/config/functional.php index 13cfc64582..32cd7c899a 100644 --- a/apps/basic/tests/codeception/config/functional.php +++ b/apps/basic/tests/codeception/config/functional.php @@ -1,6 +1,6 @@