Merge pull request #1863 from atishamte/typos

Module wise Typos changes

Author: lonnieezell

system/Autoloader/Autoloader.php

@@ -1,7 +1,5 @@
 <?php namespace CodeIgniter\Autoloader;
 
-use Composer\Autoload\ClassLoader;
-
 /**
  * CodeIgniter
  *

system/CLI/CLI.php

@@ -204,13 +204,13 @@ public static function input(string $prefix = null): string
 	 * $email = CLI::prompt('What is your email?', null, 'required|valid_email');
 	 *
 	 * @param string       $field      Output "field" question
-	 * @param string|array $options    String to a defaul value, array to a list of options (the first option will be the default value)
+	 * @param string|array $options    String to a default value, array to a list of options (the first option will be the default value)
 	 * @param string       $validation Validation rules
 	 *
 	 * @return             string                   The user input
 	 * @codeCoverageIgnore
 	 */
-	public static function prompt($field, $options = null, $validation = null): string
+	public static function prompt(string $field, $options = null, string $validation = null): string
 	{
 		$extra_output = '';
 		$default      = '';
@@ -270,7 +270,7 @@ public static function prompt($field, $options = null, $validation = null): stri
 	 * @return             boolean
 	 * @codeCoverageIgnore
 	 */
-	protected static function validate($field, $value, $rules)
+	protected static function validate(string $field, string $value, string $rules): bool
 	{
 		$validation = \Config\Services::validation(null, false);
 		$validation->setRule($field, null, $rules);
@@ -380,10 +380,12 @@ public static function wait(int $seconds, bool $countdown = false)
 
 	/**
 	 * if operating system === windows
+	 *
+	 * @return boolean
 	 */
-	public static function isWindows()
+	public static function isWindows(): bool
 	{
-			   return stripos(PHP_OS, 'WIN') === 0;
+		return stripos(PHP_OS, 'WIN') === 0;
 	}
 
 	//--------------------------------------------------------------------
@@ -436,7 +438,7 @@ public static function clearScreen()
 	 *
 	 * @return string    The color coded string
 	 */
-	public static function color(string $text, string $foreground, string $background = null, string $format = null)
+	public static function color(string $text, string $foreground, string $background = null, string $format = null): string
 	{
 		if (static::isWindows() && ! isset($_SERVER['ANSICON']))
 		{
@@ -655,7 +657,7 @@ public static function wrap(string $string = null, int $max = 0, int $pad_left =
 	 * Parses the command line it was called from and collects all
 	 * options and valid segments.
 	 *
-	 * I tried to use getopt but had it fail occassionally to find any
+	 * I tried to use getopt but had it fail occasionally to find any
 	 * options but argc has always had our back. We don't have all of the power
 	 * of getopt but this does us just fine.
 	 */
@@ -706,7 +708,7 @@ protected static function parseCommandLine()
 	 *
 	 * @return string
 	 */
-	public static function getURI()
+	public static function getURI(): string
 	{
 		return implode('/', static::$segments);
 	}
@@ -743,7 +745,7 @@ public static function getSegment(int $index)
 	 *
 	 * @return array
 	 */
-	public static function getSegments()
+	public static function getSegments(): array
 	{
 		return static::$segments;
 	}
@@ -779,7 +781,7 @@ public static function getOption(string $name)
 	 *
 	 * @return array
 	 */
-	public static function getOptions()
+	public static function getOptions(): array
 	{
 		return static::$options;
 	}
@@ -819,12 +821,12 @@ public static function getOptionString(): string
 	//--------------------------------------------------------------------
 
 	/**
-	 * Returns a well formated table
+	 * Returns a well formatted table
 	 *
 	 * @param array $tbody List of rows
 	 * @param array $thead List of columns
 	 *
-	 * @return string
+	 * @return void
 	 */
 	public static function table(array $tbody, array $thead = [])
 	{

system/CLI/CommandRunner.php

@@ -63,6 +63,8 @@ class CommandRunner extends Controller
 	 *
 	 * @param string $method
 	 * @param array  ...$params
+	 *
+	 * @throws \ReflectionException
 	 */
 	public function _remap($method, ...$params)
 	{
@@ -81,6 +83,7 @@ public function _remap($method, ...$params)
 	 * @param array $params
 	 *
 	 * @return mixed
+	 * @throws \ReflectionException
 	 */
 	public function index(array $params)
 	{
@@ -128,6 +131,8 @@ protected function runCommand(string $command, array $params)
 	/**
 	 * Scans all Commands directories and prepares a list
 	 * of each command with it's group and file.
+	 *
+	 * @throws \ReflectionException
 	 */
 	protected function createCommandList()
 	{

system/CLI/Console.php

@@ -68,7 +68,7 @@ public function __construct(CodeIgniter $app)
 	 * @param boolean $useSafeOutput
 	 *
 	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
-	 * @throws \CodeIgniter\HTTP\RedirectException
+	 * @throws \CodeIgniter\Router\RedirectException
 	 */
 	public function run(bool $useSafeOutput = false)
 	{

system/Cache/Handlers/PredisHandler.php

@@ -37,7 +37,7 @@
  */
 
 use CodeIgniter\Cache\CacheInterface;
-use CodeIgniter\CriticalError;
+use CodeIgniter\Exceptions\CriticalError;
 
 class PredisHandler implements CacheInterface
 {

system/Cache/Handlers/RedisHandler.php

@@ -36,7 +36,6 @@
  * @filesource
  */
 
-use CodeIgniter\Exceptions\CriticalError;
 use CodeIgniter\Cache\CacheInterface;
 
 class RedisHandler implements CacheInterface
@@ -106,28 +105,19 @@ public function initialize()
 		$config = $this->config;
 
 		$this->redis = new \Redis();
+		if (!$this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout']))
+		{
+			log_message('error', 'Cache: Redis connection failed. Check your configuration.');
+		}
 
-		try
+		if (isset($config['password']) && !$this->redis->auth($config['password']))
 		{
-			if (! $this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout'])
-			)
-			{
-				//              log_message('error', 'Cache: Redis connection failed. Check your configuration.');
-			}
-
-			if (isset($config['password']) && ! $this->redis->auth($config['password']))
-			{
-				log_message('error', 'Cache: Redis authentication failed.');
-			}
-
-			if (isset($config['database']) && ! $this->redis->select($config['database']))
-			{
-				log_message('error', 'Cache: Redis select database failed.');
-			}
+			log_message('error', 'Cache: Redis authentication failed.');
 		}
-		catch (\RedisException $e)
+
+		if (isset($config['database']) && !$this->redis->select($config['database']))
 		{
-			throw new CriticalError('Cache: Redis connection refused (' . $e->getMessage() . ')');
+			log_message('error', 'Cache: Redis select database failed.');
 		}
 	}
 

system/CodeIgniter.php

@@ -615,7 +615,7 @@ public function cachePage(Cache $config)
 	 *
 	 * @return array
 	 */
-	public function getPerformanceStats()
+	public function getPerformanceStats(): array
 	{
 		return [
 			'startTime' => $this->startTime,

system/Commands/Help.php

@@ -37,7 +37,6 @@
  */
 
 use CodeIgniter\CLI\BaseCommand;
-use CodeIgniter\CLI\CLI;
 
 /**
  * CI Help command for the spark script.

system/Commands/Utilities/Routes.php

@@ -15,7 +15,7 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *RouRouddfdf
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  *

system/Config/BaseConfig.php

@@ -167,6 +167,8 @@ protected function getEnvValue(string $property, string $prefix, string $shortPr
 	/**
 	 * Provides external libraries a simple way to register one or more
 	 * options into a config file.
+	 *
+	 * @throws \ReflectionException
 	 */
 	protected function registerProperties()
 	{