Correction in Methods and Spellings

atishhamte · atishhamte · commit e00c82831a22 · 2019-02-28T17:56:24.000+05:30
diff --git a/system/CodeIgniter.php b/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());
@@ -280,7 +280,7 @@ public function useSafeOutput(bool $safe = true)
 	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
 	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
 	 */
-	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)
+	protected function handleRequest(RouteCollectionInterface $routes, $cacheConfig, bool $returnResponse = false)
 	{
 		$routeFilter = $this->tryToRouteIt($routes);
 
@@ -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)
 	{
@@ -683,7 +685,7 @@ public function displayPerformanceMetrics(string $output): string
 	 *
 	 * @return string
 	 */
-	protected function tryToRouteIt(RouteCollectionInterface $routes = null)
+	protected function tryToRouteIt(RouteCollectionInterface $routes)
 	{
 		if (empty($routes) || ! $routes instanceof RouteCollectionInterface)
 		{
diff --git a/system/Controller.php b/system/Controller.php
@@ -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,14 +179,14 @@ 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
 	 */
 	public function validate($rules, array $messages = []): bool
 	{
-		$this->validator = Services::validation();
+		$this->validator = \Config\Services::validation();
 
 		// If you replace the $rules array with the name of the group
 		if (is_string($rules))
@@ -211,9 +211,8 @@ public function validate($rules, array $messages = []): bool
 		}
 
 		$success = $this->validator
-			->withRequest($this->request)
 			->setRules($rules, $messages)
-			->run();
+			->run($this->request->getPost());
 
 		return $success;
 	}
diff --git a/system/Entity.php b/system/Entity.php
@@ -566,7 +566,7 @@ private function castAsJson($value, bool $asArray = false)
 
 				if (json_last_error() !== JSON_ERROR_NONE)
 				{
-					throw CastException::forInvalidJsonFormatException(json_last_error());
+					throw \CodeIgniter\Exceptions\CastException::forInvalidJsonFormatException(json_last_error());
 				}
 			}
 		}
diff --git a/system/HTTP/Header.php b/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
 	 */
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -152,14 +152,19 @@ class IncomingRequest extends Request
 	 * @param string                      $body
 	 * @param \CodeIgniter\HTTP\UserAgent $userAgent
 	 */
-	public function __construct($config, $uri = null, $body = 'php://input', UserAgent $userAgent)
+	public function __construct($config, $uri = null, $body = 'php://input', UserAgent $userAgent = null)
 	{
 		// Get our body from php://input
 		if ($body === 'php://input')
 		{
 			$body = file_get_contents('php://input');
 		}
 
+		if($userAgent === null)
+		{
+			$userAgent = new \CodeIgniter\HTTP\UserAgent();
+		}
+
 		$this->body      = $body;
 		$this->config    = $config;
 		$this->userAgent = $userAgent;
diff --git a/system/Model.php b/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'];
 	}
 
diff --git a/system/Router/RouteCollection.php b/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)
 	{
diff --git a/system/Session/Session.php b/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;
 
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
@@ -109,7 +109,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)
 	{
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
@@ -196,7 +196,7 @@ public function numeric(string $str = null): bool
 	 *
 	 * @return boolean
 	 */
-	public function regex_match(string $str = null, string $pattern, array $data): bool
+	public function regex_match(string $str, string $pattern, array $data): bool
 	{
 		if (strpos($pattern, '/') !== 0)
 		{
@@ -320,7 +320,7 @@ public function valid_emails(string $str = null): bool
 	 *
 	 * @return boolean
 	 */
-	public function valid_ip(string $ip = null, string $which = null, array $data): bool
+	public function valid_ip(string $ip, string $which, array $data): bool
 	{
 		switch (strtolower($which))
 		{
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
@@ -56,7 +56,7 @@ class Rules
 	 *
 	 * @return boolean
 	 */
-	public function differs(string $str = null, string $field, array $data): bool
+	public function differs(string $str, string $field, array $data): bool
 	{
 		return array_key_exists($field, $data) ? ($str !== $data[$field]) : false;
 	}
@@ -72,7 +72,7 @@ public function differs(string $str = null, string $field, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function exact_length(string $str = null, string $val, array $data): bool
+	public function exact_length(string $str, string $val, array $data): bool
 	{
 		if (! is_numeric($val))
 		{
@@ -93,7 +93,7 @@ public function exact_length(string $str = null, string $val, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function greater_than(string $str = null, string $min, array $data): bool
+	public function greater_than(string $str, string $min, array $data): bool
 	{
 		return is_numeric($str) ? ($str > $min) : false;
 	}
@@ -109,7 +109,7 @@ public function greater_than(string $str = null, string $min, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function greater_than_equal_to(string $str = null, string $min, array $data): bool
+	public function greater_than_equal_to(string $str, string $min, array $data): bool
 	{
 		return is_numeric($str) ? ($str >= $min) : false;
 	}
@@ -124,7 +124,7 @@ public function greater_than_equal_to(string $str = null, string $min, array $da
 	 * @param  array  $data
 	 * @return boolean
 	 */
-	public function in_list(string $value = null, string $list, array $data): bool
+	public function in_list(string $value, string $list, array $data): bool
 	{
 		$list = explode(',', $list);
 		$list = array_map(function ($value) {
@@ -150,7 +150,7 @@ public function in_list(string $value = null, string $list, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function is_unique(string $str = null, string $field, array $data): bool
+	public function is_unique(string $str, string $field, array $data): bool
 	{
 		// Grab any data for exclusion of a single row.
 		list($field, $ignoreField, $ignoreValue) = array_pad(explode(',', $field), 3, null);
@@ -184,7 +184,7 @@ public function is_unique(string $str = null, string $field, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function less_than(string $str = null, string $max): bool
+	public function less_than(string $str, string $max): bool
 	{
 		return is_numeric($str) ? ($str < $max) : false;
 	}
@@ -199,7 +199,7 @@ public function less_than(string $str = null, string $max): bool
 	 *
 	 * @return boolean
 	 */
-	public function less_than_equal_to(string $str = null, string $max): bool
+	public function less_than_equal_to(string $str, string $max): bool
 	{
 		return is_numeric($str) ? ($str <= $max) : false;
 	}
@@ -215,7 +215,7 @@ public function less_than_equal_to(string $str = null, string $max): bool
 	 *
 	 * @return boolean
 	 */
-	public function matches(string $str = null, string $field, array $data): bool
+	public function matches(string $str, string $field, array $data): bool
 	{
 		return array_key_exists($field, $data) ? ($str === $data[$field]) : false;
 	}
@@ -231,7 +231,7 @@ public function matches(string $str = null, string $field, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function max_length(string $str = null, string $val, array $data): bool
+	public function max_length(string $str, string $val, array $data): bool
 	{
 		if (! is_numeric($val))
 		{
@@ -252,7 +252,7 @@ public function max_length(string $str = null, string $val, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function min_length(string $str = null, string $val, array $data): bool
+	public function min_length(string $str, string $val, array $data): bool
 	{
 		if (! is_numeric($val))
 		{
@@ -271,7 +271,7 @@ public function min_length(string $str = null, string $val, array $data): bool
 	 *
 	 * @return boolean          True if valid, false if not
 	 */
-	public function required($str = null): bool
+	public function required($str): bool
 	{
 		if (is_object($str))
 		{
@@ -297,7 +297,7 @@ public function required($str = null): bool
 	 *
 	 * @return boolean
 	 */
-	public function required_with($str = null, string $fields, array $data): bool
+	public function required_with($str, string $fields, array $data): bool
 	{
 		$fields = explode(',', $fields);
 
@@ -349,7 +349,7 @@ public function required_with($str = null, string $fields, array $data): bool
 	 *
 	 * @return boolean
 	 */
-	public function required_without($str = null, string $fields, array $data): bool
+	public function required_without($str, string $fields, array $data): bool
 	{
 		$fields = explode(',', $fields);
 
diff --git a/system/Validation/Validation.php b/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))
diff --git a/system/View/Filters.php b/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))
 		{
diff --git a/system/View/Parser.php b/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)
 	{
diff --git a/system/View/View.php b/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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function initialize()`
`199`	`199`	`* @param \CodeIgniter\Router\RouteCollectionInterface $routes`
`200`	`200`	`* @param boolean $returnResponse`
`201`	`201`	`*`
`202`		`- * @throws \CodeIgniter\HTTP\RedirectException`
	`202`	`+ * @throws \CodeIgniter\Filters\Exceptions\FilterException`
`203`	`203`	`* @throws \Exception`
`204`	`204`	`*/`
`205`	`205`	`public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)`
`@@ -234,7 +234,7 @@ public function run(RouteCollectionInterface $routes = null, bool $returnRespons`
`234`	`234`	`{`
`235`	`235`	`return $this->handleRequest($routes, $cacheConfig, $returnResponse);`
`236`	`236`	`}`
`237`		`- catch (Router\RedirectException $e)`
	`237`	`+ catch (\CodeIgniter\Filters\Exceptions\FilterException $e)`
`238`	`238`	`{`
`239`	`239`	`$logger = Services::logger();`
`240`	`240`	`$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());`
`@@ -280,7 +280,7 @@ public function useSafeOutput(bool $safe = true)`
`280`	`280`	`* @return \CodeIgniter\HTTP\RequestInterface\|\CodeIgniter\HTTP\Response\|\CodeIgniter\HTTP\ResponseInterface\|mixed`
`281`	`281`	`* @throws \CodeIgniter\Filters\Exceptions\FilterException`
`282`	`282`	`*/`
`283`		`- protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)`
	`283`	`+ protected function handleRequest(RouteCollectionInterface $routes, $cacheConfig, bool $returnResponse = false)`
`284`	`284`	`{`
`285`	`285`	`$routeFilter = $this->tryToRouteIt($routes);`
`286`	`286`
`@@ -533,7 +533,7 @@ protected function forceSecureAccess($duration = 31536000)`
`533`	`533`	`*`
`534`	`534`	`* @throws \Exception`
`535`	`535`	`*`
`536`		`- * @return boolean`
	`536`	`+ * @return bool\|\CodeIgniter\HTTP\ResponseInterface`
`537`	`537`	`*/`
`538`	`538`	`public function displayCache($config)`
`539`	`539`	`{`
`@@ -564,7 +564,9 @@ public function displayCache($config)`
`564`	`564`	`$this->response->setBody($output);`
`565`	`565`
`566`	`566`	`return $this->response;`
`567`		`- };`
	`567`	`+ }`
	`568`	`+`
	`569`	`+ return false;`
`568`	`570`	`}`
`569`	`571`
`570`	`572`	`//--------------------------------------------------------------------`
`@@ -574,7 +576,7 @@ public function displayCache($config)`
`574`	`576`	`*`
`575`	`577`	`* @param integer $time`
`576`	`578`	`*`
`577`		`- * @return $this`
	`579`	`+ * @return void`
`578`	`580`	`*/`
`579`	`581`	`public static function cache(int $time)`
`580`	`582`	`{`
`@@ -683,7 +685,7 @@ public function displayPerformanceMetrics(string $output): string`
`683`	`685`	`*`
`684`	`686`	`* @return string`
`685`	`687`	`*/`
`686`		`- protected function tryToRouteIt(RouteCollectionInterface $routes = null)`
	`688`	`+ protected function tryToRouteIt(RouteCollectionInterface $routes)`
`687`	`689`	`{`
`688`	`690`	`if (empty($routes) \|\| ! $routes instanceof RouteCollectionInterface)`
`689`	`691`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class Controller`
`106`	`106`	`* @param ResponseInterface $response`
`107`	`107`	`* @param \Psr\Log\LoggerInterface $logger`
`108`	`108`	`*`
`109`		`- * @throws \CodeIgniter\HTTP\RedirectException`
	`109`	`+ * @throws \CodeIgniter\HTTP\Exceptions\HTTPException`
`110`	`110`	`*/`
`111`	`111`	`public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)`
`112`	`112`	`{`
`@@ -135,7 +135,7 @@ public function initController(RequestInterface $request, ResponseInterface $res`
`135`	`135`	`* considered secure for. Only with HSTS header.`
`136`	`136`	`* Default value is 1 year.`
`137`	`137`	`*`
`138`		`- * @throws \CodeIgniter\HTTP\RedirectException`
	`138`	`+ * @throws \CodeIgniter\HTTP\Exceptions\HTTPException`
`139`	`139`	`*/`
`140`	`140`	`public function forceHTTPS(int $duration = 31536000)`
`141`	`141`	`{`
`@@ -179,14 +179,14 @@ protected function loadHelpers()`
`179`	`179`	`* A shortcut to performing validation on input data. If validation`
`180`	`180`	`* is not successful, a $errors property will be set on this class.`
`181`	`181`	`*`
`182`		`- * @param array $rules`
`183`		`- * @param array $messages An array of custom error messages`
	`182`	`+ * @param array\|string $rules`
	`183`	`+ * @param array $messages An array of custom error messages`
`184`	`184`	`*`
`185`	`185`	`* @return boolean`
`186`	`186`	`*/`
`187`	`187`	`public function validate($rules, array $messages = []): bool`
`188`	`188`	`{`
`189`		`- $this->validator = Services::validation();`
	`189`	`+ $this->validator = \Config\Services::validation();`
`190`	`190`
`191`	`191`	`// If you replace the $rules array with the name of the group`
`192`	`192`	`if (is_string($rules))`
`@@ -211,9 +211,8 @@ public function validate($rules, array $messages = []): bool`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`$success = $this->validator`
`214`		`- ->withRequest($this->request)`
`215`	`214`	`->setRules($rules, $messages)`
`216`		`- ->run();`
	`215`	`+ ->run($this->request->getPost());`
`217`	`216`
`218`	`217`	`return $success;`
`219`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ private function castAsJson($value, bool $asArray = false)`
`566`	`566`
`567`	`567`	`if (json_last_error() !== JSON_ERROR_NONE)`
`568`	`568`	`{`
`569`		`- throw CastException::forInvalidJsonFormatException(json_last_error());`
	`569`	`+ throw \CodeIgniter\Exceptions\CastException::forInvalidJsonFormatException(json_last_error());`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function getName()`
`91`	`91`
`92`	`92`	`/**`
`93`	`93`	`* Gets the raw value of the header. This may return either a string`
`94`		`- * of an array, depending on whether the header has mutliple values or not.`
	`94`	`+ * of an array, depending on whether the header has multiple values or not.`
`95`	`95`	`*`
`96`	`96`	`* @return array\|null\|string`
`97`	`97`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -343,8 +343,6 @@ public function find($id = null)`
`343`	`343`	`$this->tempReturnType = $this->returnType;`
`344`	`344`	`$this->tempUseSoftDeletes = $this->useSoftDeletes;`
`345`	`345`
`346`		`- $this->reset();`
`347`		`-`
`348`	`346`	`return $row['data'];`
`349`	`347`	`}`
`350`	`348`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ class RouteCollection implements RouteCollectionInterface`
`223`	`223`	`* Constructor`
`224`	`224`	`*`
`225`	`225`	`* @param FileLocator $locator`
`226`		`- * @param Config/Modules $moduleConfig`
	`226`	`+ * @param \Config\Modules $moduleConfig`
`227`	`227`	`*/`
`228`	`228`	`public function __construct(FileLocator $locator, $moduleConfig)`
`229`	`229`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class Session implements SessionInterface`
`52`	`52`	`/**`
`53`	`53`	`* Instance of the driver to use.`
`54`	`54`	`*`
`55`		`- * @var HandlerInterface`
	`55`	`+ * @var \CodeIgniter\Log\Handlers\HandlerInterface`
`56`	`56`	`*/`
`57`	`57`	`protected $driver;`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function controller(string $name)`
`109`	`109`	`* @param string $method`
`110`	`110`	`* @param array $params`
`111`	`111`	`*`
`112`		`- * @return \CodeIgniter\TestControllerResponse`
	`112`	`+ * @return \CodeIgniter\Test\ControllerResponse\|\InvalidArgumentException`
`113`	`113`	`*/`
`114`	`114`	`public function execute(string $method, ...$params)`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function numeric(string $str = null): bool`
`196`	`196`	`*`
`197`	`197`	`* @return boolean`
`198`	`198`	`*/`
`199`		`- public function regex_match(string $str = null, string $pattern, array $data): bool`
	`199`	`+ public function regex_match(string $str, string $pattern, array $data): bool`
`200`	`200`	`{`
`201`	`201`	`if (strpos($pattern, '/') !== 0)`
`202`	`202`	`{`
`@@ -320,7 +320,7 @@ public function valid_emails(string $str = null): bool`
`320`	`320`	`*`
`321`	`321`	`* @return boolean`
`322`	`322`	`*/`
`323`		`- public function valid_ip(string $ip = null, string $which = null, array $data): bool`
	`323`	`+ public function valid_ip(string $ip, string $which, array $data): bool`
`324`	`324`	`{`
`325`	`325`	`switch (strtolower($which))`
`326`	`326`	`{`