mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00
Code Issues Releases Wiki Activity

[ticket/12620] Use PHPBB_ENVIRONMENT

Browse Source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau 2014-09-04 17:06:39 +02:00
parent 143dfa28c6
commit b697273aaa
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/common.php
View File

@ -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
);
}

4
phpBB/includes/functions_install.php
View File

@ -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)

2
phpBB/install/index.php
View File

@ -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 : './../';

2
phpBB/phpbb/di/extension/core.php
View File

@ -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');
}
/**

2
tests/di/create_container_test.php
View File

@ -13,7 +13,7 @@
namespace
{
define('ENVIRONMENT', 'production');
define('PHPBB_ENVIRONMENT', 'production');
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';