Merge PR #974 branch 'bantu/ticket/10875' into develop

* bantu/ticket/10875:
  [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
  [ticket/10875] Test for null cache driver and sql cache.
  [ticket/10875] Revise sql cache test.
  [ticket/10875] Must return query result on failure.
  [ticket/10875] More documentation.
  [ticket/10875] Spelling fix.
  [ticket/10875] Add docblocks for phpbb_cache_driver_interface
  [ticket/10875] Add comment about cache's sql_load() method.
  [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
  [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
  [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
  [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.

2 files changed, 39 insertions, 3 deletions

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index c5f5fac88c..285af5cd0c 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -89,20 +89,55 @@ class phpbb_cache_test extends phpbb_database_test_case
 			WHERE config_name = 'foo'";
 		$result = $db->sql_query($sql, 300);
 		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
 
 		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
 
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
 		$result = $db->sql_query($sql, 300);
 
-		$this->assertEquals($first_result, $db->sql_fetchrow($result));
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
 
 		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'bar'";
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
+
+	public function test_null_cache_sql()
+	{
+		$driver = new phpbb_cache_driver_null($this->cache_dir);
+
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		// As null cache driver does not actually cache,
+		// this should return no results
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
 		$result = $db->sql_query($sql, 300);
 
-		$this->assertNotEquals($first_result, $db->sql_fetchrow($result));
+		$this->assertSame(false, $db->sql_fetchrow($result));
 
 		$db->sql_close();
 	}
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index b64c92ea89..bc18ca066b 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -123,6 +123,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	}
 	public function sql_save($query, $query_result, $ttl)
 	{
+		return $query_result;
 	}
 	public function sql_exists($query_id)
 	{