From 0fd3bb170b95bc8c99329e47990e38c038629075 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 12 Nov 2012 11:10:25 +0100
Subject: [ticket/11015] Fixup some things from the big merge

PHPBB3-11015
---
 tests/di/create_container_test.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/di/create_container_test.php')

diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index c2b8a0fc0b..6de8803df9 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -9,7 +9,6 @@
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_container.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/dbal.php';
 
 class phpbb_di_container_test extends phpbb_test_case
 {
@@ -52,7 +51,7 @@ class phpbb_di_container_test extends phpbb_test_case
     }
 }
 
-class dbal_container_mock extends dbal
+class phpbb_db_driver_container_mock extends phpbb_db_driver
 {
     public function sql_connect()
     {
-- 
cgit v1.2.1


From 1a5d685f45e5fd4450750227ef2eefe34a9b482a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 11 Jul 2013 17:54:03 -0400
Subject: [feature/bootstrap-dic] Bootstrap container from config.php

PHPBB3-11651
---
 tests/di/create_container_test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/di/create_container_test.php')

diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 6de8803df9..b3992dbd80 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -40,11 +40,12 @@ class phpbb_di_container_test extends phpbb_test_case
     public function test_phpbb_create_compiled_container()
     {
         $phpbb_root_path = __DIR__ . '/../../phpBB/';
+        $config_file = __DIR__ . '/fixtures/config.php';
         $extensions = array(
             new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
             new phpbb_di_extension_core($phpbb_root_path),
         );
-        $container = phpbb_create_compiled_container($extensions, array(), $phpbb_root_path, 'php');
+        $container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php');
 
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
         $this->assertTrue($container->isFrozen());
-- 
cgit v1.2.1


From 1dea0286a48b4bac6702aad673e13e281690adfb Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 12 Jul 2013 15:40:49 -0400
Subject: [ticket/11574] Use alternate DI config file for updater

PHPBB3-11574
---
 tests/di/create_container_test.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/di/create_container_test.php')

diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 6de8803df9..d6a5ec823b 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -17,7 +17,7 @@ class phpbb_di_container_test extends phpbb_test_case
         $phpbb_root_path = __DIR__ . '/../../phpBB/';
         $extensions = array(
             new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
-            new phpbb_di_extension_core($phpbb_root_path),
+            new phpbb_di_extension_core($phpbb_root_path . 'config'),
         );
         $container = phpbb_create_container($extensions, $phpbb_root_path, 'php');
 
@@ -29,7 +29,7 @@ class phpbb_di_container_test extends phpbb_test_case
         $phpbb_root_path = __DIR__ . '/../../phpBB/';
         $extensions = array(
             new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
-            new phpbb_di_extension_core($phpbb_root_path),
+            new phpbb_di_extension_core($phpbb_root_path . 'config'),
         );
         $container = phpbb_create_install_container($phpbb_root_path, 'php');
 
@@ -42,7 +42,7 @@ class phpbb_di_container_test extends phpbb_test_case
         $phpbb_root_path = __DIR__ . '/../../phpBB/';
         $extensions = array(
             new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
-            new phpbb_di_extension_core($phpbb_root_path),
+            new phpbb_di_extension_core($phpbb_root_path . 'config'),
         );
         $container = phpbb_create_compiled_container($extensions, array(), $phpbb_root_path, 'php');
 
-- 
cgit v1.2.1