diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
| commit | 208770d7fddefb7ac46dd63387bc8ab4a2724edd (patch) | |
| tree | 4d9377436c29a2b272505f7d9039d7110a48054d /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (diff) | |
| parent | 0483971f7786b10c3359dfbe4912501de0d6c7de (diff) | |
| download | forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.gz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.bz2 forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.xz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.zip | |
Merge remote-tracking branch 'p/ticket/11305' into develop
* p/ticket/11305:
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
[ticket/11305] Extract hook finder from cache service.
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 59979e035d..e346223a4b 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -262,7 +262,7 @@ class phpbb_functional_test_case extends phpbb_test_case $config['rand_seed_last_update'] = time() + 600; // Required by user_add - global $db, $cache, $phpbb_dispatcher; + global $db, $cache, $phpbb_dispatcher, $phpbb_container; $db = $this->get_db(); if (!function_exists('phpbb_mock_null_cache')) { @@ -270,6 +270,14 @@ class phpbb_functional_test_case extends phpbb_test_case } $cache = new phpbb_mock_null_cache; + $cache_driver = new phpbb_cache_driver_null(); + $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); + $phpbb_container + ->expects($this->any()) + ->method('get') + ->with('cache.driver') + ->will($this->returnValue($cache_driver)); + if (!function_exists('utf_clean_string')) { require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); |