Code quality improvements

This commit is contained in:
Nuno Maduro
2022-09-16 11:27:17 +01:00
parent e9564febaf
commit 45011ebd14
42 changed files with 266 additions and 278 deletions

View File

@ -35,7 +35,7 @@ final class HigherOrderExpectation
* @param Expectation<TOriginalValue> $original
* @param TValue $value
*/
public function __construct(private Expectation $original, mixed $value)
public function __construct(private readonly Expectation $original, mixed $value)
{
$this->expectation = $this->expect($value);
}
@ -45,7 +45,7 @@ final class HigherOrderExpectation
*
* @return self<TOriginalValue, TValue>
*/
public function not(): HigherOrderExpectation
public function not(): self
{
$this->opposite = ! $this->opposite;
@ -144,7 +144,14 @@ final class HigherOrderExpectation
*/
private function expectationHasMethod(string $name): bool
{
return method_exists($this->original, $name) || $this->original::hasMethod($name) || $this->original::hasExtend($name);
if (method_exists($this->original, $name)) {
return true;
}
if ($this->original::hasMethod($name)) {
return true;
}
return $this->original::hasExtend($name);
}
/**