Merge pull request #1769 from atishamte/develop

Correction in Methods and Spellings

Author: lonnieezell

system/CodeIgniter.php

@@ -199,7 +199,7 @@ public function initialize()
 	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
 	 * @param boolean                                      $returnResponse
 	 *
-	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 * @throws \Exception
 	 */
 	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
@@ -234,7 +234,7 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons
 		{
 			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
 		}
-		catch (Router\RedirectException $e)
+		catch (\CodeIgniter\Filters\Exceptions\FilterException $e)
 		{
 			$logger = Services::logger();
 			$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
@@ -533,7 +533,7 @@ protected function forceSecureAccess($duration = 31536000)
 	 *
 	 * @throws \Exception
 	 *
-	 * @return boolean
+	 * @return bool|\CodeIgniter\HTTP\ResponseInterface
 	 */
 	public function displayCache($config)
 	{
@@ -564,7 +564,9 @@ public function displayCache($config)
 			$this->response->setBody($output);
 
 			return $this->response;
-		};
+		}
+
+		return false;
 	}
 
 	//--------------------------------------------------------------------
@@ -574,7 +576,7 @@ public function displayCache($config)
 	 *
 	 * @param integer $time
 	 *
-	 * @return $this
+	 * @return void
 	 */
 	public static function cache(int $time)
 	{

system/Controller.php

@@ -35,7 +35,7 @@
  * @since      Version 3.0.0
  * @filesource
  */
-
+use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Validation\Validation;
@@ -106,7 +106,7 @@ class Controller
 	 * @param ResponseInterface        $response
 	 * @param \Psr\Log\LoggerInterface $logger
 	 *
-	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
 	 */
 	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
 	{
@@ -135,7 +135,7 @@ public function initController(RequestInterface $request, ResponseInterface $res
 	 *                          considered secure for. Only with HSTS header.
 	 *                          Default value is 1 year.
 	 *
-	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
 	 */
 	public function forceHTTPS(int $duration = 31536000)
 	{
@@ -179,8 +179,8 @@ protected function loadHelpers()
 	 * A shortcut to performing validation on input data. If validation
 	 * is not successful, a $errors property will be set on this class.
 	 *
-	 * @param array $rules
-	 * @param array $messages An array of custom error messages
+	 * @param array|string  $rules
+	 * @param array         $messages An array of custom error messages
 	 *
 	 * @return boolean
 	 */

system/Entity.php

@@ -1,6 +1,7 @@
 <?php namespace CodeIgniter;
 
 use CodeIgniter\I18n\Time;
+use CodeIgniter\Exceptions\CastException;
 
 /**
  * CodeIgniter

system/HTTP/Header.php

@@ -91,7 +91,7 @@ public function getName()
 
 	/**
 	 * Gets the raw value of the header. This may return either a string
-	 * of an array, depending on whether the header has mutliple values or not.
+	 * of an array, depending on whether the header has multiple values or not.
 	 *
 	 * @return array|null|string
 	 */

system/Model.php

@@ -343,8 +343,6 @@ public function find($id = null)
 		$this->tempReturnType     = $this->returnType;
 		$this->tempUseSoftDeletes = $this->useSoftDeletes;
 
-		$this->reset();
-
 		return $row['data'];
 	}
 

system/Router/RouteCollection.php

@@ -223,7 +223,7 @@ class RouteCollection implements RouteCollectionInterface
 	 * Constructor
 	 *
 	 * @param FileLocator    $locator
-	 * @param Config/Modules $moduleConfig
+	 * @param \Config\Modules $moduleConfig
 	 */
 	public function __construct(FileLocator $locator, $moduleConfig)
 	{

system/Session/Session.php

@@ -52,7 +52,7 @@ class Session implements SessionInterface
 	/**
 	 * Instance of the driver to use.
 	 *
-	 * @var HandlerInterface
+	 * @var \CodeIgniter\Log\Handlers\HandlerInterface
 	 */
 	protected $driver;
 

system/Test/ControllerTester.php

@@ -110,7 +110,7 @@ public function controller(string $name)
 	 * @param string $method
 	 * @param array  $params
 	 *
-	 * @return \CodeIgniter\TestControllerResponse
+	 * @return \CodeIgniter\Test\ControllerResponse|\InvalidArgumentException
 	 */
 	public function execute(string $method, ...$params)
 	{

system/Validation/Validation.php

@@ -540,13 +540,13 @@ protected function loadRuleSets()
 	 *
 	 * @param string|null $group
 	 *
-	 * @return array|void
+	 * @return array|ValidationException|null
 	 */
 	public function loadRuleGroup(string $group = null)
 	{
 		if (empty($group))
 		{
-			return;
+			return null;
 		}
 
 		if (! isset($this->config->$group))

system/View/Filters.php

@@ -309,7 +309,7 @@ public static function prose(string $value): string
 	 *
 	 * @return string
 	 */
-	public static function round($value, $precision = 2, $type = 'common')
+	public static function round($value, $precision = 2, $type = 'common'): string
 	{
 		if (! is_numeric($precision))
 		{

system/View/Parser.php

@@ -530,7 +530,7 @@ protected function parseConditionals(string $template): string
 		extract($this->data);
 		try
 		{
-			$result = eval('?>' . $template . '<?php ');
+			eval('?>' . $template . '<?php ');
 		}
 		catch (\ParseError $e)
 		{
@@ -627,7 +627,7 @@ protected function prepareReplacement(array $matches, string $replace, bool $esc
 	 *
 	 * @param string $key
 	 *
-	 * @return false|html
+	 * @return false|string
 	 */
 	public function shouldAddEscaping(string $key)
 	{

system/View/View.php

@@ -81,7 +81,7 @@ class View implements RendererInterface
 	/**
 	 * Logger instance.
 	 *
-	 * @var Logger
+	 * @var \CodeIgniter\Log\Logger
 	 */
 	protected $logger;
 
@@ -414,7 +414,7 @@ public function getData()
 	 *
 	 * @param string $layout
 	 *
-	 * @return $this
+	 * @return void
 	 */
 	public function extend(string $layout)
 	{