diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:24:09 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:24:09 -0500 |
| commit | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (patch) | |
| tree | bc63376c5ab01203cdbdbb0ed44d1af511a1afd1 /phpBB/includes/functions_container.php | |
| parent | 53c4257bfa68ca3962c2b47a6ba15a060861124b (diff) | |
| parent | 21eb8d842bc634a92f04c37e5de22c4c5692052d (diff) | |
| download | forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.gz forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.bz2 forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.tar.xz forums-1ca63fb30215c6fb4e51fdffc43c29ad0b417b42.zip | |
Merge PR #1175 branch 'igorw/ticket/11306' into develop
# By Igor Wiedler
# Via Igor Wiedler
* igorw/ticket/11306:
[ticket/11306] Add docblocks to all container related functions
[ticket/11306] Introduce phpbb_create_default_container
Diffstat (limited to 'phpBB/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 8014574443..a3ed21c35b 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -105,6 +105,15 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb return $container; } +/** +* Create a compiled and dumped ContainerBuilder object +* +* @param array $extensions Array of Container extension objects +* @param array $passes Array of Compiler Pass objects +* @param string $phpbb_root_path Root path +* @param string $php_ext PHP Extension +* @return ContainerBuilder object (compiled) +*/ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_root_path, $php_ext) { // Check for our cached container; if it exists, use it @@ -129,12 +138,60 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_ return $container; } +/** +* Create an environment-specific ContainerBuilder object +* +* If debug is enabled, the container is re-compiled every time. +* This ensures that the latest changes will always be reflected +* during development. +* +* Otherwise it will get the existing dumped container and use +* that one instead. +* +* @param array $extensions Array of Container extension objects +* @param array $passes Array of Compiler Pass objects +* @param string $phpbb_root_path Root path +* @param string $php_ext PHP Extension +* @return ContainerBuilder object (compiled) +*/ function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext) { $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container'; return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext); } +/** +* Create a default ContainerBuilder object +* +* Contains the default configuration of the phpBB container. +* +* @param array $extensions Array of Container extension objects +* @param array $passes Array of Compiler Pass objects +* @return ContainerBuilder object (compiled) +*/ +function phpbb_create_default_container($phpbb_root_path, $php_ext) +{ + return phpbb_create_dumped_container_unless_debug( + array( + new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext), + new phpbb_di_extension_core($phpbb_root_path), + ), + array( + new phpbb_di_pass_collection_pass(), + new phpbb_di_pass_kernel_pass(), + ), + $phpbb_root_path, + $php_ext + ); +} + +/** +* Get the filename under which the dumped container will be stored. +* +* @param string $phpbb_root_path Root path +* @param string $php_ext PHP Extension +* @return Path for dumped container +*/ function phpbb_container_filename($phpbb_root_path, $php_ext) { $filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path); |