1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-14 04:34:07 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
  [task/session-tests] Test additional combinations of session_begin.
  [task/session-tests] Added tests for the session class.

Conflicts:
	tests/mock/cache.php
This commit is contained in:
Nils Adermann
2011-01-23 18:44:03 +01:00
8 changed files with 322 additions and 1 deletions

View File

@@ -90,4 +90,9 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
public function sql_freeresult($query_id)
{
}
public function obtain_bots()
{
return isset($this->data['_bots']) ? $this->data['_bots'] : array();
}
}