refactor: enable AddMethodCallBasedStrictParamTypeRector

codeigniter4 · Aug 28, 2024 · 6b1f135 · 6b1f135
1 parent 655bd1d
commit 6b1f135
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 32 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -11451,7 +11451,7 @@
 ];
 $ignoreErrors[] = [
  // identifier: codeigniter.superglobalAccessAssign
- 'message' => '#^Assigning mixed directly on offset \'CONTENT_TYPE\' of \\$_SERVER is discouraged\\.$#',
+ 'message' => '#^Assigning string directly on offset \'CONTENT_TYPE\' of \\$_SERVER is discouraged\\.$#',
  'count' => 1,
  'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php',
 ];
@@ -11485,18 +11485,6 @@
  'count' => 1,
  'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php',
 ];
-$ignoreErrors[] = [
- // identifier: missingType.parameter
- 'message' => '#^Method CodeIgniter\\\\API\\\\ResponseTraitTest\\:\\:tryValidContentType\\(\\) has parameter \\$contentType with no type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php',
-];
-$ignoreErrors[] = [
- // identifier: missingType.parameter
- 'message' => '#^Method CodeIgniter\\\\API\\\\ResponseTraitTest\\:\\:tryValidContentType\\(\\) has parameter \\$mimeType with no type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php',
-];
 $ignoreErrors[] = [
  // identifier: missingType.parameter
  'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:116\\:\\:__construct\\(\\) has parameter \\$formatter with no type specified\\.$#',
@@ -16765,12 +16753,6 @@
  'count' => 1,
  'path' => __DIR__ . '/tests/system/RESTful/ResourcePresenterTest.php',
 ];
-$ignoreErrors[] = [
- // identifier: missingType.parameter
- 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouterImprovedTest\\:\\:createNewAutoRouter\\(\\) has parameter \\$namespace with no type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/system/Router/AutoRouterImprovedTest.php',
-];
 $ignoreErrors[] = [
  // identifier: missingType.iterableValue
  'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouterImprovedTest\\:\\:provideRejectTranslateUriToCamelCase\\(\\) return type has no value type specified in iterable type iterable\\.$#',
@@ -17191,12 +17173,6 @@
  'count' => 1,
  'path' => __DIR__ . '/tests/system/Test/BootstrapFCPATHTest.php',
 ];
-$ignoreErrors[] = [
- // identifier: missingType.parameter
- 'message' => '#^Method CodeIgniter\\\\Test\\\\BootstrapFCPATHTest\\:\\:readOutput\\(\\) has parameter \\$file with no type specified\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/system/Test/BootstrapFCPATHTest.php',
-];
 $ignoreErrors[] = [
  // identifier: method.notFound
  'message' => '#^Call to an undefined method CodeIgniter\\\\Test\\\\TestResponse\\:\\:ohno\\(\\)\\.$#',

diff --git a/rector.php b/rector.php
@@ -50,6 +50,7 @@
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
 use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
@@ -213,6 +214,7 @@
  ExplicitBoolCompareRector::class,
  AddClosureVoidReturnTypeWhereNoReturnRector::class,
  AddFunctionVoidReturnTypeWhereNoReturnRector::class,
+ AddMethodCallBasedStrictParamTypeRector::class,
  ])
  ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
  // keep '\\' prefix string on string '\Foo\Bar'

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -3178,7 +3178,7 @@ protected function compileWhereHaving(string $qbKey): string
  // 5 => ')' /* optional */
  // );
 
- if (! empty($matches[4])) {
+ if (isset($matches[4]) && $matches[4] !== '' && $matches[4] !== '0') {
  $protectIdentifiers = false;
  if (str_contains($matches[4], '.')) {
  $protectIdentifiers = true;

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
@@ -411,10 +411,8 @@ static function ($key, $value) use ($table, $alias, $that) {
  * Returns cast expression.
  *
  * @TODO move this to BaseBuilder in 4.5.0
- *
- * @param float|int|string $expression
  */
- private function cast($expression, ?string $type): string
+ private function cast(string $expression, ?string $type): string
  {
  return ($type === null) ? $expression : 'CAST(' . $expression . ' AS ' . strtoupper($type) . ')';
  }

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
@@ -574,7 +574,7 @@ public function testValidContentTypes(): void
  }
  }
 
- private function tryValidContentType($mimeType, $contentType): void
+ private function tryValidContentType(string $mimeType, string $contentType): void
  {
  $original = $_SERVER;
  $_SERVER['CONTENT_TYPE'] = $mimeType;

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
  $this->collection = new RouteCollection(Services::locator(), $moduleConfig, new Routing());
  }
 
- private function createNewAutoRouter($namespace = 'CodeIgniter\Router\Controllers'): AutoRouterImproved
+ private function createNewAutoRouter(string $namespace = 'CodeIgniter\Router\Controllers'): AutoRouterImproved
  {
  return new AutoRouterImproved(
  [],

diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
@@ -102,7 +102,7 @@ private function fileContents()
  return $fileContents . ('echo FCPATH;' . PHP_EOL);
  }
 
- private function readOutput($file)
+ private function readOutput(string $file)
  {
  ob_start();
  system('php -f ' . $file);