Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

tests/mock/filesystem_extension_manager.php

@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_mock_filesystem_extension_manager extends phpbb_mock_extension_manager
+{
+	public function __construct($phpbb_root_path)
+	{
+		$extensions = array();
+		$iterator = new DirectoryIterator($phpbb_root_path . 'ext/');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && substr($fileinfo->getFilename(), 0, 1) != '.')
+			{
+				$name = $fileinfo->getFilename();
+				$extension = array(
+					'ext_name' => $name,
+					'ext_active' => true,
+					'ext_path' => 'ext/' . $name . '/',
+				);
+				$extensions[$name] = $extension;
+			}
+		}
+		ksort($extensions);
+		parent::__construct($phpbb_root_path, $extensions);
+	}
+}

tests/mock/null_cache.php

@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_mock_null_cache
+{
+	public function __construct()
+	{
+	}
+
+	public function get($var_name)
+	{
+		return false;
+	}
+
+	public function put($var_name, $var, $ttl = 0)
+	{
+	}
+
+	public function destroy($var_name, $table = '')
+	{
+	}
+
+	public function obtain_bots()
+	{
+		return array();
+	}
+
+	public function obtain_word_list()
+	{
+		return array();
+	}
+
+	public function set_bots($bots)
+	{
+	}
+
+	public function sql_exists($query_id)
+	{
+		return false;
+	}
+}