Code quality improvements

src/Expectations/EachExpectation.php

@@ -23,7 +23,7 @@ final class EachExpectation
      *
      * @param  Expectation<TValue>  $original
      */
-    public function __construct(private Expectation $original)
+    public function __construct(private readonly Expectation $original)
     {
     }
 
@@ -45,7 +45,7 @@ final class EachExpectation
      *
      * @return self<TValue>
      */
-    public function not(): EachExpectation
+    public function not(): self
     {
         $this->opposite = true;
 
@@ -58,7 +58,7 @@ final class EachExpectation
      * @param  array<int|string, mixed>  $arguments
      * @return self<TValue>
      */
-    public function __call(string $name, array $arguments): EachExpectation
+    public function __call(string $name, array $arguments): self
     {
         foreach ($this->original->value as $item) {
             /* @phpstan-ignore-next-line */
@@ -75,7 +75,7 @@ final class EachExpectation
      *
      * @return self<TValue>
      */
-    public function __get(string $name): EachExpectation
+    public function __get(string $name): self
     {
         /* @phpstan-ignore-next-line */
         return $this->$name();

src/Expectations/HigherOrderExpectation.php

@@ -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);
     }
 
     /**

src/Expectations/OppositeExpectation.php

@@ -23,7 +23,7 @@ final class OppositeExpectation
      *
      * @param  Expectation<TValue>  $original
      */
-    public function __construct(private Expectation $original)
+    public function __construct(private readonly Expectation $original)
     {
     }