Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php

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)
 	{

tests/mock/container_builder.php

@@ -0,0 +1,160 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ScopeInterface;
+
+class phpbb_mock_container_builder implements ContainerInterface
+{
+	/**
+	* Sets a service.
+	*
+	* @param string $id      The service identifier
+	* @param object $service The service instance
+	* @param string $scope   The scope of the service
+	*
+	* @api
+	*/
+	public function set($id, $service, $scope = self::SCOPE_CONTAINER)
+	{
+	}
+
+	/**
+	* Gets a service.
+	*
+	* @param string $id              The service identifier
+	* @param int    $invalidBehavior The behavior when the service does not exist
+	*
+	* @return object The associated service
+	*
+	* @throws InvalidArgumentException if the service is not defined
+	* @throws ServiceCircularReferenceException When a circular reference is detected
+	* @throws ServiceNotFoundException When the service is not defined
+	*
+	* @see Reference
+	*
+	* @api
+	*/
+	public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
+	{
+	}
+
+	/**
+	* Returns true if the given service is defined.
+	*
+	* @param string $id The service identifier
+	*
+	* @return Boolean true if the service is defined, false otherwise
+	*
+	* @api
+	*/
+	public function has($id)
+	{
+	}
+
+	/**
+	* Gets a parameter.
+	*
+	* @param string $name The parameter name
+	*
+	* @return mixed  The parameter value
+	*
+	* @throws InvalidArgumentException if the parameter is not defined
+	*
+	* @api
+	*/
+	public function getParameter($name)
+	{
+	}
+
+	/**
+	* Checks if a parameter exists.
+	*
+	* @param string $name The parameter name
+	*
+	* @return Boolean The presence of parameter in container
+	*
+	* @api
+	*/
+	public function hasParameter($name)
+	{
+	}
+
+	/**
+	* Sets a parameter.
+	*
+	* @param string $name  The parameter name
+	* @param mixed  $value The parameter value
+	*
+	* @api
+	*/
+	public function setParameter($name, $value)
+	{
+	}
+
+	/**
+	* Enters the given scope
+	*
+	* @param string $name
+	*
+	* @api
+	*/
+	public function enterScope($name)
+	{
+	}
+
+	/**
+	* Leaves the current scope, and re-enters the parent scope
+	*
+	* @param string $name
+	*
+	* @api
+	*/
+	public function leaveScope($name)
+	{
+	}
+
+	/**
+	* Adds a scope to the container
+	*
+	* @param ScopeInterface $scope
+	*
+	* @api
+	*/
+	public function addScope(ScopeInterface $scope)
+	{
+	}
+
+	/**
+	* Whether this container has the given scope
+	*
+	* @param string $name
+	*
+	* @return Boolean
+	*
+	* @api
+	*/
+	public function hasScope($name)
+	{
+	}
+
+	/**
+	* Determines whether the given scope is currently active.
+	*
+	* It does however not check if the scope actually exists.
+	*
+	* @param string $name
+	*
+	* @return Boolean
+	*
+	* @api
+	*/
+	public function isScopeActive($name)
+	{
+	}
+}

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/fileupload.php

@@ -20,33 +20,4 @@ class phpbb_mock_fileupload
 	{
 		return true;
 	}
-
-	/**
-	 * Copied verbatim from phpBB/includes/functions_upload.php's fileupload
-	 * class to ensure the correct behaviour of filespec::move_file.
-	 *
-	 * Maps file extensions to the constant in second index of the array
-	 * returned by getimagesize()
-	 */
-	public function image_types()
-	{
-		return array(
-			IMAGETYPE_GIF		=> array('gif'),
-			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
-			IMAGETYPE_PNG		=> array('png'),
-			IMAGETYPE_SWF		=> array('swf'),
-			IMAGETYPE_PSD		=> array('psd'),
-			IMAGETYPE_BMP		=> array('bmp'),
-			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
-			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
-			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_SWC		=> array('swc'),
-			IMAGETYPE_IFF		=> array('iff'),
-			IMAGETYPE_WBMP		=> array('wbmp'),
-			IMAGETYPE_XBM		=> array('xbm'),
-		);
-	}
 }

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;
+	}
+}

tests/mock/request.php

@@ -11,13 +11,14 @@ class phpbb_mock_request implements phpbb_request_interface
 {
 	protected $data;
 
-	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false)
+	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array())
 	{
 		$this->data[phpbb_request_interface::GET] = $get;
 		$this->data[phpbb_request_interface::POST] = $post;
 		$this->data[phpbb_request_interface::COOKIE] = $cookie;
 		$this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
 		$this->data[phpbb_request_interface::SERVER] = $server;
+		$this->data[phpbb_request_interface::FILES] = $files;
 	}
 
 	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST)
@@ -42,6 +43,12 @@ class phpbb_mock_request implements phpbb_request_interface
 		return $this->server($var_name, $default);
 	}
 
+	public function file($form_name)
+	{
+		$super_global = phpbb_request_interface::FILES;
+		return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array();
+	}
+
 	public function is_set_post($name)
 	{
 		return $this->is_set($name, phpbb_request_interface::POST);