Fix issue identified by Psalm

sebastianbergmann · Mar 10, 2021 · 2bc4a05 · 2bc4a05
1 parent 6bd65c3
commit 2bc4a05
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -152,10 +152,6 @@
       <code>static::assertThat($haystack, $constraint, $message)</code>
       <code>static::assertThat($haystack, $constraint, $message)</code>
     </MissingThrowsDocblock>
-    <PossiblyInvalidArgument occurrences="2">
-      <code>$expected</code>
-      <code>$expected</code>
-    </PossiblyInvalidArgument>
   </file>
   <file src="src/Framework/Assert/Functions.php">
     <DeprecatedClass occurrences="3">

diff --git a/src/Framework/Constraint/Cardinality/Count.php b/src/Framework/Constraint/Cardinality/Count.php
@@ -10,10 +10,9 @@
 namespace PHPUnit\Framework\Constraint;
 
 use function count;
-use function is_array;
+use function is_countable;
 use function iterator_count;
 use function sprintf;
-use Countable;
 use EmptyIterator;
 use Generator;
 use Iterator;
@@ -57,7 +56,7 @@ protected function matches($other): bool
      */
     protected function getCountOf($other): ?int
     {
-        if ($other instanceof Countable || is_array($other)) {
+        if (is_countable($other)) {
             return count($other);
         }
 

diff --git a/src/Framework/Constraint/Cardinality/SameSize.php b/src/Framework/Constraint/Cardinality/SameSize.php
@@ -14,7 +14,10 @@
  */
 final class SameSize extends Count
 {
-    public function __construct(iterable $expected)
+    /**
+     * @psalm-param \Countable|iterable $expected
+     */
+    public function __construct($expected)
     {
         parent::__construct((int) $this->getCountOf($expected));
     }