Merge pull request #8 from php-etl/fix-ci-and-tests

improve MSI score
php-etl · Jun 23, 2023 · 3d43379 · 3d43379
2 parents 0c89836 + 6fdb904
commit 3d43379
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 31 deletions.
diff --git a/infection.json.dist b/infection.json.dist
@@ -0,0 +1,25 @@
+{
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "infection/infection.log",
+        "summary": "infection/summary.log",
+        "json": "infection/infection-log.json",
+        "perMutator": "infection/per-mutator.md",
+        "html": "infection/infection.html"
+    },
+    "phpUnit": {
+        "configDir": "."
+    },
+    "mutators": {
+        "@default": true
+    },
+    "testFramework":"phpunit",
+    "initialTestsPhpOptions": "-d zend_extension=xdebug -d xdebug.mode=coverage",
+    "minMsi": 50,
+    "minCoveredMsi": 70
+}
diff --git a/src/Constraint/Pipeline/IteratesLike.php b/src/Constraint/Pipeline/IteratesLike.php
@@ -30,22 +30,18 @@ private function asIterator(iterable $iterable): \Iterator
         if (\is_array($iterable)) {
             return new \ArrayIterator($iterable);
         }
-        if (!$iterable instanceof \Iterator && $iterable instanceof \Traversable) {
-            return new \IteratorIterator($iterable);
-        }
         if ($iterable instanceof \Iterator) {
             return $iterable;
         }
-
-        throw new \InvalidArgumentException();
+        return new \IteratorIterator($iterable);
     }
 
     public function matches($other): bool
     {
         $both = new \MultipleIterator(\MultipleIterator::MIT_NEED_ANY);
 
         $both->attachIterator($this->asIterator($this->expected));
-        $both->attachIterator($this->asIterator($other));
+        $both->attachIterator($iterator = $this->asIterator($other));
 
         $index = 0;
         foreach ($both as [$expectedItem, $actualItem]) {
@@ -54,7 +50,7 @@ public function matches($other): bool
             true !== $constraint->evaluate($actualItem, sprintf('Values of Iteration #%d', $index));
         }
 
-        return true;
+        return !$iterator->valid();
     }
 
     protected function failureDescription($other): string

diff --git a/src/Constraint/Pipeline/PipelineExtractsLike.php b/src/Constraint/Pipeline/PipelineExtractsLike.php
@@ -35,14 +35,10 @@ private function asIterator(iterable $iterable): \Iterator
         if (\is_array($iterable)) {
             return new \ArrayIterator($iterable);
         }
-        if (!$iterable instanceof \Iterator && $iterable instanceof \Traversable) {
-            return new \IteratorIterator($iterable);
-        }
         if ($iterable instanceof \Iterator) {
             return $iterable;
         }
-
-        throw new \InvalidArgumentException();
+        return new \IteratorIterator($iterable);
     }
 
     /** @return \Generator<mixed, Type|null, Type|null, void> */
@@ -82,7 +78,7 @@ public function matches($other): bool
             true !== $constraint->evaluate($actualItem, sprintf('Values of Iteration #%d', $index));
         }
 
-        return true;
+        return !$iterator->valid();
     }
 
     protected function failureDescription($other): string

diff --git a/src/Constraint/Pipeline/PipelineLoadsLike.php b/src/Constraint/Pipeline/PipelineLoadsLike.php
@@ -40,14 +40,10 @@ private function asIterator(iterable $iterable): \Iterator
         if (\is_array($iterable)) {
             return new \ArrayIterator($iterable);
         }
-        if (!$iterable instanceof \Iterator && $iterable instanceof \Traversable) {
-            return new \IteratorIterator($iterable);
-        }
         if ($iterable instanceof \Iterator) {
             return $iterable;
         }
-
-        throw new \InvalidArgumentException();
+        return new \IteratorIterator($iterable);
     }
 
     public function matches($other): bool
@@ -102,7 +98,7 @@ public function matches($other): bool
             true !== $constraint->evaluate($actualItem, sprintf('Values of Iteration #%d', $index));
         }
 
-        return true;
+        return !$iterator->valid();
     }
 
     protected function failureDescription($other): string

diff --git a/src/Constraint/Pipeline/PipelineTransformsLike.php b/src/Constraint/Pipeline/PipelineTransformsLike.php
@@ -40,14 +40,10 @@ private function asIterator(iterable $iterable): \Iterator
         if (\is_array($iterable)) {
             return new \ArrayIterator($iterable);
         }
-        if (!$iterable instanceof \Iterator && $iterable instanceof \Traversable) {
-            return new \IteratorIterator($iterable);
-        }
         if ($iterable instanceof \Iterator) {
             return $iterable;
         }
-
-        throw new \InvalidArgumentException();
+        return new \IteratorIterator($iterable);
     }
 
     public function matches($other): bool
@@ -102,7 +98,7 @@ public function matches($other): bool
             true !== $constraint->evaluate($actualItem, sprintf('Values of Iteration #%d', $index));
         }
 
-        return true;
+        return !$iterator->valid();
     }
 
     protected function failureDescription($other): string

diff --git a/src/Constraint/Pipeline/PipelineWritesFile.php b/src/Constraint/Pipeline/PipelineWritesFile.php
@@ -35,14 +35,10 @@ private function asIterator(iterable $iterable): \Iterator
         if (\is_array($iterable)) {
             return new \ArrayIterator($iterable);
         }
-        if (!$iterable instanceof \Iterator && $iterable instanceof \Traversable) {
-            return new \IteratorIterator($iterable);
-        }
         if ($iterable instanceof \Iterator) {
             return $iterable;
         }
-
-        throw new \InvalidArgumentException();
+        return new \IteratorIterator($iterable);
     }
 
     public function matches($other): bool
@@ -90,7 +86,7 @@ public function matches($other): bool
         $constraint = new FileExists();
         $constraint->evaluate($this->expected);
 
-        return true;
+        return !$iterator->valid();
     }
 
     protected function failureDescription($other): string