From 64c8fcefb7e15fb56d8a0beeb29c6b61a4792744 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 12 Dec 2024 00:29:57 +0800 Subject: [PATCH] refactor: fix `method.nameCase` errors --- phpstan-baseline.php | 36 ------------------- system/Test/ControllerTestTrait.php | 2 +- tests/system/Database/Live/InsertTest.php | 8 ++--- tests/system/Database/Live/UpsertTest.php | 18 +++++----- tests/system/Format/FormatTest.php | 2 +- .../system/HTTP/Files/FileCollectionTest.php | 2 +- tests/system/Test/ControllerTestTraitTest.php | 34 +++++++++--------- tests/system/Validation/FormatRulesTest.php | 4 +-- user_guide_src/source/testing/controllers.rst | 2 +- .../source/testing/controllers/002.php | 2 +- .../source/testing/controllers/009.php | 2 +- 11 files changed, 38 insertions(+), 74 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index ef6bcd43f8d0..06beec2c3c34 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -13069,12 +13069,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Database/Live/GetTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#', - 'count' => 4, - 'path' => __DIR__ . '/tests/system/Database/Live/InsertTest.php', -]; $ignoreErrors[] = [ // identifier: property.phpDocType 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Live\\\\MetadataTest\\:\\:\\$seed is not the same as PHPDoc type array\\\\>\\|class\\-string\\ of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed\\.$#', @@ -13177,12 +13171,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Database/Live/UpdateTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) with incorrect case\\: getwhere$#', - 'count' => 9, - 'path' => __DIR__ . '/tests/system/Database/Live/UpsertTest.php', -]; $ignoreErrors[] = [ // identifier: argument.type 'message' => '#^Parameter \\#1 \\$set of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) expects array\\\\|string, array\\ given\\.$#', @@ -13543,12 +13531,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Filters/fixtures/InvalidClass.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with incorrect case\\: assertInstanceof$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/Format/FormatTest.php', -]; $ignoreErrors[] = [ // identifier: missingType.iterableValue 'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatterTest\\:\\:provideValidatingInvalidTags\\(\\) return type has no value type specified in iterable type iterable\\.$#', @@ -13675,12 +13657,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/HTTP/DownloadResponseTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with incorrect case\\: AssertNull$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/Files/FileCollectionTest.php', -]; $ignoreErrors[] = [ // identifier: missingType.return 'message' => '#^Function CodeIgniter\\\\HTTP\\\\Files\\\\is_uploaded_file\\(\\) has no return type specified\\.$#', @@ -16843,12 +16819,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method CodeIgniter\\\\Test\\\\ControllerTestTraitTest\\:\\:withUri\\(\\) with incorrect case\\: withURI$#', - 'count' => 17, - 'path' => __DIR__ . '/tests/system/Test/ControllerTestTraitTest.php', -]; $ignoreErrors[] = [ // identifier: class.notFound 'message' => '#^Class App\\\\Controllers\\\\NeverHeardOfIt not found\\.$#', @@ -17317,12 +17287,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Validation/FileRulesTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.nameCase - 'message' => '#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with incorrect case\\: assertsame$#', - 'count' => 2, - 'path' => __DIR__ . '/tests/system/Validation/FormatRulesTest.php', -]; $ignoreErrors[] = [ // identifier: missingType.iterableValue 'message' => '#^Method CodeIgniter\\\\Validation\\\\FormatRulesTest\\:\\:alphaNumericProvider\\(\\) return type has no value type specified in iterable type iterable\\.$#', diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index 99e9cf330274..5a5bc708692f 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -31,7 +31,7 @@ * * $this->withRequest($request) * ->withResponse($response) - * ->withURI($uri) + * ->withUri($uri) * ->withBody($body) * ->controller('App\Controllers\Home') * ->execute('methodName'); diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php index 217632551b29..ca2117a06b35 100644 --- a/tests/system/Database/Live/InsertTest.php +++ b/tests/system/Database/Live/InsertTest.php @@ -97,7 +97,7 @@ public function testReplaceWithNoMatchingData(): void $this->db->table('job')->replace($data); $row = $this->db->table('job') - ->getwhere(['id' => 5]) + ->getWhere(['id' => 5]) ->getRow(); $this->assertSame('Cab Driver', $row->name); @@ -114,7 +114,7 @@ public function testReplaceWithMatchingData(): void $this->db->table('job')->replace($data); $row = $this->db->table('job') - ->getwhere(['id' => 1]) + ->getWhere(['id' => 1]) ->getRow(); $this->assertSame('Cab Driver', $row->name); @@ -135,7 +135,7 @@ public function testReplaceTwice(): void $builder->replace($data); $row = $this->db->table('job') - ->getwhere(['id' => 1]) + ->getWhere(['id' => 1]) ->getRow(); $this->assertSame('John Smith', $row->name); @@ -147,7 +147,7 @@ public function testReplaceTwice(): void $builder->replace($data); $row = $this->db->table('job') - ->getwhere(['id' => 2]) + ->getWhere(['id' => 2]) ->getRow(); $this->assertSame('Hans Schmidt', $row->name); } diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php index bb29f0802480..a702ff5e1b8d 100644 --- a/tests/system/Database/Live/UpsertTest.php +++ b/tests/system/Database/Live/UpsertTest.php @@ -190,7 +190,7 @@ public function testUpsertChangePrimaryKeyOnUniqueIndex(): void ->upsert($userData); $new = $this->db->table('user') - ->getwhere(['email' => 'ahmadinejad@world.com']) + ->getWhere(['email' => 'ahmadinejad@world.com']) ->getRow(); $this->assertSame(5, (int) $new->id); @@ -460,7 +460,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void $this->db->table('user')->upsert($data); $original = $this->db->table('user') - ->getwhere(['id' => 6]) + ->getWhere(['id' => 6]) ->getRow(); $data = [ @@ -474,7 +474,7 @@ public function testUpsertWithMatchingDataOnUniqueIndexandPrimaryKey(): void // get by id $row = $this->db->table('user') - ->getwhere(['id' => 6]) + ->getWhere(['id' => 6]) ->getRow(); $this->assertSame('Random Name 356', $row->name); @@ -508,17 +508,17 @@ public function testUpsertBatchOnPrimaryKey(): void // get by id $row1 = $this->db->table('user') - ->getwhere(['id' => 1]) + ->getWhere(['id' => 1]) ->getRow(); // get by id $row2 = $this->db->table('user') - ->getwhere(['id' => 2]) + ->getWhere(['id' => 2]) ->getRow(); // get by id $row3 = $this->db->table('user') - ->getwhere(['id' => 3]) + ->getWhere(['id' => 3]) ->getRow(); $this->assertSame('Upsert One On Id', $row1->name); @@ -553,17 +553,17 @@ public function testUpsertBatchOnNullAutoIncrement(): void // get by id $row1 = $this->db->table('user') - ->getwhere(['email' => 'nullone@domain.com']) + ->getWhere(['email' => 'nullone@domain.com']) ->getRow(); // get by id $row2 = $this->db->table('user') - ->getwhere(['email' => 'nulltwo@domain.com']) + ->getWhere(['email' => 'nulltwo@domain.com']) ->getRow(); // get by id $row3 = $this->db->table('user') - ->getwhere(['email' => 'nullthree@domain.com']) + ->getWhere(['email' => 'nullthree@domain.com']) ->getRow(); $this->assertSame('Null One', $row1->name); diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php index 89fab7512368..74252c7b56d8 100644 --- a/tests/system/Format/FormatTest.php +++ b/tests/system/Format/FormatTest.php @@ -42,7 +42,7 @@ public function testFormatConfigType(): void public function testGetFormatter(): void { - $this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json')); + $this->assertInstanceOf(FormatterInterface::class, $this->format->getFormatter('application/json')); } public function testGetFormatterExpectsExceptionOnUndefinedMime(): void diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php index a0d7bb1de771..3e502f7afec4 100644 --- a/tests/system/HTTP/Files/FileCollectionTest.php +++ b/tests/system/HTTP/Files/FileCollectionTest.php @@ -524,7 +524,7 @@ public function testFileNoExistSingleFile(): void $collection = new FileCollection(); $file = $collection->getFile('fileuser'); - $this->AssertNull($file); + $this->assertNull($file); } public function testFileReturnValidMultipleFiles(): void diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index 22d320a1e139..c6c8ec32179f 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -49,7 +49,7 @@ public function testBadController(): void { $this->expectException('InvalidArgumentException'); $logger = new Logger(new LoggerConfig()); - $this->withURI('http://example.com') + $this->withUri('http://example.com') ->withLogger($logger) ->controller(NeverHeardOfIt::class) ->execute('index'); @@ -59,7 +59,7 @@ public function testBadControllerMethod(): void { $this->expectException('InvalidArgumentException'); $logger = new Logger(new LoggerConfig()); - $this->withURI('http://example.com') + $this->withUri('http://example.com') ->withLogger($logger) ->controller(Home::class) ->execute('nothere'); @@ -68,7 +68,7 @@ public function testBadControllerMethod(): void public function testController(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Home::class) ->execute('index'); @@ -78,7 +78,7 @@ public function testController(): void public function testControllerWithoutLogger(): void { - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->controller(Home::class) ->execute('index'); @@ -88,7 +88,7 @@ public function testControllerWithoutLogger(): void public function testPopcornIndex(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('index'); @@ -99,7 +99,7 @@ public function testPopcornIndex(): void public function testPopcornIndex2(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('index'); @@ -111,7 +111,7 @@ public function testPopcornIndex2(): void public function testPopcornFailure(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('pop'); @@ -122,7 +122,7 @@ public function testPopcornFailure(): void public function testPopcornException(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('popper'); @@ -136,7 +136,7 @@ public function testPopcornIndexWithSupport(): void $config = new App(); $body = ''; - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withConfig($config) ->withRequest(service('request', $config)) ->withResponse(service('response', $config)) @@ -152,7 +152,7 @@ public function testPopcornIndexWithSupport(): void public function testRequestPassthrough(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('popper'); @@ -164,7 +164,7 @@ public function testRequestPassthrough(): void public function testFailureResponse(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('oops'); @@ -176,7 +176,7 @@ public function testFailureResponse(): void public function testEmptyResponse(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('weasel'); @@ -189,7 +189,7 @@ public function testEmptyResponse(): void public function testRedirect(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('goaway'); @@ -200,7 +200,7 @@ public function testRedirect(): void public function testDOMParserForward(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('index'); @@ -211,7 +211,7 @@ public function testDOMParserForward(): void public function testFailsForward(): void { $logger = new Logger(new LoggerConfig()); - $result = $this->withURI('http://example.com') + $result = $this->withUri('http://example.com') ->withLogger($logger) ->controller(Popcorn::class) ->execute('index'); @@ -225,7 +225,7 @@ public function testFailsForward(): void */ public function testResponseOverriding(): void { - $result = $this->withURI('http://example.com/rest/') + $result = $this->withUri('http://example.com/rest/') ->controller(Popcorn::class) ->execute('index3'); @@ -271,7 +271,7 @@ public function throwsBody(): never public function testWithUriUpdatesUriStringAndCurrentUrlValues(): void { - $result = $this->withURI('http://example.com/foo/bar/1/2/3') + $result = $this->withUri('http://example.com/foo/bar/1/2/3') ->controller(Newautorouting::class) ->execute('postSave', '1', '2', '3'); diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php index aa59e1b0f5ae..68eff136cb93 100644 --- a/tests/system/Validation/FormatRulesTest.php +++ b/tests/system/Validation/FormatRulesTest.php @@ -789,7 +789,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void $data = [ 'foo' => $value, ]; - $this->assertsame($expected, $this->validation->run($data)); + $this->assertSame($expected, $this->validation->run($data)); } /** @@ -807,7 +807,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void $data = [ 'foo' => $value, ]; - $this->assertsame($expected, $this->validation->run($data)); + $this->assertSame($expected, $this->validation->run($data)); } public static function provideInvalidIntegerType(): iterable diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst index 8f38f68c4e3d..d8682e6b9cc5 100644 --- a/user_guide_src/source/testing/controllers.rst +++ b/user_guide_src/source/testing/controllers.rst @@ -90,7 +90,7 @@ Allows you to provide a **Logger** instance: If you do not provide one, a new Logger instance with the default configuration values will be passed into your controller. -withURI(string $uri) +withUri(string $uri) -------------------- Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run. diff --git a/user_guide_src/source/testing/controllers/002.php b/user_guide_src/source/testing/controllers/002.php index 13701910f5e8..f84b1e03aba2 100644 --- a/user_guide_src/source/testing/controllers/002.php +++ b/user_guide_src/source/testing/controllers/002.php @@ -13,7 +13,7 @@ class ForumControllerTest extends CIUnitTestCase public function testShowCategories() { - $result = $this->withURI('http://example.com/categories') + $result = $this->withUri('http://example.com/categories') ->controller(ForumController::class) ->execute('showCategories'); diff --git a/user_guide_src/source/testing/controllers/009.php b/user_guide_src/source/testing/controllers/009.php index 711d947b4267..710402481076 100644 --- a/user_guide_src/source/testing/controllers/009.php +++ b/user_guide_src/source/testing/controllers/009.php @@ -1,5 +1,5 @@ withURI('http://example.com/forums/categories') +$results = $this->withUri('http://example.com/forums/categories') ->controller(\App\Controllers\ForumController::class) ->execute('showCategories');