aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/di
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-30 00:51:28 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-07 01:02:43 +0200
commit35c0b6d77ac1f42c1e76b7c15469b025cd50845e (patch)
tree997eee03daeb03f8c6d424c1180e0c31c67de341 /phpBB/phpbb/di
parentd226a73111063194bac700c4236cb43dacd3ffc7 (diff)
downloadforums-35c0b6d77ac1f42c1e76b7c15469b025cd50845e.tar
forums-35c0b6d77ac1f42c1e76b7c15469b025cd50845e.tar.gz
forums-35c0b6d77ac1f42c1e76b7c15469b025cd50845e.tar.bz2
forums-35c0b6d77ac1f42c1e76b7c15469b025cd50845e.tar.xz
forums-35c0b6d77ac1f42c1e76b7c15469b025cd50845e.zip
[ticket/12775] Fix doc blocks in the container builder
PHPBB3-12775
Diffstat (limited to 'phpBB/phpbb/di')
-rw-r--r--phpBB/phpbb/di/container_builder.php23
1 files changed, 14 insertions, 9 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 95b82b26c7..4b6fb6d20b 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -42,42 +42,42 @@ class container_builder
protected $installed_exts = null;
/**
- * Indicates if the php config file should be injecting into the container (default to true).
+ * Indicates whether the php config file should be injected into the container (default to true).
*
* @var bool
*/
protected $inject_config = true;
/**
- * Indicates if the extensions should be used (default to true).
+ * Indicates whether extensions should be used (default to true).
*
* @var bool
*/
protected $use_extensions = true;
/**
- * Defines a custom path to find the configuration of the container.
+ * Defines a custom path to find the configuration of the container (default to $this->phpbb_root_path . 'config')
*
* @var string
*/
protected $config_path = null;
/**
- * Indicates if the phpBB compile pass have to be used (default to true).
+ * Indicates whether the phpBB compile pass should be used (default to true).
*
* @var bool
*/
protected $use_custom_pass = true;
/**
- * Indicates if the kernel compile pass have to be used (default to true).
+ * Indicates whether the kernel compile pass should be used (default to true).
*
* @var bool
*/
protected $use_kernel_pass = true;
/**
- * Indicates if a dump container should be used (default to true).
+ * Indicates whether the container should be dumped to the filesystem (default to true).
*
* If DEBUG_CONTAINER is set this option is ignored and a new container is build.
*
@@ -106,15 +106,20 @@ class container_builder
protected $custom_parameters = null;
/**
+ * @var \phpbb\config_php_file
+ */
+ protected $config_php_file;
+
+ /**
* Constructor
*
- * @param \phpbb\config_php_file $config_php_handler
+ * @param \phpbb\config_php_file $config_php_file
* @param string $phpbb_root_path Path to the phpbb includes directory.
* @param string $php_ext php file extension
*/
- function __construct(\phpbb\config_php_file $config_php_handler, $phpbb_root_path, $php_ext)
+ function __construct(\phpbb\config_php_file $config_php_file, $phpbb_root_path, $php_ext)
{
- $this->config_php_handler = $config_php_handler;
+ $this->config_php_file = $config_php_file;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
}