Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
kenjis committed Feb 4, 2023
2 parents 3221b57 + f7ab736 commit 772ba5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"phpunit/phpcov": "^8.2",
"phpunit/phpunit": "^9.1",
"predis/predis": "^1.1 || ^2.0",
"rector/rector": "0.15.10",
"rector/rector": "0.15.11",
"vimeo/psalm": "^5.0"
},
"suggest": {
Expand Down
4 changes: 2 additions & 2 deletions tests/system/Entity/EntityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ public function testCastTimestamp()
public function testCastTimestampException()
{
$this->expectException(CastException::class);
$this->expectErrorMessage('Type casting "timestamp" expects a correct timestamp.');
$this->expectExceptionMessage('Type casting "timestamp" expects a correct timestamp.');

$entity = $this->getCastEntity();
$entity->ninth = 'some string';
Expand Down Expand Up @@ -725,7 +725,7 @@ public function testCustomCast()
public function testCustomCastException()
{
$this->expectException(CastException::class);
$this->expectErrorMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class');
$this->expectExceptionMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class');

$entity = $this->getCustomCastEntity();

Expand Down

0 comments on commit 772ba5f

Please sign in to comment.