Fix code style and tests

Author: paulbalandan

tests/Rules/Classes/FrameworkExceptionInstantiationRuleTest.php

@@ -38,15 +38,15 @@ public function testRule(): void
         $this->analyse([__DIR__ . '/data/framework-exception.php'], [
             [
                 'Instantiating FrameworkException using new is not allowed. Use one of its named constructors instead.',
-                17,
+                18,
             ],
             [
                 'Instantiating ViewException using new is not allowed. Use one of its named constructors instead.',
-                18,
+                19,
             ],
             [
                 'Instantiating HTTPException using new is not allowed. Use one of its named constructors instead.',
-                20,
+                21,
             ],
         ]);
     }

tests/Rules/Classes/data/framework-exception.php

@@ -12,9 +12,10 @@
  */
 
 use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\View\Exceptions\ViewException;
 
 $e1 = new FrameworkException('Hello.');
 $e2 = new ViewException('Hi!');
 $e3 = new RuntimeException('Thanks.');
-$e4 = new CodeIgniter\HTTP\Exceptions\HTTPException('Nice');
+$e4 = new HTTPException('Nice');

tests/Rules/Functions/FactoriesFunctionArgumentTypeRuleTest.php

@@ -59,25 +59,25 @@ public function testRule(): void
         ], [
             [
                 'Parameter #1 $name of function config expects a valid class string, \'bar\' given.',
-                23,
+                24,
                 'If \'bar\' is a valid class string, you can add its possible namespace(s) in <fg=cyan>codeigniter.additionalConfigNamespaces</> in your <fg=yellow>%configurationFile%</>.',
             ],
             [
                 'Parameter #1 $name of function config expects a valid class string, \'Foo\\\\Bar\' given.',
-                24,
+                25,
                 'If \'Foo\\\\Bar\' is a valid class string, you can add its possible namespace(s) in <fg=cyan>codeigniter.additionalConfigNamespaces</> in your <fg=yellow>%configurationFile%</>.',
             ],
             [
                 'Argument #1 $name (\'Foo\'|\'stdClass\') passed to function config does not extend CodeIgniter\\\\Config\\\\BaseConfig.',
-                27,
+                28,
             ],
             [
                 'Argument #1 $name (class-string) passed to function config does not extend CodeIgniter\\\\Config\\\\BaseConfig.',
-                32,
+                33,
             ],
             [
                 'Parameter #1 $name of function config expects a valid class string, string given.',
-                35,
+                36,
             ],
             [
                 'Parameter #1 $name of function model expects a valid class string, \'foo\' given.',

tests/Rules/Functions/NoClassConstFetchOnFactoriesFunctionsTest.php

@@ -47,7 +47,7 @@ public function testRule(): void
         ], [
             [
                 'Call to function config with CodeIgniter\Shield\Config\AuthJWT::class is discouraged.',
-                38,
+                39,
                 'Use config(\'AuthJWT\') instead to allow overriding.',
             ],
             [

tests/Type/data/config.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\PHPStan\Tests\Fixtures\Type;
 
+use CodeIgniter\Shield\Config\AuthJWT;
 use Config\App;
 use stdClass;
 
@@ -35,4 +36,4 @@ function bar(string $name): void
     assertType('null', config($name));
 }
 
-assertType('CodeIgniter\Shield\Config\AuthJWT', config(\CodeIgniter\Shield\Config\AuthJWT::class));
+assertType('CodeIgniter\Shield\Config\AuthJWT', config(AuthJWT::class));

tests/Type/data/reflection-helper.php

@@ -48,14 +48,14 @@ public function testObjectAsObjectType(): void
 
         $object = new Environment(service('logger'), service('commands'));
         assertType(
-            'Closure(array<int|string, string|null>): (int|void)',
+            'Closure(array<int|string, string|null>): int',
             self::getPrivateMethodInvoker($object, 'run'),
         );
         assertType('Closure(string): bool', self::getPrivateMethodInvoker($object, 'writeNewEnvironmentToEnvFile'));
 
         $object = new ConfigCheck(service('logger'), service('commands'));
         assertType(
-            'Closure(array<int|string, string|null>): (int|void)',
+            'Closure(array<int|string, string|null>): int',
             self::getPrivateMethodInvoker($object, 'run'),
         );
         assertType('Closure(object): string', self::getPrivateMethodInvoker($object, 'getVarDump'));