diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-31 01:11:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-31 01:11:19 +0100 |
| commit | 53c4257bfa68ca3962c2b47a6ba15a060861124b (patch) | |
| tree | 334b003b99880aba7e35a8bc24adcc4b95b0c836 /tests | |
| parent | 01227cdca575a0246bdbb3c0db8494950a62b654 (diff) | |
| parent | 9c7772040c473fd453971eeb2c9ee8ed26069a2d (diff) | |
| download | forums-53c4257bfa68ca3962c2b47a6ba15a060861124b.tar forums-53c4257bfa68ca3962c2b47a6ba15a060861124b.tar.gz forums-53c4257bfa68ca3962c2b47a6ba15a060861124b.tar.bz2 forums-53c4257bfa68ca3962c2b47a6ba15a060861124b.tar.xz forums-53c4257bfa68ca3962c2b47a6ba15a060861124b.zip | |
Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
[ticket/11037] Fix unit tests.
[ticket/11037] Update services.yml.
[ticket/11037] Add/update docblocks.
[ticket/11037] Eliminate globals from cache service.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cache/common_test_case.php | 5 | ||||
| -rw-r--r-- | tests/cache/null_driver_test.php | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php index fa298ec9ae..a5bc2bfda9 100644 --- a/tests/cache/common_test_case.php +++ b/tests/cache/common_test_case.php @@ -64,9 +64,10 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case public function test_cache_sql() { - global $db, $cache; + global $db, $cache, $phpbb_root_path, $phpEx; + $config = new phpbb_config(array()); $db = $this->new_dbal(); - $cache = new phpbb_cache_service($this->driver); + $cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php index 86553d4dc5..43a0cc806c 100644 --- a/tests/cache/null_driver_test.php +++ b/tests/cache/null_driver_test.php @@ -47,9 +47,10 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case public function test_cache_sql() { - global $db, $cache; + global $db, $cache, $phpbb_root_path, $phpEx; + $config = new phpbb_config(array()); $db = $this->new_dbal(); - $cache = new phpbb_cache_service($this->driver); + $cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; |