From ca02d4c5a072be51a8dd61418806013245be54fe Mon Sep 17 00:00:00 2001 From: TavoNiievez Date: Sun, 16 Feb 2025 18:35:47 -0500 Subject: [PATCH] Add strict types --- src/Codeception/Lib/Connector/Yii2.php | 6 +++++- .../Lib/Connector/Yii2/ConnectionWatcher.php | 1 + .../Lib/Connector/Yii2/FixturesStore.php | 3 +++ src/Codeception/Lib/Connector/Yii2/Logger.php | 3 +++ src/Codeception/Lib/Connector/Yii2/TestMailer.php | 3 +++ .../Lib/Connector/Yii2/TransactionForcer.php | 1 + src/Codeception/Module/Yii2.php | 9 ++++++--- .../closeConnections/fixtures/EmptyFixture.php | 2 ++ .../closeConnections/functional/FixturesCest.php | 4 +++- .../functional/FixturesInBeforeCest.php | 4 +++- .../functional/NoFixturesCest.php | 4 +++- .../closeConnections/helpers/SqlliteHelper.php | 4 +++- .../functional/FixturesCest.php | 8 +++++--- .../functional/FixturesInBeforeCest.php | 8 +++++--- .../functional/ThirdCest.php | 8 +++++--- tests/cases/events/controllers/SiteController.php | 2 ++ tests/cases/events/functional/ResponseCest.php | 15 +++++++++------ .../locale-urls/controllers/SiteController.php | 2 ++ .../locale-urls/functional/LocaleUrlCest.php | 3 +++ .../mock-mailer/controllers/SiteController.php | 2 ++ .../mock-mailer/functional/MockMailerCest.php | 3 +++ .../controllers/UserController.php | 2 ++ .../functional/PageCest.php | 2 ++ tests/cases/simple/controllers/SiteController.php | 2 ++ tests/cases/simple/functional/SimpleCest.php | 3 +++ tests/cases/simple/helpers/DummyUser.php | 1 + tests/cases/simple/helpers/EmptyString.php | 1 + tests/cases/sqlite/fixtures/TestFixture.php | 3 +++ tests/cases/sqlite/functional/SqLiteCest.php | 9 ++++++--- 29 files changed, 92 insertions(+), 26 deletions(-) diff --git a/src/Codeception/Lib/Connector/Yii2.php b/src/Codeception/Lib/Connector/Yii2.php index 1a76275..890ab45 100644 --- a/src/Codeception/Lib/Connector/Yii2.php +++ b/src/Codeception/Lib/Connector/Yii2.php @@ -1,4 +1,7 @@ value; $value = $security->hashData(serialize($data), $validationKey); } + $expires = is_int($cookie->expire) ? (string)$cookie->expire : null; $c = new Cookie( $cookie->name, $value, - $cookie->expire, + $expires, $cookie->path, $cookie->domain, $cookie->secure, diff --git a/src/Codeception/Lib/Connector/Yii2/ConnectionWatcher.php b/src/Codeception/Lib/Connector/Yii2/ConnectionWatcher.php index 291c921..aa92f7f 100644 --- a/src/Codeception/Lib/Connector/Yii2/ConnectionWatcher.php +++ b/src/Codeception/Lib/Connector/Yii2/ConnectionWatcher.php @@ -1,5 +1,6 @@ assertNotEmpty($this->grabSentEmails(), 'emails were sent'); return; } - $this->assertEquals($num, count($this->grabSentEmails()), 'number of sent emails is equal to ' . $num); + $this->assertSame($num, count($this->grabSentEmails()), 'number of sent emails is equal to ' . $num); } /** @@ -757,7 +760,7 @@ public function dontSeeEmailIsSent(): void * seeEmailIsSent(); * $messages = $I->grabSentEmails(); - * $I->assertEquals('admin@site,com', $messages[0]->getTo()); + * $I->assertSame('admin@site,com', $messages[0]->getTo()); * ``` * * @part email @@ -780,7 +783,7 @@ public function grabSentEmails(): array * seeEmailIsSent(); * $message = $I->grabLastSentEmail(); - * $I->assertEquals('admin@site,com', $message->getTo()); + * $I->assertSame('admin@site,com', $message->getTo()); * ``` * @part email */ diff --git a/tests/cases/closeConnections/fixtures/EmptyFixture.php b/tests/cases/closeConnections/fixtures/EmptyFixture.php index c8aeae6..9006bb0 100644 --- a/tests/cases/closeConnections/fixtures/EmptyFixture.php +++ b/tests/cases/closeConnections/fixtures/EmptyFixture.php @@ -1,5 +1,7 @@ assertEquals(SqlliteHelper::connectionCount(), $example['count']); + $I->assertSame(SqlliteHelper::connectionCount(), $example['count']); } } \ No newline at end of file diff --git a/tests/cases/closeConnections/functional/FixturesInBeforeCest.php b/tests/cases/closeConnections/functional/FixturesInBeforeCest.php index 21de51d..711d587 100644 --- a/tests/cases/closeConnections/functional/FixturesInBeforeCest.php +++ b/tests/cases/closeConnections/functional/FixturesInBeforeCest.php @@ -1,5 +1,7 @@ assertEquals(SqlliteHelper::connectionCount(), $example['count']); + $I->assertSame(SqlliteHelper::connectionCount(), $example['count']); } } \ No newline at end of file diff --git a/tests/cases/closeConnections/functional/NoFixturesCest.php b/tests/cases/closeConnections/functional/NoFixturesCest.php index 245be50..2ff5b40 100644 --- a/tests/cases/closeConnections/functional/NoFixturesCest.php +++ b/tests/cases/closeConnections/functional/NoFixturesCest.php @@ -1,5 +1,7 @@ assertEquals(SqlliteHelper::connectionCount(), $example['count']); + $I->assertSame(SqlliteHelper::connectionCount(), $example['count']); } } \ No newline at end of file diff --git a/tests/cases/closeConnections/helpers/SqlliteHelper.php b/tests/cases/closeConnections/helpers/SqlliteHelper.php index cf8c460..15f263a 100644 --- a/tests/cases/closeConnections/helpers/SqlliteHelper.php +++ b/tests/cases/closeConnections/helpers/SqlliteHelper.php @@ -1,5 +1,7 @@ assertEquals(0, $count); + $I->assertSame(0, $count); } public function NoConnections2(FunctionalTester $I) { $count = SqlliteHelper::connectionCount(); - $I->assertEquals(0, $count); + $I->assertSame(0, $count); } public function NoConnections3(FunctionalTester $I) { $count = SqlliteHelper::connectionCount(); - $I->assertEquals(0, $count); + $I->assertSame(0, $count); } } \ No newline at end of file diff --git a/tests/cases/closeConnectionsNoCleanup/functional/FixturesInBeforeCest.php b/tests/cases/closeConnectionsNoCleanup/functional/FixturesInBeforeCest.php index acf6031..bdf0241 100644 --- a/tests/cases/closeConnectionsNoCleanup/functional/FixturesInBeforeCest.php +++ b/tests/cases/closeConnectionsNoCleanup/functional/FixturesInBeforeCest.php @@ -1,5 +1,7 @@ assertEquals(1, $count); + $I->assertSame(1, $count); } public function OnlyOneConnection2(FunctionalTester $I) { $count = SqlliteHelper::connectionCount(); - $I->assertEquals(1, $count); + $I->assertSame(1, $count); } public function OnlyOneConnection3(FunctionalTester $I) { $count = SqlliteHelper::connectionCount(); - $I->assertEquals(1, $count); + $I->assertSame(1, $count); } } \ No newline at end of file diff --git a/tests/cases/closeConnectionsNoCleanup/functional/ThirdCest.php b/tests/cases/closeConnectionsNoCleanup/functional/ThirdCest.php index 0cbc42e..1a9caa2 100644 --- a/tests/cases/closeConnectionsNoCleanup/functional/ThirdCest.php +++ b/tests/cases/closeConnectionsNoCleanup/functional/ThirdCest.php @@ -1,5 +1,7 @@ assertEquals(0, $count); + $I->assertSame(0, $count); } public function OnlyOneConnection2(FunctionalTester $I) @@ -23,7 +25,7 @@ public function OnlyOneConnection2(FunctionalTester $I) ]); $count = SqlliteHelper::connectionCount(); - $I->assertEquals(1, $count); + $I->assertSame(1, $count); } public function OnlyOneConnection3(FunctionalTester $I) @@ -35,6 +37,6 @@ public function OnlyOneConnection3(FunctionalTester $I) ]); $count = SqlliteHelper::connectionCount(); - $I->assertEquals(1, $count); + $I->assertSame(1, $count); } } \ No newline at end of file diff --git a/tests/cases/events/controllers/SiteController.php b/tests/cases/events/controllers/SiteController.php index abcc66a..9c640e7 100644 --- a/tests/cases/events/controllers/SiteController.php +++ b/tests/cases/events/controllers/SiteController.php @@ -1,5 +1,7 @@ assertEmpty($sources); $I->amOnRoute('/'); - $I->assertEquals(['config', 'bootstrap'], $sources); + $I->assertSame(['config', 'bootstrap'], $sources); $sources = []; $I->amOnRoute('/'); - $I->assertEquals(['config', 'bootstrap'], $sources); + $I->assertSame(['config', 'bootstrap'], $sources); } @@ -41,13 +44,13 @@ public function testAfterSendWithRecreate(FunctionalTester $I, \Codeception\Modu }); $I->assertEmpty($sources); $I->amOnRoute('/'); - $I->assertEquals(['config', 'bootstrap'], $sources); + $I->assertSame(['config', 'bootstrap'], $sources); $sources = []; $I->amOnRoute('/'); // The module should fall back to the CLEAN_CLEAR method and keep event handlers intact. - $I->assertEquals(['config', 'bootstrap'], $sources); + $I->assertSame(['config', 'bootstrap'], $sources); } @@ -70,14 +73,14 @@ public function testAfterSendWithForcedRecreate(FunctionalTester $I, \Codeceptio // We recreated the response component, since it has an event handler in its config // that event handler will still work. - $I->assertEquals(['config'], $sources); + $I->assertSame(['config'], $sources); $sources = []; $I->amOnRoute('/'); // We recreated the response component, since it has an event handler in its config // that event handler will still work. - $I->assertEquals(['config'], $sources); + $I->assertSame(['config'], $sources); } } \ No newline at end of file diff --git a/tests/cases/locale-urls/controllers/SiteController.php b/tests/cases/locale-urls/controllers/SiteController.php index d68f82a..c26c1bf 100644 --- a/tests/cases/locale-urls/controllers/SiteController.php +++ b/tests/cases/locale-urls/controllers/SiteController.php @@ -1,5 +1,7 @@ grabComponent('db1'); - $I->assertEquals(['test'], $db1->schema->getTableNames('', true)); + $I->assertSame(['test'], $db1->schema->getTableNames('', true)); /** @var Connection $db21 */ $db21 = $I->grabComponent('db21'); - $I->assertEquals(['test'], $db21->schema->getTableNames('', true)); + $I->assertSame(['test'], $db21->schema->getTableNames('', true)); /** @var Connection $db22 */ $db22 = $I->grabComponent('db22'); - $I->assertEquals(['test'], $db22->schema->getTableNames('', true)); + $I->assertSame(['test'], $db22->schema->getTableNames('', true)); } public function testTransaction(FunctionalTester $I)