makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12620] Display error message when the environment isn't available

Browse source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau 2014-05-30 15:29:09 +02:00
parent 1a6e1ecf6f
commit 873260589e
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/common.php
View file

@ -96,11 +96,30 @@ 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 = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register(); $phpbb_class_loader_ext->register();
if (ENVIRONMENT == 'debug' && !class_exists('Goutte\Client', true))
{
trigger_error(
'Composer dependencies have not been set up for the development environment yet, run ' .
"'php ../composer.phar install --dev' from the phpBB directory to do so.",
E_USER_ERROR
);
}
phpbb_load_extensions_autoloaders($phpbb_root_path); phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container // Set up container
$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
try
{
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
}
catch (InvalidArgumentException $e)
{
trigger_error(
'The requested environment ' . ENVIRONMENT . ' is not available.',
E_USER_ERROR
);
}
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));

0
phpBB/config/config_debug.yml → phpBB/config/environment_debug.yml
View file

0
phpBB/config/config_productive.yml → phpBB/config/environment_productive.yml
View file

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

@ -50,7 +50,7 @@ class core extends Extension
public function load(array $config, ContainerBuilder $container) public function load(array $config, ContainerBuilder $container)
{ {
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path))); $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
$loader->load('config_' . ENVIRONMENT . '.yml'); $loader->load('environment_' . ENVIRONMENT . '.yml');
} }
/** /**