diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 22:40:37 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 23:15:49 +0100 |
| commit | 677b5b2cd4937ee6c777728082084c661223dee8 (patch) | |
| tree | 4342890f46004943e15a2cfd8ccdd559619bb53c /phpBB/phpbb/di/extension/core.php | |
| parent | 93f61a4a7d34f8ad565bdc1605784284994ecdfc (diff) | |
| download | forums-677b5b2cd4937ee6c777728082084c661223dee8.tar forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.gz forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.bz2 forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.xz forums-677b5b2cd4937ee6c777728082084c661223dee8.zip | |
[ticket/12620] Fix rebase
PHPBB3-12620
Diffstat (limited to 'phpBB/phpbb/di/extension/core.php')
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index ce0d4a869c..72d46fb05b 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -25,29 +25,29 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension; class core extends Extension { /** - * Config path - * @var string - */ + * Config path + * @var string + */ protected $config_path; /** - * Constructor - * - * @param string $config_path Config path - */ + * Constructor + * + * @param string $config_path Config path + */ public function __construct($config_path) { $this->config_path = $config_path; } /** - * Loads a specific configuration. - * - * @param array $configs An array of configuration values - * @param ContainerBuilder $container A ContainerBuilder instance - * - * @throws \InvalidArgumentException When provided tag is not defined in this extension - */ + * Loads a specific configuration. + * + * @param array $configs An array of configuration values + * @param ContainerBuilder $container A ContainerBuilder instance + * + * @throws \InvalidArgumentException When provided tag is not defined in this extension + */ public function load(array $configs, ContainerBuilder $container) { $loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path))); @@ -81,12 +81,12 @@ class core extends Extension } /** - * Returns the recommended alias to use in XML. - * - * This alias is also the mandatory prefix to use when using YAML. - * - * @return string The alias - */ + * Returns the recommended alias to use in XML. + * + * This alias is also the mandatory prefix to use when using YAML. + * + * @return string The alias + */ public function getAlias() { return 'core'; |