Manually fix other data provider names

paulbalandan · paulbalandan · commit 0e7e31ac7edc · 2023-08-03T13:08:25.000+08:00
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
@@ -27,7 +27,7 @@
 final class CommonSingleServiceTest extends CIUnitTestCase
 {
     /**
-     * @dataProvider serviceNamesProvider
+     * @dataProvider provideServiceNames
      */
     public function testSingleServiceWithNoParamsSupplied(string $service): void
     {
@@ -43,7 +43,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
     }
 
     /**
-     * @dataProvider serviceNamesProvider
+     * @dataProvider provideServiceNames
      */
     public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void
     {
@@ -99,7 +99,7 @@ public function testSingleServiceWithGibberishGiven(): void
         $this->assertNull(single_service('timers'));
     }
 
-    public static function serviceNamesProvider(): iterable
+    public static function provideServiceNames(): iterable
     {
         static $services = [];
         static $excl     = [
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
@@ -248,7 +248,7 @@ public function testArrayDeepSearchReturnNullEmptyArray(): void
     }
 
     /**
-     * @dataProvider sortByMultipleKeysProvider
+     * @dataProvider provideSortByMultipleKeys
      */
     public function testArraySortByMultipleKeysWithArray(array $data, array $sortColumns, array $expected): void
     {
@@ -259,7 +259,7 @@ public function testArraySortByMultipleKeysWithArray(array $data, array $sortCol
     }
 
     /**
-     * @dataProvider sortByMultipleKeysProvider
+     * @dataProvider provideSortByMultipleKeys
      */
     public function testArraySortByMultipleKeysWithObjects(array $data, array $sortColumns, array $expected): void
     {
@@ -275,7 +275,7 @@ public function testArraySortByMultipleKeysWithObjects(array $data, array $sortC
     }
 
     /**
-     * @dataProvider sortByMultipleKeysProvider
+     * @dataProvider provideSortByMultipleKeys
      */
     public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, array $sortColumns, array $expected): void
     {
@@ -297,7 +297,7 @@ public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, arra
     }
 
     /**
-     * @dataProvider sortByMultipleKeysProvider
+     * @dataProvider provideSortByMultipleKeys
      *
      * @param mixed $data
      */
@@ -346,7 +346,7 @@ public static function provideArrayDeepSearch(): iterable
         ];
     }
 
-    public static function sortByMultipleKeysProvider(): iterable
+    public static function provideSortByMultipleKeys(): iterable
     {
         $seed = [
             0 => [
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -235,7 +235,7 @@ public function testUriStringSubfolderRelative(): void
         $this->assertSame('assets/image.jpg', uri_string());
     }
 
-    public function urlIsProvider(): iterable
+    public function provideUrlIs(): iterable
     {
         return [
             [
@@ -277,7 +277,7 @@ public function urlIsProvider(): iterable
     }
 
     /**
-     * @dataProvider urlIsProvider
+     * @dataProvider provideUrlIs
      */
     public function testUrlIs(string $currentPath, string $testPath, bool $expected): void
     {
@@ -291,7 +291,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected)
     }
 
     /**
-     * @dataProvider urlIsProvider
+     * @dataProvider provideUrlIs
      */
     public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected): void
     {
@@ -307,7 +307,7 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex
     }
 
     /**
-     * @dataProvider urlIsProvider
+     * @dataProvider provideUrlIs
      */
     public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected): void
     {
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider statusCodeProvider
+     * @dataProvider provideHttpStatusCodes
      */
     public function testIsOK(int $code, bool $isOk): void
     {
@@ -46,7 +46,7 @@ public function testIsOK(int $code, bool $isOk): void
     /**
      * Provides status codes and their expected "OK"
      */
-    public function statusCodeProvider(): iterable
+    public function provideHttpStatusCodes(): iterable
     {
         return [
             [
@@ -223,7 +223,7 @@ public function testAssertStatus(): void
     }
 
     /**
-     * @dataProvider statusCodeProvider
+     * @dataProvider provideHttpStatusCodes
      */
     public function testAssertIsOK(int $code, bool $isOk): void
     {
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
@@ -85,7 +85,7 @@ public function testRegexMatchFalse(): void
     }
 
     /**
-     * @dataProvider urlProvider
+     * @dataProvider provideValidUrl
      */
     public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void
     {
@@ -101,7 +101,7 @@ public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void
     }
 
     /**
-     * @dataProvider urlProvider
+     * @dataProvider provideValidUrl
      */
     public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict): void
     {
@@ -129,7 +129,7 @@ public function testValidURLStrictWithSchema(): void
         $this->assertFalse($this->validation->run($data));
     }
 
-    public function urlProvider(): iterable
+    public function provideValidUrl(): iterable
     {
         yield from [
             [
@@ -802,7 +802,7 @@ public function provideNumeric(): iterable
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
      *
-     * @dataProvider integerInvalidTypeDataProvider
+     * @dataProvider provideInvalidIntegerType
      *
      * @param mixed $value
      */
@@ -821,7 +821,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
      *
-     * @dataProvider integerInvalidTypeDataProvider
+     * @dataProvider provideInvalidIntegerType
      *
      * @param mixed $value
      */
@@ -837,7 +837,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
         $this->assertsame($expected, $this->validation->run($data));
     }
 
-    public function integerInvalidTypeDataProvider(): iterable
+    public function provideInvalidIntegerType(): iterable
     {
         // TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given
         // yield 'array with int' => [
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
@@ -526,7 +526,7 @@ public function provideLessThanEqual(): iterable
     }
 
     /**
-     * @dataProvider inListProvider
+     * @dataProvider provideInList
      */
     public function testInList(?string $first, ?string $second, bool $expected): void
     {
@@ -536,7 +536,7 @@ public function testInList(?string $first, ?string $second, bool $expected): voi
     }
 
     /**
-     * @dataProvider inListProvider
+     * @dataProvider provideInList
      */
     public function testNotInList(?string $first, ?string $second, bool $expected): void
     {
@@ -545,7 +545,7 @@ public function testNotInList(?string $first, ?string $second, bool $expected):
         $this->assertSame(! $expected, $this->validation->run($data));
     }
 
-    public function inListProvider(): iterable
+    public function provideInList(): iterable
     {
         yield from [
             ['red', 'red,Blue,123', true],
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Validation\StrictRules;
 
 use CodeIgniter\Validation\FormatRulesTest as TraditionalFormatRulesTest;
-use Generator;
 use Tests\Support\Validation\TestRules;
 
 /**
@@ -40,7 +39,7 @@ final class FormatRulesTest extends TraditionalFormatRulesTest
         ],
     ];
 
-    public function alphaSpaceProvider(): Generator
+    public function provideAlphaSpace(): iterable
     {
         yield from [
             [
@@ -70,7 +69,7 @@ public function alphaSpaceProvider(): Generator
         ];
     }
 
-    public function integerInvalidTypeDataProvider(): Generator
+    public function provideInvalidIntegerType(): iterable
     {
         yield 'array with int' => [
             [555],

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`final class CommonSingleServiceTest extends CIUnitTestCase`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`		`- * @dataProvider serviceNamesProvider`
	`30`	`+ * @dataProvider provideServiceNames`
`31`	`31`	`*/`
`32`	`32`	`public function testSingleServiceWithNoParamsSupplied(string $service): void`
`33`	`33`	`{`
`@@ -43,7 +43,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @dataProvider serviceNamesProvider`
	`46`	`+ * @dataProvider provideServiceNames`
`47`	`47`	`*/`
`48`	`48`	`public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void`
`49`	`49`	`{`
`@@ -99,7 +99,7 @@ public function testSingleServiceWithGibberishGiven(): void`
`99`	`99`	`$this->assertNull(single_service('timers'));`
`100`	`100`	`}`
`101`	`101`
`102`		`- public static function serviceNamesProvider(): iterable`
	`102`	`+ public static function provideServiceNames(): iterable`
`103`	`103`	`{`
`104`	`104`	`static $services = [];`
`105`	`105`	`static $excl = [`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public function testArrayDeepSearchReturnNullEmptyArray(): void`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`/**`
`251`		`- * @dataProvider sortByMultipleKeysProvider`
	`251`	`+ * @dataProvider provideSortByMultipleKeys`
`252`	`252`	`*/`
`253`	`253`	`public function testArraySortByMultipleKeysWithArray(array $data, array $sortColumns, array $expected): void`
`254`	`254`	`{`
`@@ -259,7 +259,7 @@ public function testArraySortByMultipleKeysWithArray(array $data, array $sortCol`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`/**`
`262`		`- * @dataProvider sortByMultipleKeysProvider`
	`262`	`+ * @dataProvider provideSortByMultipleKeys`
`263`	`263`	`*/`
`264`	`264`	`public function testArraySortByMultipleKeysWithObjects(array $data, array $sortColumns, array $expected): void`
`265`	`265`	`{`
`@@ -275,7 +275,7 @@ public function testArraySortByMultipleKeysWithObjects(array $data, array $sortC`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`/**`
`278`		`- * @dataProvider sortByMultipleKeysProvider`
	`278`	`+ * @dataProvider provideSortByMultipleKeys`
`279`	`279`	`*/`
`280`	`280`	`public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, array $sortColumns, array $expected): void`
`281`	`281`	`{`
`@@ -297,7 +297,7 @@ public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, arra`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`/**`
`300`		`- * @dataProvider sortByMultipleKeysProvider`
	`300`	`+ * @dataProvider provideSortByMultipleKeys`
`301`	`301`	`*`
`302`	`302`	`* @param mixed $data`
`303`	`303`	`*/`
`@@ -346,7 +346,7 @@ public static function provideArrayDeepSearch(): iterable`
`346`	`346`	`];`
`347`	`347`	`}`
`348`	`348`
`349`		`- public static function sortByMultipleKeysProvider(): iterable`
	`349`	`+ public static function provideSortByMultipleKeys(): iterable`
`350`	`350`	`{`
`351`	`351`	`$seed = [`
`352`	`352`	`0 => [`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ public function testUriStringSubfolderRelative(): void`
`235`	`235`	`$this->assertSame('assets/image.jpg', uri_string());`
`236`	`236`	`}`
`237`	`237`
`238`		`- public function urlIsProvider(): iterable`
	`238`	`+ public function provideUrlIs(): iterable`
`239`	`239`	`{`
`240`	`240`	`return [`
`241`	`241`	`[`
`@@ -277,7 +277,7 @@ public function urlIsProvider(): iterable`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`/**`
`280`		`- * @dataProvider urlIsProvider`
	`280`	`+ * @dataProvider provideUrlIs`
`281`	`281`	`*/`
`282`	`282`	`public function testUrlIs(string $currentPath, string $testPath, bool $expected): void`
`283`	`283`	`{`
`@@ -291,7 +291,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected)`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`294`		`- * @dataProvider urlIsProvider`
	`294`	`+ * @dataProvider provideUrlIs`
`295`	`295`	`*/`
`296`	`296`	`public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected): void`
`297`	`297`	`{`
`@@ -307,7 +307,7 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`/**`
`310`		`- * @dataProvider urlIsProvider`
	`310`	`+ * @dataProvider provideUrlIs`
`311`	`311`	`*/`
`312`	`312`	`public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected): void`
`313`	`313`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUp(): void`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @dataProvider statusCodeProvider`
	`36`	`+ * @dataProvider provideHttpStatusCodes`
`37`	`37`	`*/`
`38`	`38`	`public function testIsOK(int $code, bool $isOk): void`
`39`	`39`	`{`
`@@ -46,7 +46,7 @@ public function testIsOK(int $code, bool $isOk): void`
`46`	`46`	`/**`
`47`	`47`	`* Provides status codes and their expected "OK"`
`48`	`48`	`*/`
`49`		`- public function statusCodeProvider(): iterable`
	`49`	`+ public function provideHttpStatusCodes(): iterable`
`50`	`50`	`{`
`51`	`51`	`return [`
`52`	`52`	`[`
`@@ -223,7 +223,7 @@ public function testAssertStatus(): void`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`/**`
`226`		`- * @dataProvider statusCodeProvider`
	`226`	`+ * @dataProvider provideHttpStatusCodes`
`227`	`227`	`*/`
`228`	`228`	`public function testAssertIsOK(int $code, bool $isOk): void`
`229`	`229`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testRegexMatchFalse(): void`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * @dataProvider urlProvider`
	`88`	`+ * @dataProvider provideValidUrl`
`89`	`89`	`*/`
`90`	`90`	`public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void`
`91`	`91`	`{`
`@@ -101,7 +101,7 @@ public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
`104`		`- * @dataProvider urlProvider`
	`104`	`+ * @dataProvider provideValidUrl`
`105`	`105`	`*/`
`106`	`106`	`public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict): void`
`107`	`107`	`{`
`@@ -129,7 +129,7 @@ public function testValidURLStrictWithSchema(): void`
`129`	`129`	`$this->assertFalse($this->validation->run($data));`
`130`	`130`	`}`
`131`	`131`
`132`		`- public function urlProvider(): iterable`
	`132`	`+ public function provideValidUrl(): iterable`
`133`	`133`	`{`
`134`	`134`	`yield from [`
`135`	`135`	`[`
`@@ -802,7 +802,7 @@ public function provideNumeric(): iterable`
`802`	`802`	`/**`
`803`	`803`	`* @see https://github.com/codeigniter4/CodeIgniter4/issues/5374`
`804`	`804`	`*`
`805`		`- * @dataProvider integerInvalidTypeDataProvider`
	`805`	`+ * @dataProvider provideInvalidIntegerType`
`806`	`806`	`*`
`807`	`807`	`* @param mixed $value`
`808`	`808`	`*/`
`@@ -821,7 +821,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void`
`821`	`821`	`/**`
`822`	`822`	`* @see https://github.com/codeigniter4/CodeIgniter4/issues/5374`
`823`	`823`	`*`
`824`		`- * @dataProvider integerInvalidTypeDataProvider`
	`824`	`+ * @dataProvider provideInvalidIntegerType`
`825`	`825`	`*`
`826`	`826`	`* @param mixed $value`
`827`	`827`	`*/`
`@@ -837,7 +837,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void`
`837`	`837`	`$this->assertsame($expected, $this->validation->run($data));`
`838`	`838`	`}`
`839`	`839`
`840`		`- public function integerInvalidTypeDataProvider(): iterable`
	`840`	`+ public function provideInvalidIntegerType(): iterable`
`841`	`841`	`{`
`842`	`842`	`// TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given`
`843`	`843`	`// yield 'array with int' => [`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ public function provideLessThanEqual(): iterable`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`/**`
`529`		`- * @dataProvider inListProvider`
	`529`	`+ * @dataProvider provideInList`
`530`	`530`	`*/`
`531`	`531`	`public function testInList(?string $first, ?string $second, bool $expected): void`
`532`	`532`	`{`
`@@ -536,7 +536,7 @@ public function testInList(?string $first, ?string $second, bool $expected): voi`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`/**`
`539`		`- * @dataProvider inListProvider`
	`539`	`+ * @dataProvider provideInList`
`540`	`540`	`*/`
`541`	`541`	`public function testNotInList(?string $first, ?string $second, bool $expected): void`
`542`	`542`	`{`
`@@ -545,7 +545,7 @@ public function testNotInList(?string $first, ?string $second, bool $expected):`
`545`	`545`	`$this->assertSame(! $expected, $this->validation->run($data));`
`546`	`546`	`}`
`547`	`547`
`548`		`- public function inListProvider(): iterable`
	`548`	`+ public function provideInList(): iterable`
`549`	`549`	`{`
`550`	`550`	`yield from [`
`551`	`551`	`['red', 'red,Blue,123', true],`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace CodeIgniter\Validation\StrictRules;`
`13`	`13`
`14`	`14`	`use CodeIgniter\Validation\FormatRulesTest as TraditionalFormatRulesTest;`
`15`		`-use Generator;`
`16`	`15`	`use Tests\Support\Validation\TestRules;`
`17`	`16`
`18`	`17`	`/**`
`@@ -40,7 +39,7 @@ final class FormatRulesTest extends TraditionalFormatRulesTest`
`40`	`39`	`],`
`41`	`40`	`];`
`42`	`41`
`43`		`- public function alphaSpaceProvider(): Generator`
	`42`	`+ public function provideAlphaSpace(): iterable`
`44`	`43`	`{`
`45`	`44`	`yield from [`
`46`	`45`	`[`
`@@ -70,7 +69,7 @@ public function alphaSpaceProvider(): Generator`
`70`	`69`	`];`
`71`	`70`	`}`
`72`	`71`
`73`		`- public function integerInvalidTypeDataProvider(): Generator`
	`72`	`+ public function provideInvalidIntegerType(): iterable`
`74`	`73`	`{`
`75`	`74`	`yield 'array with int' => [`
`76`	`75`	`[555],`