Merge pull request #3554 from Nicofuma/ticket/13770

[ticket/13770] Wither interface for container_builder
author: Nils Adermann <naderman@naderman.de> 2015-05-29 10:56:54 +0200
committer: Nils Adermann <naderman@naderman.de> 2015-05-29 10:56:54 +0200
commit: da68f62d4f70457ba96147fd98c9667f518093de (patch)
tree: 8ae7e9ad96650512c3eac54de7f1d2b4e7f3888c /tests/di
parent: bfba82cd28c16dd6eed74af5337e69280f6bf500 (diff)
parent: 2b25c5bd35a1a5e668d0f4e644cfabf995e1a537 (diff)
download: forums-da68f62d4f70457ba96147fd98c9667f518093de.tar
forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.gz
forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.bz2
forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.xz
forums-da68f62d4f70457ba96147fd98c9667f518093de.zip
4 files changed, 40 insertions, 70 deletions
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index d52fb6b085..2d94f1d778 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -31,7 +31,8 @@ namespace
 		{
 			$this->phpbb_root_path = dirname(__FILE__) . '/';
 			$this->config_php = new \phpbb\config_php_file($this->phpbb_root_path . 'fixtures/', 'php');
-			$this->builder = new phpbb_mock_phpbb_di_container_builder($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php');
+			$this->builder = new phpbb_mock_phpbb_di_container_builder($this->phpbb_root_path . 'fixtures/', 'php');
+			$this->builder->with_config($this->config_php);
 
 			$this->filename = $this->phpbb_root_path . '../tmp/container.php';
 			if (is_file($this->filename))
@@ -78,9 +79,9 @@ namespace
 			$this->assertTrue($container->isFrozen());
 		}
 
-		public function test_dump_container()
+		public function test_without_cache()
 		{
-			$this->builder->set_dump_container(false);
+			$this->builder->without_cache();
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
@@ -94,9 +95,9 @@ namespace
 			$this->assertTrue($container->isFrozen());
 		}
 
-		public function test_use_extensions()
+		public function test_without_extensions()
 		{
-			$this->builder->set_use_extensions(false);
+			$this->builder->without_extensions();
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
@@ -109,9 +110,9 @@ namespace
 			$this->assertFalse($container->hasParameter('available'));
 		}
 
-		public function test_compile_container()
+		public function test_without_compiled_container()
 		{
-			$this->builder->set_compile_container(false);
+			$this->builder->without_compiled_container();
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
@@ -119,19 +120,9 @@ namespace
 			$this->assertFalse($container->isFrozen());
 		}
 
-		public function test_inject_config()
+		public function test_with_config_path()
 		{
-			$this->builder->set_inject_config(false);
-			$container = $this->builder->get_container();
-			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
-
-			// Checks inject_config
-			$this->assertFalse($container->hasParameter('dbal.dbhost'));
-		}
-
-		public function test_set_config_path()
-		{
-			$this->builder->set_config_path($this->phpbb_root_path . 'fixtures/other_config/');
+			$this->builder->with_config_path($this->phpbb_root_path . 'fixtures/other_config/');
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
@@ -139,9 +130,9 @@ namespace
 			$this->assertFalse($container->hasParameter('core'));
 		}
 
-		public function test_set_custom_parameters()
+		public function test_with_custom_parameters()
 		{
-			$this->builder->set_custom_parameters(array('my_parameter' => true));
+			$this->builder->with_custom_parameters(array('my_parameter' => true));
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
@@ -150,61 +141,21 @@ namespace
 	}
 }
 
-namespace phpbb\db\driver
+namespace phpbb\extension
 {
-	class container_mock extends \phpbb\db\driver\driver
+	class manager_mock extends \phpbb\extension\manager
 	{
-		public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-		{
-		}
-
-		public function sql_query($query = '', $cache_ttl = 0)
-		{
-		}
-
-		public function sql_fetchrow($query_id = false)
-		{
-		}
-
-		public function sql_freeresult($query_id = false)
-		{
-		}
-
-		function sql_server_info($raw = false, $use_cache = true)
-		{
-		}
-
-		function sql_affectedrows()
-		{
-		}
-
-		function sql_rowseek($rownum, &$query_id)
-		{
-		}
-
-		function sql_nextid()
-		{
-		}
-
-		function sql_escape($msg)
-		{
-		}
-
-		function sql_like_expression($expression)
-		{
-		}
-
-		function sql_not_like_expression($expression)
+		public function __construct()
 		{
 		}
 
-		function sql_fetchrowset($query_id = false)
+		public function all_enabled($phpbb_relative = true)
 		{
 			return array(
-				array('ext_name' => 'vendor/enabled'),
-				array('ext_name' => 'vendor/enabled-2'),
-				array('ext_name' => 'vendor/enabled-3'),
-				array('ext_name' => 'vendor/enabled_4'),
+				'vendor/enabled' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled/',
+				'vendor/enabled-2' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-2/',
+				'vendor/enabled-3' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled-3/',
+				'vendor/enabled_4' => dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/',
 			);
 		}
 	}
diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php
index f2e1145efa..1e9207d924 100644
--- a/tests/di/fixtures/config.php
+++ b/tests/di/fixtures/config.php
@@ -1,7 +1,7 @@
 <?php
 // phpBB 3.1.x auto-generated configuration file
 // Do not change anything in this file!
-$dbms = 'container_mock';
+$dbms = 'mysql';
 $dbhost = '127.0.0.1';
 $dbport = '';
 $dbname = 'phpbb';
diff --git a/tests/di/fixtures/config/production/config.yml b/tests/di/fixtures/config/production/config.yml
new file mode 100644
index 0000000000..fcfa84f68b
--- /dev/null
+++ b/tests/di/fixtures/config/production/config.yml
@@ -0,0 +1,2 @@
+core:
+    require_dev_dependencies: true
diff --git a/tests/di/fixtures/config/production/container/environment.yml b/tests/di/fixtures/config/production/container/environment.yml
new file mode 100644
index 0000000000..6ac07a44d9
--- /dev/null
+++ b/tests/di/fixtures/config/production/container/environment.yml
@@ -0,0 +1,17 @@
+parameters:
+    core: true
+
+services:
+    config.php:
+        synthetic: true
+
+    dbal.conn:
+        class: phpbb\db\driver\factory
+        arguments:
+            - @service_container
+
+    dispatcher:
+        class: phpbb\db\driver\container_mock
+
+    ext.manager:
+        class: phpbb\extension\manager_mock
author	Nils Adermann <naderman@naderman.de>	2015-05-29 10:56:54 +0200
committer	Nils Adermann <naderman@naderman.de>	2015-05-29 10:56:54 +0200
commit	da68f62d4f70457ba96147fd98c9667f518093de (patch)
tree	8ae7e9ad96650512c3eac54de7f1d2b4e7f3888c /tests/di
parent	bfba82cd28c16dd6eed74af5337e69280f6bf500 (diff)
parent	2b25c5bd35a1a5e668d0f4e644cfabf995e1a537 (diff)
download	forums-da68f62d4f70457ba96147fd98c9667f518093de.tar forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.gz forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.bz2 forums-da68f62d4f70457ba96147fd98c9667f518093de.tar.xz forums-da68f62d4f70457ba96147fd98c9667f518093de.zip