Merge branch '7.5' into 8.4

sebastianbergmann · Oct 28, 2019 · 8635c10 · 8635c10
2 parents ffc9e37 + d703dcb
commit 8635c10
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Framework/Constraint/Count.php b/src/Framework/Constraint/Count.php
@@ -49,14 +49,14 @@ protected function matches($other): bool
      */
     protected function getCountOf($other): ?int
     {
-        if ($other instanceof \EmptyIterator) {
-            return 0;
-        }
-
         if ($other instanceof Countable || \is_array($other)) {
             return \count($other);
         }
 
+        if ($other instanceof \EmptyIterator) {
+            return 0;
+        }
+
         if ($other instanceof Traversable) {
             while ($other instanceof IteratorAggregate) {
                 $other = $other->getIterator();