Merge pull request #6225 from samsonasik/apply-rector-run-on-utils

[Rector] Apply Rector run on utils/ directory

Author: samsonasik

rector.php

@@ -64,7 +64,7 @@
     $rectorConfig->parallel();
 
     // paths to refactor; solid alternative to CLI arguments
-    $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
+    $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils']);
 
     // do you need to include constants, class aliases or custom autoloader? files listed will be executed
     $rectorConfig->bootstrapFiles([

utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php

@@ -22,9 +22,6 @@
 
 final class CheckFrameworkExceptionInstantiationViaNamedConstructorRule implements Rule
 {
-    /**
-     * @var string
-     */
     private const ERROR_MESSAGE = 'FrameworkException instance creation via new expression is not allowed, use its named constructor instead';
 
     public function getNodeType(): string

utils/PHPStan/CheckUseStatementsAfterLicenseRule.php

@@ -22,14 +22,7 @@
 
 final class CheckUseStatementsAfterLicenseRule implements Rule
 {
-    /**
-     * @var string
-     */
-    private const ERROR_MESSAGE = 'Use statement must be located after license docblock';
-
-    /**
-     * @var string
-     */
+    private const ERROR_MESSAGE   = 'Use statement must be located after license docblock';
     private const COPYRIGHT_REGEX = '/\* \(c\) CodeIgniter Foundation <admin@codeigniter\.com>/m';
 
     public function getNodeType(): string

utils/check_tabs_in_rst.php

@@ -11,14 +11,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+namespace Utils;
+
 require __DIR__ . '/../system/Test/bootstrap.php';
 
 use CodeIgniter\CLI\CLI;
 
 $rstFilesWithTabs = (string) shell_exec('git grep -EIPn "\t" -- "*.rst"');
 $rstFilesWithTabs = explode("\n", $rstFilesWithTabs);
 $rstFilesWithTabs = array_map(static function (string $line): array {
-    preg_match('/^(?P<file>[^:]+):(?P<line>[0-9]+):(?P<code>.+)$/', $line, $matches);
+    preg_match('/^(?P<file>[^:]+):(?P<line>\d+):(?P<code>.+)$/', $line, $matches);
 
     return [
         'file' => $matches['file'],
@@ -44,20 +46,16 @@
         "%s\n\n%s\n",
         CLI::color('Tabs in RST files were detected:', 'light_gray', 'red'),
         implode("\n", array_map(
-            static function (string $file, array $parts): string {
-                return sprintf(
-                    "%s%s\n%s\n",
-                    CLI::color('* in ', 'light_red'),
-                    CLI::color($file, 'yellow'),
-                    implode("\n", array_map(static function (array $line): string {
-                        return sprintf(
-                            '%s | %s',
-                            str_pad($line['line'], 4, ' ', STR_PAD_LEFT),
-                            str_replace("\t", CLI::color('....', 'light_gray', 'red'), $line['code']),
-                        );
-                    }, $parts)),
-                );
-            },
+            static fn (string $file, array $parts): string => sprintf(
+                "%s%s\n%s\n",
+                CLI::color('* in ', 'light_red'),
+                CLI::color($file, 'yellow'),
+                implode("\n", array_map(static fn (array $line): string => sprintf(
+                    '%s | %s',
+                    str_pad($line['line'], 4, ' ', STR_PAD_LEFT),
+                    str_replace("\t", CLI::color('....', 'light_gray', 'red'), $line['code']),
+                ), $parts)),
+            ),
             array_keys($normalizedRstFilesWithTabs),
             array_values($normalizedRstFilesWithTabs),
         )),