Fix code styles

paulbalandan · paulbalandan · commit 08d66ddd22eb · 2025-01-17T21:48:42.000+08:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -60,5 +60,5 @@
     'CodeIgniter 4 framework',
     'CodeIgniter Foundation',
     'admin@codeigniter.com',
-    2023
+    2023,
 );
diff --git a/src/ComposerScripts.php b/src/ComposerScripts.php
@@ -49,7 +49,7 @@ private static function recursiveDelete(string $directory): void
         /** @var SplFileInfo $file */
         foreach (new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator(rtrim($directory, '\\/'), FilesystemIterator::SKIP_DOTS),
-            RecursiveIteratorIterator::CHILD_FIRST
+            RecursiveIteratorIterator::CHILD_FIRST,
         ) as $file) {
             $path = $file->getPathname();
 
diff --git a/src/Rules/Classes/FrameworkExceptionInstantiationRule.php b/src/Rules/Classes/FrameworkExceptionInstantiationRule.php
@@ -54,7 +54,7 @@ public function processNode(Node $node, Scope $scope): array
 
         return [RuleErrorBuilder::message(sprintf(
             'Instantiating %s using new is not allowed. Use one of its named constructors instead.',
-            $objectType->getClassReflection()->getNativeReflection()->getShortName()
+            $objectType->getClassReflection()->getNativeReflection()->getShortName(),
         ))->identifier('codeigniter.frameworkExceptionInstance')->build()];
     }
 }
diff --git a/src/Rules/Functions/FactoriesFunctionArgumentTypeRule.php b/src/Rules/Functions/FactoriesFunctionArgumentTypeRule.php
@@ -47,7 +47,7 @@ public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
         private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper,
         bool $checkArgumentTypeOfConfig,
-        bool $checkArgumentTypeOfModel
+        bool $checkArgumentTypeOfModel,
     ) {
         $this->argumentTypeCheck = [
             'config' => $checkArgumentTypeOfConfig,
@@ -93,7 +93,7 @@ public function processNode(Node $node, Scope $scope): array
         $firstParameter = ParametersAcceptorSelector::selectFromArgs(
             $scope,
             $node->getArgs(),
-            $this->reflectionProvider->getFunction($nameNode, $scope)->getVariants()
+            $this->reflectionProvider->getFunction($nameNode, $scope)->getVariants(),
         )->getParameters()[0];
 
         if ($returnType->isNull()->yes()) {
@@ -102,7 +102,7 @@ public function processNode(Node $node, Scope $scope): array
                     $ruleErrorBuilder->addTip(sprintf(
                         'If %s is a valid class string, you can add its possible namespace(s) in <fg=cyan>codeigniter.additional%sNamespaces</> in your <fg=yellow>%%configurationFile%%</>.',
                         $constantStringType->describe(VerbosityLevel::precise()),
-                        ucfirst($function)
+                        ucfirst($function),
                     ));
                 }
 
@@ -113,7 +113,7 @@ public function processNode(Node $node, Scope $scope): array
                 'Parameter #1 $%s of function %s expects a valid class string, %s given.',
                 $firstParameter->getName(),
                 $function,
-                $nameType->describe(VerbosityLevel::precise())
+                $nameType->describe(VerbosityLevel::precise()),
             )))->identifier(sprintf('codeigniter.%sArgumentType', $function))->build()];
         }
 
@@ -127,7 +127,7 @@ public function processNode(Node $node, Scope $scope): array
                 $firstParameter->getName(),
                 $nameType->describe(VerbosityLevel::precise()),
                 $function,
-                addcslashes($this->instanceofMap[$function], '\\')
+                addcslashes($this->instanceofMap[$function], '\\'),
             ))->identifier(sprintf('codeigniter.%sArgumentInstanceof', $function))->build()];
         }
 
diff --git a/src/Rules/Functions/NoClassConstFetchOnFactoriesFunctions.php b/src/Rules/Functions/NoClassConstFetchOnFactoriesFunctions.php
@@ -36,7 +36,7 @@ final class NoClassConstFetchOnFactoriesFunctions implements Rule
 
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper
+        private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper,
     ) {}
 
     public function getNodeType(): string
@@ -120,11 +120,11 @@ public function processNode(Node $node, Scope $scope): array
             RuleErrorBuilder::message(sprintf(
                 'Call to function %s with %s::class is discouraged.',
                 $function,
-                $reflection->getDisplayName()
+                $reflection->getDisplayName(),
             ))->tip(sprintf(
                 'Use %s(\'%s\') instead to allow overriding.',
                 $function,
-                $reflection->getNativeReflection()->getShortName()
+                $reflection->getNativeReflection()->getShortName(),
             ))->identifier('codeigniter.factoriesClassConstFetch')->build(),
         ];
     }
diff --git a/src/Rules/Functions/ServicesFunctionArgumentTypeRule.php b/src/Rules/Functions/ServicesFunctionArgumentTypeRule.php
@@ -30,7 +30,7 @@ final class ServicesFunctionArgumentTypeRule implements Rule
 {
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly ServicesReturnTypeHelper $servicesReturnTypeHelper
+        private readonly ServicesReturnTypeHelper $servicesReturnTypeHelper,
     ) {}
 
     public function getNodeType(): string
@@ -96,14 +96,14 @@ public function processNode(Node $node, Scope $scope): array
         $hasMethod = array_reduce(
             $this->servicesReturnTypeHelper->getServicesReflection(),
             static fn (bool $carry, ClassReflection $service): bool => $carry || $service->hasMethod($trimmedName),
-            false
+            false,
         );
 
         if (! $returnType->isNull()->yes() || $hasMethod) {
             return [RuleErrorBuilder::message(sprintf(
                 'Service method %s expected to return a service instance, got %s instead.',
                 $name,
-                $returnType->describe(VerbosityLevel::precise())
+                $returnType->describe(VerbosityLevel::precise()),
             ))->identifier('codeigniter.serviceNonObjectReturn')->build()];
         }
 
@@ -121,7 +121,7 @@ public function processNode(Node $node, Scope $scope): array
 
         return [$addTip(RuleErrorBuilder::message(sprintf(
             'Call to unknown service method %s.',
-            $nameType->describe(VerbosityLevel::precise())
+            $nameType->describe(VerbosityLevel::precise()),
         )))->identifier('codeigniter.unknownServiceMethod')->build()];
     }
 }
diff --git a/src/Rules/Superglobals/SuperglobalAccessRule.php b/src/Rules/Superglobals/SuperglobalAccessRule.php
@@ -26,7 +26,7 @@
 final class SuperglobalAccessRule implements Rule
 {
     public function __construct(
-        private readonly SuperglobalRuleHelper $superglobalRuleHelper
+        private readonly SuperglobalRuleHelper $superglobalRuleHelper,
     ) {}
 
     public function getNodeType(): string
diff --git a/src/Rules/Superglobals/SuperglobalAssignRule.php b/src/Rules/Superglobals/SuperglobalAssignRule.php
@@ -27,7 +27,7 @@
 final class SuperglobalAssignRule implements Rule
 {
     public function __construct(
-        private readonly SuperglobalRuleHelper $superglobalRuleHelper
+        private readonly SuperglobalRuleHelper $superglobalRuleHelper,
     ) {}
 
     public function getNodeType(): string
@@ -108,7 +108,7 @@ private function processArrayDimFetch(Node $node, Scope $scope): array
                             'Use \\Config\\Services::superglobals()->%s(%s, %s) instead.',
                             $method,
                             $dimString->describe(VerbosityLevel::precise()),
-                            $exprString->describe(VerbosityLevel::precise())
+                            $exprString->describe(VerbosityLevel::precise()),
                         ));
                     }
                 }
diff --git a/src/Type/FactoriesFunctionReturnTypeExtension.php b/src/Type/FactoriesFunctionReturnTypeExtension.php
@@ -22,7 +22,7 @@
 final class FactoriesFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
     public function __construct(
-        private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper
+        private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper,
     ) {}
 
     public function isFunctionSupported(FunctionReflection $functionReflection): bool
@@ -40,7 +40,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
         return $this->factoriesReturnTypeHelper->check(
             $scope->getType($arguments[0]->value),
-            $functionReflection->getName()
+            $functionReflection->getName(),
         );
     }
 }
diff --git a/src/Type/FactoriesReturnTypeHelper.php b/src/Type/FactoriesReturnTypeHelper.php
@@ -46,7 +46,7 @@ final class FactoriesReturnTypeHelper
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
         array $additionalConfigNamespaces,
-        array $additionalModelNamespaces
+        array $additionalModelNamespaces,
     ) {
         $cb = static fn (string $item): string => rtrim($item, '\\') . '\\';
 
diff --git a/src/Type/ModelFetchedReturnTypeHelper.php b/src/Type/ModelFetchedReturnTypeHelper.php
@@ -61,7 +61,7 @@ final class ModelFetchedReturnTypeHelper
      */
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
-        array $notStringFormattedFieldsArray
+        array $notStringFormattedFieldsArray,
     ) {
         foreach ($notStringFormattedFieldsArray as $field => $type) {
             if (! isset(self::$typeInterpolations[$type])) {
@@ -101,7 +101,7 @@ private function getArrayReturnType(ClassReflection $classReflection, Scope $sco
     {
         $this->fillDateFields($classReflection, $scope);
         $fieldsTypes = $scope->getType(
-            $classReflection->getNativeProperty('allowedFields')->getNativeReflection()->getDefaultValueExpression()
+            $classReflection->getNativeProperty('allowedFields')->getNativeReflection()->getDefaultValueExpression(),
         )->getConstantArrays();
 
         if ($fieldsTypes === []) {
@@ -111,9 +111,9 @@ private function getArrayReturnType(ClassReflection $classReflection, Scope $sco
         $fields = array_filter(
             array_map(
                 static fn (Type $type) => current($type->getConstantStrings()),
-                current($fieldsTypes)->getValueTypes()
+                current($fieldsTypes)->getValueTypes(),
             ),
-            static fn (ConstantStringType|false $constantStringType): bool => $constantStringType !== false
+            static fn (ConstantStringType|false $constantStringType): bool => $constantStringType !== false,
         );
 
         return new ConstantArrayType(
@@ -135,7 +135,7 @@ private function getArrayReturnType(ClassReflection $classReflection, Scope $sco
                 }
 
                 return new StringType();
-            }, $fields)
+            }, $fields),
         );
     }
 
@@ -156,7 +156,7 @@ private function getNativeStringPropertyValue(ClassReflection $classReflection,
 
         return $this->getStringValueFromExpr(
             $classReflection->getNativeProperty($property)->getNativeReflection()->getDefaultValueExpression(),
-            $scope
+            $scope,
         );
     }
 
diff --git a/src/Type/ModelFindReturnTypeExtension.php b/src/Type/ModelFindReturnTypeExtension.php
@@ -32,7 +32,7 @@
 final class ModelFindReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
     public function __construct(
-        private readonly ModelFetchedReturnTypeHelper $modelFetchedReturnTypeHelper
+        private readonly ModelFetchedReturnTypeHelper $modelFetchedReturnTypeHelper,
     ) {}
 
     public function getClass(): string
@@ -96,7 +96,7 @@ function (Type $idType, callable $traverse) use ($methodCall, $scope): Type {
                 }
 
                 return $this->getTypeFromFindAll($methodCall, $scope);
-            }
+            },
         );
     }
 
@@ -107,9 +107,9 @@ private function getTypeFromFindAll(MethodCall $methodCall, Scope $scope): Type
         return TypeCombinator::intersect(
             new ArrayType(
                 new IntegerType(),
-                $this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope)
+                $this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope),
             ),
-            new AccessoryArrayListType()
+            new AccessoryArrayListType(),
         );
     }
 }
diff --git a/src/Type/ServicesFunctionReturnTypeExtension.php b/src/Type/ServicesFunctionReturnTypeExtension.php
@@ -22,7 +22,7 @@
 final class ServicesFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
     public function __construct(
-        private readonly ServicesReturnTypeHelper $servicesReturnTypeHelper
+        private readonly ServicesReturnTypeHelper $servicesReturnTypeHelper,
     ) {}
 
     public function isFunctionSupported(FunctionReflection $functionReflection): bool
diff --git a/src/Type/ServicesReturnTypeHelper.php b/src/Type/ServicesReturnTypeHelper.php
@@ -59,7 +59,7 @@ final class ServicesReturnTypeHelper
      */
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider,
-        array $additionalServices
+        array $additionalServices,
     ) {
         $this->services = [
             FrameworkServices::class,
@@ -105,7 +105,7 @@ public function check(Type $type, Scope $scope): Type
                 return ParametersAcceptorSelector::selectFromArgs(
                     $scope,
                     [],
-                    $methodReflection->getVariants()
+                    $methodReflection->getVariants(),
                 )->getReturnType();
             }
 
diff --git a/tests/Rules/Functions/FactoriesFunctionArgumentTypeRuleTest.php b/tests/Rules/Functions/FactoriesFunctionArgumentTypeRuleTest.php
@@ -47,7 +47,7 @@ protected function getRule(): Rule
             self::createReflectionProvider(),
             self::getContainer()->getByType(FactoriesReturnTypeHelper::class),
             $this->checkArgumentTypeOfConfig,
-            $this->checkArgumentTypeOfModel
+            $this->checkArgumentTypeOfModel,
         );
     }
 
diff --git a/tests/Rules/Functions/NoClassConstFetchOnFactoriesFunctionsTest.php b/tests/Rules/Functions/NoClassConstFetchOnFactoriesFunctionsTest.php
@@ -34,7 +34,7 @@ protected function getRule(): Rule
     {
         return new NoClassConstFetchOnFactoriesFunctions(
             self::createReflectionProvider(),
-            self::getContainer()->getByType(FactoriesReturnTypeHelper::class)
+            self::getContainer()->getByType(FactoriesReturnTypeHelper::class),
         );
     }
 
diff --git a/tests/Rules/Functions/ServicesFunctionArgumentTypeRuleTest.php b/tests/Rules/Functions/ServicesFunctionArgumentTypeRuleTest.php
@@ -33,7 +33,7 @@ protected function getRule(): Rule
     {
         return new ServicesFunctionArgumentTypeRule(
             self::createReflectionProvider(),
-            self::getContainer()->getByType(ServicesReturnTypeHelper::class)
+            self::getContainer()->getByType(ServicesReturnTypeHelper::class),
         );
     }
 

-Original file line number
+Diff line change
     'CodeIgniter 4 framework',
     'CodeIgniter Foundation',
     '[email protected]',
 -    2023
 +    2023,
 );
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function processNode(Node $node, Scope $scope): array`
`54`	`54`
`55`	`55`	`return [RuleErrorBuilder::message(sprintf(`
`56`	`56`	`'Instantiating %s using new is not allowed. Use one of its named constructors instead.',`
`57`		`- $objectType->getClassReflection()->getNativeReflection()->getShortName()`
	`57`	`+ $objectType->getClassReflection()->getNativeReflection()->getShortName(),`
`58`	`58`	`))->identifier('codeigniter.frameworkExceptionInstance')->build()];`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`final class SuperglobalAccessRule implements Rule`
`27`	`27`	`{`
`28`	`28`	`public function __construct(`
`29`		`- private readonly SuperglobalRuleHelper $superglobalRuleHelper`
	`29`	`+ private readonly SuperglobalRuleHelper $superglobalRuleHelper,`
`30`	`30`	`) {}`
`31`	`31`
`32`	`32`	`public function getNodeType(): string`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`final class SuperglobalAssignRule implements Rule`
`28`	`28`	`{`
`29`	`29`	`public function __construct(`
`30`		`- private readonly SuperglobalRuleHelper $superglobalRuleHelper`
	`30`	`+ private readonly SuperglobalRuleHelper $superglobalRuleHelper,`
`31`	`31`	`) {}`
`32`	`32`
`33`	`33`	`public function getNodeType(): string`
`@@ -108,7 +108,7 @@ private function processArrayDimFetch(Node $node, Scope $scope): array`
`108`	`108`	`'Use \\Config\\Services::superglobals()->%s(%s, %s) instead.',`
`109`	`109`	`$method,`
`110`	`110`	`$dimString->describe(VerbosityLevel::precise()),`
`111`		`- $exprString->describe(VerbosityLevel::precise())`
	`111`	`+ $exprString->describe(VerbosityLevel::precise()),`
`112`	`112`	`));`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`final class FactoriesFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension`
`23`	`23`	`{`
`24`	`24`	`public function __construct(`
`25`		`- private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper`
	`25`	`+ private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper,`
`26`	`26`	`) {}`
`27`	`27`
`28`	`28`	`public function isFunctionSupported(FunctionReflection $functionReflection): bool`
`@@ -40,7 +40,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,`
`40`	`40`
`41`	`41`	`return $this->factoriesReturnTypeHelper->check(`
`42`	`42`	`$scope->getType($arguments[0]->value),`
`43`		`- $functionReflection->getName()`
	`43`	`+ $functionReflection->getName(),`
`44`	`44`	`);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`final class ModelFindReturnTypeExtension implements DynamicMethodReturnTypeExtension`
`33`	`33`	`{`
`34`	`34`	`public function __construct(`
`35`		`- private readonly ModelFetchedReturnTypeHelper $modelFetchedReturnTypeHelper`
	`35`	`+ private readonly ModelFetchedReturnTypeHelper $modelFetchedReturnTypeHelper,`
`36`	`36`	`) {}`
`37`	`37`
`38`	`38`	`public function getClass(): string`
`@@ -96,7 +96,7 @@ function (Type $idType, callable $traverse) use ($methodCall, $scope): Type {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return $this->getTypeFromFindAll($methodCall, $scope);`
`99`		`- }`
	`99`	`+ },`
`100`	`100`	`);`
`101`	`101`	`}`
`102`	`102`
`@@ -107,9 +107,9 @@ private function getTypeFromFindAll(MethodCall $methodCall, Scope $scope): Type`
`107`	`107`	`return TypeCombinator::intersect(`
`108`	`108`	`new ArrayType(`
`109`	`109`	`new IntegerType(),`
`110`		`- $this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope)`
	`110`	`+ $this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope),`
`111`	`111`	`),`
`112`		`- new AccessoryArrayListType()`
	`112`	`+ new AccessoryArrayListType(),`
`113`	`113`	`);`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function getRule(): Rule`
`47`	`47`	`self::createReflectionProvider(),`
`48`	`48`	`self::getContainer()->getByType(FactoriesReturnTypeHelper::class),`
`49`	`49`	`$this->checkArgumentTypeOfConfig,`
`50`		`- $this->checkArgumentTypeOfModel`
	`50`	`+ $this->checkArgumentTypeOfModel,`
`51`	`51`	`);`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function getRule(): Rule`
`34`	`34`	`{`
`35`	`35`	`return new NoClassConstFetchOnFactoriesFunctions(`
`36`	`36`	`self::createReflectionProvider(),`
`37`		`- self::getContainer()->getByType(FactoriesReturnTypeHelper::class)`
	`37`	`+ self::getContainer()->getByType(FactoriesReturnTypeHelper::class),`
`38`	`38`	`);`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function getRule(): Rule`
`33`	`33`	`{`
`34`	`34`	`return new ServicesFunctionArgumentTypeRule(`
`35`	`35`	`self::createReflectionProvider(),`
`36`		`- self::getContainer()->getByType(ServicesReturnTypeHelper::class)`
	`36`	`+ self::getContainer()->getByType(ServicesReturnTypeHelper::class),`
`37`	`37`	`);`
`38`	`38`	`}`
`39`	`39`