fix: append extension report

marcocesarato · Dec 27, 2020 · fc2630f · fc2630f
1 parent 1117db2
commit fc2630f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/Scanner.php b/src/Scanner.php
@@ -443,11 +443,6 @@ private function arguments($args = null)
             }
         }
 
-        // Report format
-        if (isset(self::$argv['report-format']) && !empty(self::$argv['report-format'])) {
-            self::setReportFormat(self::$argv['report-format']);
-        }
-
         // Offset
         self::setOffset(0);
         if (isset(self::$argv['offset']) && is_numeric(self::$argv['offset'])) {
@@ -479,6 +474,19 @@ private function arguments($args = null)
             self::setPathReport(self::$argv['path-report']);
         }
 
+        // Report format
+        if (isset(self::$argv['report-format']) && !empty(self::$argv['report-format'])) {
+            self::setReportFormat(self::$argv['report-format']);
+        }
+
+        if (in_array(self::$reportFormat, ['html', 'htm'])) {
+            if (!preg_match('/[\S][.](html|htm)$/', self::$pathReport)) {
+                self::$pathReport .= '.html';
+            }
+        } elseif (!preg_match('/[\S][.](logs|log|txt)$/', self::$pathReport)) {
+            self::$pathReport .= '.log';
+        }
+
         // Path logs
         if (isset(self::$argv['path-logs']) && !empty(self::$argv['path-logs'])) {
             self::setPathLogs(self::$argv['path-logs']);
@@ -1890,14 +1898,6 @@ public static function setReportFormat($reportFormat)
             self::$reportFormat = $reportFormat;
         }
 
-        if (in_array(self::$reportFormat, ['html', 'htm'])) {
-            if (!preg_match('/[\S][.](html|htm)$/', self::$pathReport)) {
-                self::$pathReport .= '.html';
-            }
-        } elseif (!preg_match('/[\S][.](logs|log|txt)$/', self::$pathReport)) {
-            self::$pathReport .= '.log';
-        }
-
         return new static();
     }