diff --git a/src/Mixins/Expectation.php b/src/Mixins/Expectation.php index f802bc11..3a20c672 100644 --- a/src/Mixins/Expectation.php +++ b/src/Mixins/Expectation.php @@ -780,17 +780,16 @@ final class Expectation } foreach ($array as $key => $value) { + $message = ''; Assert::assertArrayHasKey($key, $valueAsArray, $message); - if ($message === '') { - $message = sprintf( - 'Failed asserting that an array has a key %s with the value %s.', - $this->export($key), - $this->export($valueAsArray[$key]), - ); - } + $second_message = $message !== '' ? $message : sprintf( + 'Failed asserting that an array has a key %s with the value %s.', + $this->export($key), + $this->export($valueAsArray[$key]), + ); - Assert::assertEquals($value, $valueAsArray[$key], $message); + Assert::assertEquals($value, $valueAsArray[$key], $second_message); } return $this; @@ -815,15 +814,14 @@ final class Expectation /* @phpstan-ignore-next-line */ $propertyValue = $this->value->{$property}; - if ($message === '') { - $message = sprintf( + $second_message = $message !== '' ? $message : sprintf( 'Failed asserting that an object has a property %s with the value %s.', $this->export($property), $this->export($propertyValue), ); } - Assert::assertEquals($value, $propertyValue, $message); + Assert::assertEquals($value, $propertyValue, $second_message); } return $this;