style: fix code styles from php-cs-fixer v3.82.1

tests/system/CommonSingleServiceTest.php

@@ -75,29 +75,6 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
         }
     }
 
-    public function testSingleServiceWithAllParamsSupplied(): void
-    {
-        $cache1 = single_service('cache', null, true);
-        $cache2 = single_service('cache', null, true);
-
-        assert($cache1 !== null);
-        assert($cache2 !== null);
-
-        // Assert that even passing true as last param this will
-        // not create a shared instance.
-        $this->assertInstanceOf($cache1::class, $cache2);
-        $this->assertNotSame($cache1, $cache2);
-    }
-
-    public function testSingleServiceWithGibberishGiven(): void
-    {
-        $this->assertNull(single_service('foo')); // @phpstan-ignore codeigniter.unknownServiceMethod
-        $this->assertNull(single_service('bar')); // @phpstan-ignore codeigniter.unknownServiceMethod
-        $this->assertNull(single_service('baz')); // @phpstan-ignore codeigniter.unknownServiceMethod
-        $this->assertNull(single_service('caches')); // @phpstan-ignore codeigniter.unknownServiceMethod
-        $this->assertNull(single_service('timers')); // @phpstan-ignore codeigniter.unknownServiceMethod
-    }
-
     /**
      * @return iterable<string, array{string}>
      */
@@ -137,4 +114,27 @@ public static function provideServiceNames(): iterable
 
         yield from $services;
     }
+
+    public function testSingleServiceWithAllParamsSupplied(): void
+    {
+        $cache1 = single_service('cache', null, true);
+        $cache2 = single_service('cache', null, true);
+
+        assert($cache1 !== null);
+        assert($cache2 !== null);
+
+        // Assert that even passing true as last param this will
+        // not create a shared instance.
+        $this->assertInstanceOf($cache1::class, $cache2);
+        $this->assertNotSame($cache1, $cache2);
+    }
+
+    public function testSingleServiceWithGibberishGiven(): void
+    {
+        $this->assertNull(single_service('foo')); // @phpstan-ignore codeigniter.unknownServiceMethod
+        $this->assertNull(single_service('bar')); // @phpstan-ignore codeigniter.unknownServiceMethod
+        $this->assertNull(single_service('baz')); // @phpstan-ignore codeigniter.unknownServiceMethod
+        $this->assertNull(single_service('caches')); // @phpstan-ignore codeigniter.unknownServiceMethod
+        $this->assertNull(single_service('timers')); // @phpstan-ignore codeigniter.unknownServiceMethod
+    }
 }

tests/system/Config/MimesTest.php

@@ -24,6 +24,12 @@
 #[Group('Others')]
 final class MimesTest extends CIUnitTestCase
 {
+    #[DataProvider('provideGuessExtensionFromType')]
+    public function testGuessExtensionFromType(?string $expected, string $mime): void
+    {
+        $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
+    }
+
     public static function provideGuessExtensionFromType(): iterable
     {
         return [
@@ -50,10 +56,10 @@ public static function provideGuessExtensionFromType(): iterable
         ];
     }
 
-    #[DataProvider('provideGuessExtensionFromType')]
-    public function testGuessExtensionFromType(?string $expected, string $mime): void
+    #[DataProvider('provideGuessTypeFromExtension')]
+    public function testGuessTypeFromExtension(?string $expected, string $ext): void
     {
-        $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
+        $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
     }
 
     public static function provideGuessTypeFromExtension(): iterable
@@ -81,10 +87,4 @@ public static function provideGuessTypeFromExtension(): iterable
             ],
         ];
     }
-
-    #[DataProvider('provideGuessTypeFromExtension')]
-    public function testGuessTypeFromExtension(?string $expected, string $ext): void
-    {
-        $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
-    }
 }

tests/system/Config/ServicesTest.php

@@ -263,7 +263,7 @@ public function testNewSessionWithNullConfig(): void
         $this->assertInstanceOf(Session::class, $actual);
     }
 
-    #[DataProvider('provideNewSessionInvalid')]
+    #[DataProvider('provideNewSessionWithInvalidHandler')]
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
     public function testNewSessionWithInvalidHandler(string $driver): void
@@ -277,6 +277,18 @@ public function testNewSessionWithInvalidHandler(string $driver): void
         Services::session($config, false);
     }
 
+    /**
+     * @return iterable<string, array{0: string}>
+     */
+    public static function provideNewSessionWithInvalidHandler(): iterable
+    {
+        yield 'just a string' => ['file'];
+
+        yield 'inexistent class' => ['Foo'];
+
+        yield 'other class' => [self::class];
+    }
+
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
     public function testNewSessionWithInvalidDatabaseHandler(): void
@@ -296,18 +308,6 @@ public function testNewSessionWithInvalidDatabaseHandler(): void
         Services::session($config, false);
     }
 
-    /**
-     * @return iterable<string, array{0: string}>
-     */
-    public static function provideNewSessionInvalid(): iterable
-    {
-        yield 'just a string' => ['file'];
-
-        yield 'inexistent class' => ['Foo'];
-
-        yield 'other class' => [self::class];
-    }
-
     #[PreserveGlobalState(false)]
     #[RunInSeparateProcess]
     public function testCallStatic(): void

tests/system/DataConverter/DataConverterTest.php

@@ -50,16 +50,6 @@ public function testConvertDataFromDB(array $types, array $dbData, array $expect
         $this->assertSame($expected, $data);
     }
 
-    #[DataProvider('provideConvertDataToDB')]
-    public function testConvertDataToDB(array $types, array $phpData, array $expected): void
-    {
-        $converter = $this->createDataConverter($types);
-
-        $data = $converter->toDataSource($phpData);
-
-        $this->assertSame($expected, $data);
-    }
-
     public static function provideConvertDataFromDB(): iterable
     {
         yield from [
@@ -206,6 +196,16 @@ public static function provideConvertDataFromDB(): iterable
         ];
     }
 
+    #[DataProvider('provideConvertDataToDB')]
+    public function testConvertDataToDB(array $types, array $phpData, array $expected): void
+    {
+        $converter = $this->createDataConverter($types);
+
+        $data = $converter->toDataSource($phpData);
+
+        $this->assertSame($expected, $data);
+    }
+
     public static function provideConvertDataToDB(): iterable
     {
         yield from [

tests/system/Database/BaseQueryTest.php

@@ -107,6 +107,19 @@ public function testSwapPrefix(): void
         $this->assertSame($newSQL, $query->getQuery());
     }
 
+    /**
+     * @param mixed $expected
+     * @param mixed $sql
+     */
+    #[DataProvider('provideIsWriteType')]
+    public function testIsWriteType($expected, $sql): void
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery($sql);
+        $this->assertSame($expected, $query->isWriteType());
+    }
+
     public static function provideIsWriteType(): iterable
     {
         return [
@@ -185,19 +198,6 @@ public static function provideIsWriteType(): iterable
         ];
     }
 
-    /**
-     * @param mixed $expected
-     * @param mixed $sql
-     */
-    #[DataProvider('provideIsWriteType')]
-    public function testIsWriteType($expected, $sql): void
-    {
-        $query = new Query($this->db);
-
-        $query->setQuery($sql);
-        $this->assertSame($expected, $query->isWriteType());
-    }
-
     public function testSingleBindingOutsideOfArray(): void
     {
         $query = new Query($this->db);
@@ -579,6 +579,19 @@ public function testSwapPrefixAfterGetQuery(): void
         $this->assertSame($expected, $query->getQuery());
     }
 
+    /**
+     * @param mixed $expected
+     * @param mixed $sql
+     */
+    #[DataProvider('provideHighlightQueryKeywords')]
+    public function testHighlightQueryKeywords($expected, $sql): void
+    {
+        $query = new Query($this->db);
+        $query->setQuery($sql);
+
+        $this->assertSame($expected, $query->debugToolbarDisplay());
+    }
+
     public static function provideHighlightQueryKeywords(): iterable
     {
         return [
@@ -596,17 +609,4 @@ public static function provideHighlightQueryKeywords(): iterable
             ],
         ];
     }
-
-    /**
-     * @param mixed $expected
-     * @param mixed $sql
-     */
-    #[DataProvider('provideHighlightQueryKeywords')]
-    public function testHighlightQueryKeywords($expected, $sql): void
-    {
-        $query = new Query($this->db);
-        $query->setQuery($sql);
-
-        $this->assertSame($expected, $query->debugToolbarDisplay());
-    }
 }

tests/system/Database/Builder/WhenTest.php

@@ -206,7 +206,7 @@ public function testWhenNotRunsDefaultCallbackBasedOnCondition(mixed $condition,
     /**
      * @return array<string, array{0: mixed, 1: bool}>
      */
-    public static function provideConditionValues(): array
+    public static function provideConditionValues(): iterable
     {
         return [
             'false'            => [false, true], // [condition, expectedDefaultCallbackRuns]

tests/system/Database/Builder/WhereTest.php

@@ -395,14 +395,6 @@ public function testWhereInSubQuery(): void
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    public static function provideWhereInvalidKeyThrowInvalidArgumentException(): iterable
-    {
-        return [
-            'null'         => [null],
-            'empty string' => [''],
-        ];
-    }
-
     /**
      * @param mixed $key
      */
@@ -415,12 +407,11 @@ public function testWhereInvalidKeyThrowInvalidArgumentException($key): void
         $builder->whereIn($key, ['Politician', 'Accountant']);
     }
 
-    public static function provideWhereInEmptyValuesThrowInvalidArgumentException(): iterable
+    public static function provideWhereInvalidKeyThrowInvalidArgumentException(): iterable
     {
         return [
-            'null'                    => [null],
-            'not array'               => ['not array'],
-            'not instanceof \Closure' => [new stdClass()],
+            'null'         => [null],
+            'empty string' => [''],
         ];
     }
 
@@ -436,6 +427,15 @@ public function testWhereInEmptyValuesThrowInvalidArgumentException($values): vo
         $builder->whereIn('name', $values);
     }
 
+    public static function provideWhereInEmptyValuesThrowInvalidArgumentException(): iterable
+    {
+        return [
+            'null'                    => [null],
+            'not array'               => ['not array'],
+            'not instanceof \Closure' => [new stdClass()],
+        ];
+    }
+
     public function testWhereNotIn(): void
     {
         $builder = $this->db->table('jobs');

tests/system/Database/Live/LikeTest.php

@@ -76,7 +76,7 @@ public function testLikeCaseInsensitive(): void
         $this->assertSame('Developer', $job->name);
     }
 
-    #[DataProvider('provideMultibyteCharacters')]
+    #[DataProvider('provideLikeCaseInsensitiveWithMultibyteCharacter')]
     public function testLikeCaseInsensitiveWithMultibyteCharacter(string $match, string $result): void
     {
         $wai = $this->db->table('without_auto_increment')->like('value', $match, 'both', null, true)->get();
@@ -88,7 +88,7 @@ public function testLikeCaseInsensitiveWithMultibyteCharacter(string $match, str
     /**
      * @return iterable<string, array{0: string, 1: string}>
      */
-    public static function provideMultibyteCharacters(): iterable
+    public static function provideLikeCaseInsensitiveWithMultibyteCharacter(): iterable
     {
         yield from [
             'polish'    => ['ŁĄ', 'multibyte characters pl'],

tests/system/Email/EmailTest.php

@@ -39,14 +39,6 @@ public function testEmailValidation(): void
         $this->assertStringContainsString('Invalid email address: "invalid"', $email->printDebugger());
     }
 
-    public static function provideEmailSendWithClearance(): iterable
-    {
-        return [
-            'autoclear'     => [true],
-            'not autoclear' => [false],
-        ];
-    }
-
     /**
      * @param bool $autoClear
      */
@@ -64,6 +56,14 @@ public function testEmailSendWithClearance($autoClear): void
         }
     }
 
+    public static function provideEmailSendWithClearance(): iterable
+    {
+        return [
+            'autoclear'     => [true],
+            'not autoclear' => [false],
+        ];
+    }
+
     public function testEmailSendStoresArchive(): void
     {
         $email = $this->createMockEmail();