Procházet zdrojové kódy

Prefixed constants to avoid possible naming conflicts

Alexander Makarov před 11 roky
rodič
revize
f85a0f7dd2

+ 4 - 4
tests/codeception/_bootstrap.php

@@ -2,14 +2,14 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
+defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('YII_TEST_ENTRY_FILE') or define('YII_TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
 require_once(__DIR__ . '/../../vendor/autoload.php');
 require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
 Yii::setAlias('@codeception', __DIR__);

+ 3 - 3
tests/codeception/bin/_bootstrap.php

@@ -6,7 +6,7 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 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(ROOT_DIR . '/vendor/autoload.php');
-require(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_ROOT_DIR . '/vendor/autoload.php');
+require(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');

+ 1 - 1
tests/codeception/bin/yii_acceptance

@@ -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' => [

+ 1 - 1
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' => [

+ 1 - 1
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' => [

+ 2 - 2
tests/codeception/config/functional.php

@@ -1,6 +1,6 @@
 <?php
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 
 /**
  * Application configuration for functional tests