Refactor

Author: sebastianbergmann

src/cli/ExecuteCommand.php

@@ -29,7 +29,19 @@ public function run(Arguments $arguments): int
             return 1;
         }
 
-        $filter = new Filter;
+        if (!$arguments->reportConfigured()) {
+            print 'No code coverage report configured' . PHP_EOL;
+
+            return 1;
+        }
+
+        $filter = $this->createFilter($arguments);
+
+        if ($filter->isEmpty()) {
+            print 'No list of files to be included in code coverage configured' . PHP_EOL;
+
+            return 1;
+        }
 
         try {
             if ($arguments->pathCoverage()) {
@@ -45,20 +57,8 @@ public function run(Arguments $arguments): int
             return 1;
         }
 
+        $this->configureCodeCoverageCollection($coverage, $arguments);
         $this->handleConfiguration($coverage, $arguments);
-        $this->handleFilter($coverage, $arguments);
-
-        if ($filter->isEmpty()) {
-            print 'No list of files to be included in code coverage configured' . PHP_EOL;
-
-            return 1;
-        }
-
-        if (!$arguments->reportConfigured()) {
-            print 'No code coverage report configured' . PHP_EOL;
-
-            return 1;
-        }
 
         $coverage->start('phpcov');
 
@@ -72,7 +72,22 @@ public function run(Arguments $arguments): int
         return 0;
     }
 
-    private function handleFilter(CodeCoverage $coverage, Arguments $arguments): void
+    private function createFilter(Arguments $arguments): Filter
+    {
+        $filter = new Filter;
+
+        foreach ($arguments->include() as $item) {
+            if (is_dir($item)) {
+                $filter->includeDirectory($item);
+            } elseif (is_file($item)) {
+                $filter->includeFile($item);
+            }
+        }
+
+        return $filter;
+    }
+
+    private function configureCodeCoverageCollection(CodeCoverage $coverage, Arguments $arguments): void
     {
         if ($arguments->addUncovered()) {
             $coverage->includeUncoveredFiles();
@@ -85,13 +100,5 @@ private function handleFilter(CodeCoverage $coverage, Arguments $arguments): voi
         } else {
             $coverage->doNotProcessUncoveredFiles();
         }
-
-        foreach ($arguments->include() as $item) {
-            if (is_dir($item)) {
-                $coverage->filter()->includeDirectory($item);
-            } elseif (is_file($item)) {
-                $coverage->filter()->includeFile($item);
-            }
-        }
     }
 }

tests/end-to-end/execute/valid-script-argument-without-include.phpt

@@ -1,5 +1,5 @@
 --TEST--
-phpcov execute ../../fixture/test.php
+phpcov execute --text /tmp/file ../../fixture/test.php
 --INI--
 xdebug.overload_var_dump=0
 --SKIPIF--
@@ -25,7 +25,9 @@ try {
 require __DIR__ . '/../../../vendor/autoload.php';
 
 $_SERVER['argv'][1] = 'execute';
-$_SERVER['argv'][2] = __DIR__ . '/../../fixture/test.php';
+$_SERVER['argv'][2] = '--text';
+$_SERVER['argv'][3] = '/tmp/file';
+$_SERVER['argv'][4] = __DIR__ . '/../../fixture/test.php';
 
 var_dump((new SebastianBergmann\PHPCOV\Application)->run($_SERVER['argv']));
 --EXPECTF--