3 files changed, 116 insertions, 0 deletions
diff --git a/phpBB/includes/di/processor/config.php b/phpBB/includes/di/processor/config.php
new file mode 100644
index 0000000000..d9f866992e
--- /dev/null
+++ b/phpBB/includes/di/processor/config.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class phpbb_di_processor_config implements phpbb_di_processor_interface
+{
+    private $config_file;
+    private $phpbb_root_path;
+    private $php_ext;
+
+    public function __construct($config_file, $phpbb_root_path, $php_ext)
+    {
+        $this->config_file = $config_file;
+        $this->phpbb_root_path = $phpbb_root_path;
+        $this->php_ext = $php_ext;
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        require $this->config_file;
+
+        $container->setParameter('core.root_path', $this->phpbb_root_path);
+        $container->setParameter('core.php_ext', $this->php_ext);
+
+        $container->setParameter('core.table_prefix', $table_prefix);
+        $container->setParameter('cache.driver.class', $acm_type);
+        $container->setParameter('dbal.driver.class', 'dbal_'.$dbms);
+        $container->setParameter('dbal.dbhost', $dbhost);
+        $container->setParameter('dbal.dbuser', $dbuser);
+        $container->setParameter('dbal.dbpasswd', $dbpasswd);
+        $container->setParameter('dbal.dbname', $dbname);
+        $container->setParameter('dbal.dbport', $dbport);
+        $container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
+
+        $container->set('container', $container);
+    }
+}
diff --git a/phpBB/includes/di/processor/ext.php b/phpBB/includes/di/processor/ext.php
new file mode 100644
index 0000000000..b39ba5e686
--- /dev/null
+++ b/phpBB/includes/di/processor/ext.php
@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class phpbb_di_processor_ext implements phpbb_di_processor_interface
+{
+    private $extension_manager;
+
+    public function __construct($extension_manager)
+    {
+        $this->extension_manager = $extension_manager;
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $enabled_exts = $this->extension_manager->all_enabled();
+        foreach ($enabled_exts as $name => $path) {
+            if (file_exists($path . '/config/services.yml')) {
+                $loader = new YamlFileLoader($container, new FileLocator($path . '/config'));
+                $loader->load('services.yml');
+            }
+        }
+    }
+}
diff --git a/phpBB/includes/di/processor/interface.php b/phpBB/includes/di/processor/interface.php
new file mode 100644
index 0000000000..51bd85a076
--- /dev/null
+++ b/phpBB/includes/di/processor/interface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+interface phpbb_di_processor_interface
+{
+    public function process(ContainerBuilder $container);
+}