refactor: clean up rector config and re-run rector

codeigniter4 · Dec 14, 2024 · 439dcfa · 439dcfa
1 parent d983f20
commit 439dcfa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/rector.php b/rector.php
@@ -36,7 +36,6 @@
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
-use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
@@ -151,7 +150,6 @@
             __DIR__ . '/system/Security/Security.php',
             __DIR__ . '/system/Session/Session.php',
         ],
-        MixedTypeRector::class,
 
         ReturnNeverTypeRector::class => [
             __DIR__ . '/system/Cache/Handlers/BaseHandler.php',

diff --git a/system/Session/Session.php b/system/Session/Session.php
@@ -248,7 +248,7 @@ public function start()
             if (! isset($_SESSION['__ci_last_regenerate'])) {
                 $_SESSION['__ci_last_regenerate'] = Time::now()->getTimestamp();
             } elseif ($_SESSION['__ci_last_regenerate'] < (Time::now()->getTimestamp() - $regenerateTime)) {
-                $this->regenerate((bool) $this->config->regenerateDestroy);
+                $this->regenerate($this->config->regenerateDestroy);
             }
         }
         // Another work-around ... PHP doesn't seem to send the session cookie

diff --git a/utils/src/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/src/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -14,6 +14,7 @@
 namespace Utils\Rector;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ErrorSuppress;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Function_;
@@ -60,7 +61,7 @@ public function refactor(Node $node): ?Node
 
         $this->traverseNodesWithCallable(
             $node->stmts,
-            static function (Node $subNode) use (&$hasChanged) {
+            static function (Node $subNode) use (&$hasChanged): int|Expr|null {
                 if ($subNode instanceof Class_ || $subNode instanceof Function_) {
                     return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }

diff --git a/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/src/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -169,7 +169,7 @@ private function updateDocblock(string $variableName, string $camelCaseName, ?Fu
         }
 
         $docComment = $functionLike->getDocComment();
-        if ($docComment === null) {
+        if (! $docComment instanceof Doc) {
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $docComment = $functionLike->getDocComment();
-            if ($docComment === null) {
+            if (! $docComment instanceof Doc) {
                 return;
             }
@@ Expand Down @@