diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 11:10:25 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 11:16:39 +0100 |
| commit | 0fd3bb170b95bc8c99329e47990e38c038629075 (patch) | |
| tree | 4222da246667aba91d51a4c2e335c317a766f18a /tests | |
| parent | bf641a7f31f87eb7b88437214315872bff36ae84 (diff) | |
| download | forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.gz forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.bz2 forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.xz forums-0fd3bb170b95bc8c99329e47990e38c038629075.zip | |
[ticket/11015] Fixup some things from the big merge
PHPBB3-11015
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/di/create_container_test.php | 3 | ||||
| -rw-r--r-- | tests/mock/cache.php | 2 |
2 files changed, 2 insertions, 3 deletions
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() { diff --git a/tests/mock/cache.php b/tests/mock/cache.php index c6d08afef0..b64c92ea89 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -121,7 +121,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface public function sql_load($query) { } - public function sql_save($query, &$query_result, $ttl) + public function sql_save($query, $query_result, $ttl) { } public function sql_exists($query_id) |