4 files changed, 39 insertions, 25 deletions
diff --git a/phpBB/phpbb/controller/exception.php b/phpBB/phpbb/controller/exception.php
index 06ece8d1d5..437558b06a 100644
--- a/phpBB/phpbb/controller/exception.php
+++ b/phpBB/phpbb/controller/exception.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -11,7 +15,6 @@ namespace phpbb\controller;
 
 /**
 * Controller exception class
-* @package phpBB3
 */
 class exception extends \RuntimeException
 {
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 959a24f277..930bc42a98 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -15,7 +19,6 @@ use Symfony\Component\Routing\RequestContext;
 
 /**
 * Controller helper class, contains methods that do things for controllers
-* @package phpBB3
 */
 class helper
 {
@@ -98,7 +101,7 @@ class helper
 	* @param string	$route		Name of the route to travel
 	* @param array	$params		String or array of additional url parameters
 	* @param bool	$is_amp		Is url using &amp; (true) or & (false)
-	* @param string	$session_id	Possibility to use a custom session id instead of the global one
+	* @param string|bool	$session_id	Possibility to use a custom session id instead of the global one
 	* @return string The URL already passed through append_sid()
 	*/
 	public function route($route, array $params = array(), $is_amp = true, $session_id = false)
@@ -136,8 +139,8 @@ class helper
 	* Output an error, effectively the same thing as trigger_error
 	*
 	* @param string $message The error message
-	* @param string $code The error code (e.g. 404, 500, 503, etc.)
-	* @return Response A Reponse instance
+	* @param int $code The error code (e.g. 404, 500, 503, etc.)
+	* @return Response A Response instance
 	*/
 	public function error($message, $code = 500)
 	{
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index a32ce1473b..fffd4f0428 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -15,7 +19,6 @@ use Symfony\Component\Config\FileLocator;
 
 /**
 * Controller interface
-* @package phpBB3
 */
 class provider
 {
@@ -34,7 +37,7 @@ class provider
 	/**
 	* Construct method
 	*
-	* @param array() $routing_files Array of strings containing paths
+	* @param array $routing_files Array of strings containing paths
 	*							to YAML files holding route information
 	*/
 	public function __construct($routing_files = array())
@@ -43,10 +46,12 @@ class provider
 	}
 
 	/**
-	* @param \phpbb\extension\finder $finder
+	* Find the list of routing files
+	*
+	* @param \phpbb\finder $finder
 	* @return null
 	*/
-	public function find_routing_files(\phpbb\extension\finder $finder)
+	public function find_routing_files(\phpbb\finder $finder)
 	{
 		// We hardcode the path to the core config directory
 		// because the finder cannot find it
@@ -58,10 +63,10 @@ class provider
 	}
 
 	/**
-	* Find a list of controllers and return it
+	* Find a list of controllers
 	*
 	* @param string $base_path Base path to prepend to file paths
-	* @return null
+	* @return provider
 	*/
 	public function find($base_path = '')
 	{
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index 3010901024..efab34b701 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -15,7 +19,6 @@ use Symfony\Component\HttpFoundation\Request;
 
 /**
 * Controller manager class
-* @package phpBB3
 */
 class resolver implements ControllerResolverInterface
 {
@@ -119,7 +122,7 @@ class resolver implements ControllerResolverInterface
 	*
 	* @param \Symfony\Component\HttpFoundation\Request $request Symfony Request object
 	* @param mixed $controller A callable (controller class, method)
-	* @return bool False
+	* @return array An array of arguments to pass to the controller
 	* @throws \phpbb\controller\exception
 	*/
 	public function getArguments(Request $request, $controller)