diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-04 17:06:39 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 19:01:23 +0100 |
| commit | b697273aaa53d9f9f4a3d4a53cc6267e906953cd (patch) | |
| tree | 8ab6ad17b6922fb8ec93b9e0cfbc8e44991ff471 | |
| parent | 143dfa28c62bce5292c9840766f56d9f288980b5 (diff) | |
| download | forums-b697273aaa53d9f9f4a3d4a53cc6267e906953cd.tar forums-b697273aaa53d9f9f4a3d4a53cc6267e906953cd.tar.gz forums-b697273aaa53d9f9f4a3d4a53cc6267e906953cd.tar.bz2 forums-b697273aaa53d9f9f4a3d4a53cc6267e906953cd.tar.xz forums-b697273aaa53d9f9f4a3d4a53cc6267e906953cd.zip | |
[ticket/12620] Use PHPBB_ENVIRONMENT
PHPBB3-12620
| -rw-r--r-- | phpBB/common.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 4 | ||||
| -rw-r--r-- | phpBB/install/index.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 2 | ||||
| -rw-r--r-- | tests/di/create_container_test.php | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 2332802f30..85568ab10e 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -29,9 +29,9 @@ $phpbb_class_loader->register(); $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx); extract($phpbb_config_php_file->get_all()); -if (!defined('ENVIRONMENT')) +if (!defined('PHPBB_ENVIRONMENT')) { - @define('ENVIRONMENT', 'production'); + @define('PHPBB_ENVIRONMENT', 'production'); } if (!defined('PHPBB_INSTALLED')) @@ -96,7 +96,7 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); -if (ENVIRONMENT == 'debug' && !class_exists('Goutte\Client', true)) +if (PHPBB_ENVIRONMENT == 'debug' && !class_exists('Goutte\Client', true)) { trigger_error( 'Composer development dependencies have not been set up for the development environment yet, run ' . @@ -115,7 +115,7 @@ try catch (InvalidArgumentException $e) { trigger_error( - 'The requested environment ' . ENVIRONMENT . ' is not available.', + 'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.', E_USER_ERROR ); } diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index e0ecda3bfa..cdd9c7864b 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -453,11 +453,11 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont if ($debug) { - $config_data .= "@define('ENVIRONMENT', 'development');\n"; + $config_data .= "@define('PHPBB_ENVIRONMENT', 'development');\n"; } else { - $config_data .= "@define('ENVIRONMENT', 'production');\n"; + $config_data .= "@define('PHPBB_ENVIRONMENT', 'production');\n"; } if ($debug_container) diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 8edc447492..1cc588071b 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -16,7 +16,7 @@ */ define('IN_PHPBB', true); define('IN_INSTALL', true); -define('ENVIRONMENT', 'production'); +define('PHPBB_ENVIRONMENT', 'production'); /**#@-*/ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index cff0a1e76e..7787602aba 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -50,7 +50,7 @@ class core extends Extension public function load(array $config, ContainerBuilder $container) { $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path))); - $loader->load(ENVIRONMENT . '/environment.yml'); + $loader->load(PHPBB_ENVIRONMENT . '/environment.yml'); } /** diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 2ddbf68f39..ecfe504775 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -13,7 +13,7 @@ namespace { - define('ENVIRONMENT', 'production'); + define('PHPBB_ENVIRONMENT', 'production'); require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; |