Merge pull request #6052 from codeigniter4/dependabot/composer/rector/rector-0.13.2

chore(deps-dev): update rector/rector requirement from 0.13.0 to 0.13.2

Author: samsonasik

.gitattributes

@@ -28,6 +28,7 @@ rector.php export-ignore
 phpunit.xml.dist export-ignore
 phpstan-baseline.neon.dist export-ignore
 phpstan.neon.dist export-ignore
+phpstan-bootstrap.php export-ignore
 .php-cs-fixer.dist.php export-ignore
 .php-cs-fixer.no-header.php export-ignore
 .php-cs-fixer.user-guide.php export-ignore

composer.json

@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.13.0"
+        "rector/rector": "0.13.2"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

phpstan-bootstrap.php

@@ -0,0 +1,7 @@
+<?php
+
+require __DIR__ . '/system/Test/bootstrap.php';
+
+if (! defined('OCI_COMMIT_ON_SUCCESS')) {
+    define('OCI_COMMIT_ON_SUCCESS', 32);
+}

phpstan.neon.dist

@@ -25,7 +25,7 @@ parameters:
 		- utils/PHPStan
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
-		- system/Test/bootstrap.php
+		- phpstan-bootstrap.php
 	excludePaths:
 		- app/Views/errors/cli/*
 		- app/Views/errors/html/*

rector.php

@@ -28,7 +28,6 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
@@ -80,9 +79,6 @@
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
 
-        // requires php 8
-        RemoveUnusedPromotedPropertyRector::class,
-
         RemoveUnusedPrivateMethodRector::class => [
             // private method called via getPrivateMethodInvoker
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',

system/CodeIgniter.php

@@ -29,6 +29,7 @@
 use CodeIgniter\Router\Router;
 use Config\App;
 use Config\Cache;
+use Config\Kint as KintConfig;
 use Config\Services;
 use Exception;
 use Kint;
@@ -258,7 +259,7 @@ protected function initializeKint()
         /**
          * Config\Kint
          */
-        $config = config('Config\Kint');
+        $config = config(KintConfig::class);
 
         Kint::$depth_limit         = $config->maxDepth;
         Kint::$display_called_from = $config->displayCalledFrom;

system/Test/Mock/MockLogger.php

@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Test\Mock;
 
+use Tests\Support\Log\Handlers\TestHandler;
+
 class MockLogger
 {
     /*
@@ -81,7 +83,7 @@ class MockLogger
      */
     public $handlers = [
         // File Handler
-        'Tests\Support\Log\Handlers\TestHandler' => [
+        TestHandler::class => [
             // The log levels that this handler will handle.
             'handles' => [
                 'critical',

system/Test/bootstrap.php

@@ -11,10 +11,10 @@
 
 use CodeIgniter\Config\DotEnv;
 use CodeIgniter\Router\RouteCollection;
-use CodeIgniter\Services;
 use Config\Autoload;
 use Config\Modules;
 use Config\Paths;
+use Config\Services;
 
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
@@ -78,7 +78,7 @@
 
 // Use Config\Services as CodeIgniter\Services
 if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias('Config\Services', 'CodeIgniter\Services');
+    class_alias(Services::class, 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.

system/bootstrap.php

@@ -89,7 +89,7 @@
  * files can use the path constants.
  */
 
-if (! class_exists('Config\Autoload', false)) {
+if (! class_exists(Autoload::class, false)) {
     require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
     require_once APPPATH . 'Config/Autoload.php';
     require_once SYSTEMPATH . 'Modules/Modules.php';
@@ -103,7 +103,7 @@
 
 // Use Config\Services as CodeIgniter\Services
 if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias('Config\Services', 'CodeIgniter\Services');
+    class_alias(Services::class, 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.