refactor: enable code quality level 34 for rector

samsonasik · samsonasik · commit 910edf599342 · 2024-12-10T18:00:08.000+07:00
diff --git a/rector.php b/rector.php
@@ -19,7 +19,6 @@
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
-use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
@@ -187,7 +186,6 @@
         ChangeIfElseValueAssignToEarlyReturnRector::class,
         InlineIfToExplicitIfRector::class,
         PreparedValueToEarlyReturnRector::class,
-        ShortenElseIfRector::class,
         UnusedForeachValueToArrayKeysRector::class,
         ChangeArrayPushToArrayAssignRector::class,
         RemoveErrorSuppressInTryCatchStmtsRector::class,
@@ -211,4 +209,4 @@
         // keep '\\' prefix string on string '\Foo\Bar'
         StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
     ])
-    ->withCodeQualityLevel(31);
+    ->withCodeQualityLevel(34);
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
@@ -52,12 +52,12 @@ public function __construct($logger = null)
     /**
      * Runs a command given
      *
-     * @return int|void Exit code
+     * @return int|null Exit code
      */
     public function run(string $command, array $params)
     {
         if (! $this->verifyCommand($command, $this->commands)) {
-            return;
+            return null;
         }
 
         // The file would have already been loaded during the
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -318,7 +318,7 @@ private function configureKint(): void
      *
      * @param bool $returnResponse Used for testing purposes only.
      *
-     * @return ResponseInterface|void
+     * @return ResponseInterface|null
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
@@ -379,6 +379,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
         }
 
         $this->sendResponse();
+        return null;
     }
 
     /**
@@ -863,7 +864,7 @@ protected function determinePath()
      * controller method and make the script go. If it's not able to, will
      * show the appropriate Page Not Found error.
      *
-     * @return ResponseInterface|string|void
+     * @return ResponseInterface|string|null
      */
     protected function startController()
     {
@@ -889,6 +890,7 @@ protected function startController()
         ) {
             throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
         }
+        return null;
     }
 
     /**
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
@@ -74,7 +74,7 @@ public function run(array $params)
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 
             if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n') {
-                return;
+                return null;
             }
             // @codeCoverageIgnoreEnd
         }
@@ -115,5 +115,6 @@ public function run(array $params)
             $this->showError($e);
             // @codeCoverageIgnoreEnd
         }
+        return null;
     }
 }
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -3014,7 +3014,7 @@ protected function _delete(string $table): string
      *
      * @param array|string $table The table to inspect
      *
-     * @return string|void
+     * @return string|null
      */
     protected function trackAliases($table)
     {
@@ -3023,7 +3023,7 @@ protected function trackAliases($table)
                 $this->trackAliases($t);
             }
 
-            return;
+            return null;
         }
 
         // Does the string contain a comma?  If so, we need to separate
@@ -3043,6 +3043,7 @@ protected function trackAliases($table)
             // Store the alias, if it doesn't already exist
             $this->db->addTableAlias($table);
         }
+        return null;
     }
 
     /**
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
@@ -35,14 +35,14 @@ class CSRF implements FilterInterface
      *
      * @param list<string>|null $arguments
      *
-     * @return RedirectResponse|void
+     * @return RedirectResponse|null
      *
      * @throws SecurityException
      */
     public function before(RequestInterface $request, $arguments = null)
     {
         if (! $request instanceof IncomingRequest) {
-            return;
+            return null;
         }
 
         /** @var Security $security */
@@ -57,6 +57,7 @@ public function before(RequestInterface $request, $arguments = null)
 
             throw $e;
         }
+        return null;
     }
 
     /**
diff --git a/system/Filters/Cors.php b/system/Filters/Cors.php
@@ -48,18 +48,18 @@ public function __construct(array $config = [])
     /**
      * @param list<string>|null $arguments
      *
-     * @return ResponseInterface|string|void
+     * @return ResponseInterface|string|null
      */
     public function before(RequestInterface $request, $arguments = null)
     {
         if (! $request instanceof IncomingRequest) {
-            return;
+            return null;
         }
 
         $this->createCorsService($arguments);
 
         if (! $this->cors->isPreflightRequest($request)) {
-            return;
+            return null;
         }
 
         /** @var ResponseInterface $response */
@@ -88,12 +88,12 @@ private function createCorsService(?array $arguments): void
     /**
      * @param list<string>|null $arguments
      *
-     * @return ResponseInterface|void
+     * @return ResponseInterface|null
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
         if (! $request instanceof IncomingRequest) {
-            return;
+            return null;
         }
 
         $this->createCorsService($arguments);
diff --git a/system/Filters/ForceHTTPS.php b/system/Filters/ForceHTTPS.php
@@ -32,14 +32,14 @@ class ForceHTTPS implements FilterInterface
      *
      * @param array|null $arguments
      *
-     * @return ResponseInterface|void
+     * @return ResponseInterface|null
      */
     public function before(RequestInterface $request, $arguments = null)
     {
         $config = config(App::class);
 
         if ($config->forceGlobalSecureRequests !== true) {
-            return;
+            return null;
         }
 
         $response = service('response');
@@ -49,6 +49,7 @@ public function before(RequestInterface $request, $arguments = null)
         } catch (RedirectException $e) {
             return $e->getResponse();
         }
+        return null;
     }
 
     /**
diff --git a/system/Filters/PageCache.php b/system/Filters/PageCache.php
@@ -38,7 +38,7 @@ public function __construct()
      *
      * @param array|null $arguments
      *
-     * @return ResponseInterface|void
+     * @return ResponseInterface|null
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -51,6 +51,7 @@ public function before(RequestInterface $request, $arguments = null)
         if ($cachedResponse instanceof ResponseInterface) {
             return $cachedResponse;
         }
+        return null;
     }
 
     /**
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
@@ -702,6 +702,7 @@ public function __call(string $name, array $args = [])
         if (method_exists($this->image(), $name)) {
             return $this->image()->{$name}(...$args);
         }
+        return null;
     }
 
     /**
diff --git a/system/Language/Language.php b/system/Language/Language.php
@@ -232,7 +232,7 @@ protected function formatMessage($message, array $args = [])
      * will return the file's contents, otherwise will merge with
      * the existing language lines.
      *
-     * @return array|void
+     * @return mixed[]|null
      */
     protected function load(string $file, string $locale, bool $return = false)
     {
@@ -265,6 +265,7 @@ protected function load(string $file, string $locale, bool $return = false)
 
         // Merge our string
         $this->language[$locale][$file] = $lang;
+        return null;
     }
 
     /**
diff --git a/system/Security/CheckPhpIni.php b/system/Security/CheckPhpIni.php
@@ -27,7 +27,7 @@ class CheckPhpIni
     /**
      * @param bool $isCli Set false if you run via Web
      *
-     * @return string|void HTML string or void in CLI
+     * @return string|null HTML string or void in CLI
      */
     public static function run(bool $isCli = true)
     {
@@ -40,7 +40,7 @@ public static function run(bool $isCli = true)
         if ($isCli) {
             self::outputForCli($output, $thead, $tbody);
 
-            return;
+            return null;
         }
 
         // Web
diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -205,28 +205,28 @@ public function __construct(SessionHandlerInterface $driver, SessionConfig $conf
     /**
      * Initialize the session container and starts up the session.
      *
-     * @return $this|void
+     * @return $this|null
      */
     public function start()
     {
         if (is_cli() && ENVIRONMENT !== 'testing') {
             // @codeCoverageIgnoreStart
             $this->logger->debug('Session: Initialization under CLI aborted.');
 
-            return;
+            return null;
             // @codeCoverageIgnoreEnd
         }
 
         if ((bool) ini_get('session.auto_start')) {
             $this->logger->error('Session: session.auto_start is enabled in php.ini. Aborting.');
 
-            return;
+            return null;
         }
 
         if (session_status() === PHP_SESSION_ACTIVE) {
             $this->logger->warning('Session: Sessions is enabled, and one exists. Please don\'t $session->start();');
 
-            return;
+            return null;
         }
 
         $this->configure();
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
@@ -461,7 +461,7 @@ public function assertCloseEnough(int $expected, $actual, string $message = '',
      * @param mixed $expected
      * @param mixed $actual
      *
-     * @return bool|void
+     * @return bool|null
      *
      * @throws Exception
      */
@@ -482,6 +482,7 @@ public function assertCloseEnoughString($expected, $actual, string $message = ''
         } catch (Exception) {
             return false;
         }
+        return null;
     }
 
     // --------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ public function __construct($logger = null)`
`52`	`52`	`/**`
`53`	`53`	`* Runs a command given`
`54`	`54`	`*`
`55`		`- * @return int\|void Exit code`
	`55`	`+ * @return int\|null Exit code`
`56`	`56`	`*/`
`57`	`57`	`public function run(string $command, array $params)`
`58`	`58`	`{`
`59`	`59`	`if (! $this->verifyCommand($command, $this->commands)) {`
`60`		`- return;`
	`60`	`+ return null;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// The file would have already been loaded during the`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ private function configureKint(): void`
`318`	`318`	`*`
`319`	`319`	`* @param bool $returnResponse Used for testing purposes only.`
`320`	`320`	`*`
`321`		`- * @return ResponseInterface\|void`
	`321`	`+ * @return ResponseInterface\|null`
`322`	`322`	`*/`
`323`	`323`	`public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)`
`324`	`324`	`{`
`@@ -379,6 +379,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`$this->sendResponse();`
	`382`	`+ return null;`
`382`	`383`	`}`
`383`	`384`
`384`	`385`	`/**`
`@@ -863,7 +864,7 @@ protected function determinePath()`
`863`	`864`	`* controller method and make the script go. If it's not able to, will`
`864`	`865`	`* show the appropriate Page Not Found error.`
`865`	`866`	`*`
`866`		`- * @return ResponseInterface\|string\|void`
	`867`	`+ * @return ResponseInterface\|string\|null`
`867`	`868`	`*/`
`868`	`869`	`protected function startController()`
`869`	`870`	`{`
`@@ -889,6 +890,7 @@ protected function startController()`
`889`	`890`	`) {`
`890`	`891`	`throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);`
`891`	`892`	`}`
	`893`	`+ return null;`
`892`	`894`	`}`
`893`	`895`
`894`	`896`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function run(array $params)`
`74`	`74`	`$force = array_key_exists('f', $params) \|\| CLI::getOption('f');`
`75`	`75`
`76`	`76`	`if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n') {`
`77`		`- return;`
	`77`	`+ return null;`
`78`	`78`	`}`
`79`	`79`	`// @codeCoverageIgnoreEnd`
`80`	`80`	`}`
`@@ -115,5 +115,6 @@ public function run(array $params)`
`115`	`115`	`$this->showError($e);`
`116`	`116`	`// @codeCoverageIgnoreEnd`
`117`	`117`	`}`
	`118`	`+ return null;`
`118`	`119`	`}`
`119`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3014,7 +3014,7 @@ protected function _delete(string $table): string`
`3014`	`3014`	`*`
`3015`	`3015`	`* @param array\|string $table The table to inspect`
`3016`	`3016`	`*`
`3017`		`- * @return string\|void`
	`3017`	`+ * @return string\|null`
`3018`	`3018`	`*/`
`3019`	`3019`	`protected function trackAliases($table)`
`3020`	`3020`	`{`
`@@ -3023,7 +3023,7 @@ protected function trackAliases($table)`
`3023`	`3023`	`$this->trackAliases($t);`
`3024`	`3024`	`}`
`3025`	`3025`
`3026`		`- return;`
	`3026`	`+ return null;`
`3027`	`3027`	`}`
`3028`	`3028`
`3029`	`3029`	`// Does the string contain a comma? If so, we need to separate`
`@@ -3043,6 +3043,7 @@ protected function trackAliases($table)`
`3043`	`3043`	`// Store the alias, if it doesn't already exist`
`3044`	`3044`	`$this->db->addTableAlias($table);`
`3045`	`3045`	`}`
	`3046`	`+ return null;`
`3046`	`3047`	`}`
`3047`	`3048`
`3048`	`3049`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ class CSRF implements FilterInterface`
`35`	`35`	`*`
`36`	`36`	`* @param list<string>\|null $arguments`
`37`	`37`	`*`
`38`		`- * @return RedirectResponse\|void`
	`38`	`+ * @return RedirectResponse\|null`
`39`	`39`	`*`
`40`	`40`	`* @throws SecurityException`
`41`	`41`	`*/`
`42`	`42`	`public function before(RequestInterface $request, $arguments = null)`
`43`	`43`	`{`
`44`	`44`	`if (! $request instanceof IncomingRequest) {`
`45`		`- return;`
	`45`	`+ return null;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/** @var Security $security */`
`@@ -57,6 +57,7 @@ public function before(RequestInterface $request, $arguments = null)`
`57`	`57`
`58`	`58`	`throw $e;`
`59`	`59`	`}`
	`60`	`+ return null;`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,18 @@ public function __construct(array $config = [])`
`48`	`48`	`/**`
`49`	`49`	`* @param list<string>\|null $arguments`
`50`	`50`	`*`
`51`		`- * @return ResponseInterface\|string\|void`
	`51`	`+ * @return ResponseInterface\|string\|null`
`52`	`52`	`*/`
`53`	`53`	`public function before(RequestInterface $request, $arguments = null)`
`54`	`54`	`{`
`55`	`55`	`if (! $request instanceof IncomingRequest) {`
`56`		`- return;`
	`56`	`+ return null;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$this->createCorsService($arguments);`
`60`	`60`
`61`	`61`	`if (! $this->cors->isPreflightRequest($request)) {`
`62`		`- return;`
	`62`	`+ return null;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/** @var ResponseInterface $response */`
`@@ -88,12 +88,12 @@ private function createCorsService(?array $arguments): void`
`88`	`88`	`/**`
`89`	`89`	`* @param list<string>\|null $arguments`
`90`	`90`	`*`
`91`		`- * @return ResponseInterface\|void`
	`91`	`+ * @return ResponseInterface\|null`
`92`	`92`	`*/`
`93`	`93`	`public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`94`	`94`	`{`
`95`	`95`	`if (! $request instanceof IncomingRequest) {`
`96`		`- return;`
	`96`	`+ return null;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`$this->createCorsService($arguments);`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ class ForceHTTPS implements FilterInterface`
`32`	`32`	`*`
`33`	`33`	`* @param array\|null $arguments`
`34`	`34`	`*`
`35`		`- * @return ResponseInterface\|void`
	`35`	`+ * @return ResponseInterface\|null`
`36`	`36`	`*/`
`37`	`37`	`public function before(RequestInterface $request, $arguments = null)`
`38`	`38`	`{`
`39`	`39`	`$config = config(App::class);`
`40`	`40`
`41`	`41`	`if ($config->forceGlobalSecureRequests !== true) {`
`42`		`- return;`
	`42`	`+ return null;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`$response = service('response');`
`@@ -49,6 +49,7 @@ public function before(RequestInterface $request, $arguments = null)`
`49`	`49`	`} catch (RedirectException $e) {`
`50`	`50`	`return $e->getResponse();`
`51`	`51`	`}`
	`52`	`+ return null;`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct()`
`38`	`38`	`*`
`39`	`39`	`* @param array\|null $arguments`
`40`	`40`	`*`
`41`		`- * @return ResponseInterface\|void`
	`41`	`+ * @return ResponseInterface\|null`
`42`	`42`	`*/`
`43`	`43`	`public function before(RequestInterface $request, $arguments = null)`
`44`	`44`	`{`
`@@ -51,6 +51,7 @@ public function before(RequestInterface $request, $arguments = null)`
`51`	`51`	`if ($cachedResponse instanceof ResponseInterface) {`
`52`	`52`	`return $cachedResponse;`
`53`	`53`	`}`
	`54`	`+ return null;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -702,6 +702,7 @@ public function __call(string $name, array $args = [])`
`702`	`702`	`if (method_exists($this->image(), $name)) {`
`703`	`703`	`return $this->image()->{$name}(...$args);`
`704`	`704`	`}`
	`705`	`+ return null;`
`705`	`706`	`}`
`706`	`707`
`707`	`708`	`/**`