Tweak errors

Author: jahidulpabelislam

src/CronLinter.php

@@ -113,8 +113,9 @@ function ($v) {
             $values = explode(",", $data["values"]);
             $hasMultipleValues = count($values) > 1;
             foreach ($values as $value) {
-                $valueErrorPrefix = $hasMultipleValues ? "$errorPrefix {$name}[$offset]:" : "$errorPrefix $name:";
-                $rangeErrorName = $hasMultipleValues ? "{$name}[$offset]" : $name;
+                $errorIndex = $hasMultipleValues ? "{$name}[$offset]" : $name;
+                $valueErrorPrefix = "$errorPrefix $errorIndex:";
+                $rangeErrorPrefix = "Line $lineNo has invalid range for $errorIndex:";
 
                 $steppedValues = explode("/", $value);
                 if (count($steppedValues) > 2) {
@@ -142,7 +143,7 @@ function ($v) {
                         $rangeValues[0] = "-" . $rangeValues[0];
                     }
                     if (count($rangeValues) > 2) {
-                        $this->errors[] = "Line $lineNo has too many values for the range for $rangeErrorName: $steppedValue";
+                        $this->errors[] = "$rangeErrorPrefix $steppedValue (too many values)";
                         continue;
                     }
 
@@ -160,11 +161,11 @@ function ($v) {
                             $sorted = $rangeValues;
                             sort($sorted);
                             if ($sorted !== $rangeValues) {
-                                $this->errors[] = "Line $lineNo has invalid range for $rangeErrorName: $steppedValue (values must be ordered)";
+                                $this->errors[] = "$rangeErrorPrefix $steppedValue (values must be ordered)";
                             }
                         } else {
                             $badValues = implode("-", array_diff($rangeValues, $numericalValues));
-                            $this->errors[] = "Line $lineNo has invalid range for $rangeErrorName: $badValues (values in range must be numeric)";
+                            $this->errors[] = "$rangeErrorPrefix $badValues (values must be numeric)";
                         }
                     }
                 }

tests/LinterTest.php

@@ -70,10 +70,10 @@ public static function invalidProvider(): array {
             ["60 * * * * php test.php", ["Line 1 has invalid value for Minute: 60"]],
             ["59,69 * * * * php test.php", ["Line 1 has invalid value for Minute[1]: 69"]],
             ["60,65 * * * * php test.php", ["Line 1 has invalid value for Minute[0]: 60", "Line 1 has invalid value for Minute[1]: 65"]],
-            ["15-30-45 * * * * php test.php", ["Line 1 has too many values for the range for Minute: 15-30-45"]],
+            ["15-30-45 * * * * php test.php", ["Line 1 has invalid range for Minute: 15-30-45 (too many values)"]],
             ["*/60 * * * * php test.php", ["Line 1 has invalid value for Minute: 60"]],
             ["55-61/2 * * * * php test.php", ["Line 1 has invalid value for Minute: 61"]],
-            ["55-61-63/2 * * * * php test.php", ["Line 1 has too many values for the range for Minute: 55-61-63"]],
+            ["55-61-63/2 * * * * php test.php", ["Line 1 has invalid range for Minute: 55-61-63 (too many values)"]],
             ["61-62/2 * * * * php test.php", ["Line 1 has invalid value for Minute: 61", "Line 1 has invalid value for Minute: 62"]],
             ["1/2 * * * * php test.php", ["Line 1 has invalid value for Minute: 1 (only wildcard * or range supported)"]],
             ["*/1/2 * * * * php test.php", ["Line 1 has too many step values for Minute: */1/2"]],
@@ -88,7 +88,7 @@ public static function invalidProvider(): array {
             ["* 24 * * * php test.php", ["Line 1 has invalid value for Hour: 24"]],
             ["* 12,24 * * * php test.php", ["Line 1 has invalid value for Hour[1]: 24"]],
             ["* 24,32 * * * php test.php", ["Line 1 has invalid value for Hour[0]: 24", "Line 1 has invalid value for Hour[1]: 32"]],
-            ["* 6-12-18 * * * php test.php", ["Line 1 has too many values for the range for Hour: 6-12-18"]],
+            ["* 6-12-18 * * * php test.php", ["Line 1 has invalid range for Hour: 6-12-18 (too many values)"]],
             ["* */40 * * * php test.php", ["Line 1 has invalid value for Hour: 40"]],
             ["* 23-24/2 * * * php test.php", ["Line 1 has invalid value for Hour: 24"]],
             ["* 24-26/2 * * * php test.php", ["Line 1 has invalid value for Hour: 24","Line 1 has invalid value for Hour: 26"]],
@@ -104,7 +104,7 @@ public static function invalidProvider(): array {
             ["* * 32 * * php test.php", ["Line 1 has invalid value for Day of month: 32"]],
             ["* * 28,35 * * php test.php", ["Line 1 has invalid value for Day of month[1]: 35"]],
             ["* * 32,35 * * php test.php", ["Line 1 has invalid value for Day of month[0]: 32", "Line 1 has invalid value for Day of month[1]: 35"]],
-            ["* * 7-14-21 * * php test.php", ["Line 1 has too many values for the range for Day of month: 7-14-21"]],
+            ["* * 7-14-21 * * php test.php", ["Line 1 has invalid range for Day of month: 7-14-21 (too many values)"]],
             ["* * */32 * * php test.php", ["Line 1 has invalid value for Day of month: 32"]],
             ["* * 21-35/2 * * php test.php", ["Line 1 has invalid value for Day of month: 35"]],
             ["* * 32-35/2 * * php test.php", ["Line 1 has invalid value for Day of month: 32", "Line 1 has invalid value for Day of month: 35"]],
@@ -119,7 +119,7 @@ public static function invalidProvider(): array {
             ["* * * 13 * php test.php", ["Line 1 has invalid value for Month: 13"]],
             ["* * * 3,13 * php test.php", ["Line 1 has invalid value for Month[1]: 13"]],
             ["* * * 13,14 * php test.php", ["Line 1 has invalid value for Month[0]: 13", "Line 1 has invalid value for Month[1]: 14"]],
-            ["* * * 3-6-9 * php test.php", ["Line 1 has too many values for the range for Month: 3-6-9"]],
+            ["* * * 3-6-9 * php test.php", ["Line 1 has invalid range for Month: 3-6-9 (too many values)"]],
             ["* * * */24 * php test.php", ["Line 1 has invalid value for Month: 24"]],
             ["* * * 8-16/2 * php test.php", ["Line 1 has invalid value for Month: 16"]],
             ["* * * 14-16/2 * php test.php", ["Line 1 has invalid value for Month: 14", "Line 1 has invalid value for Month: 16"]],
@@ -128,14 +128,14 @@ public static function invalidProvider(): array {
             ["* * * 12-0 * php test.php", ["Line 1 has invalid value for Month: 0"]],
             ["* * * 12-1 * php test.php", ["Line 1 has invalid range for Month: 12-1 (values must be ordered)"]],
             ["* * * june * php test.php", ["Line 1 has invalid value for Month: june"]],
-            ["* * * mar-feb * php test.php", ["Line 1 has invalid range for Month: mar-feb (values in range must be numeric)"]],
+            ["* * * mar-feb * php test.php", ["Line 1 has invalid range for Month: mar-feb (values must be numeric)"]],
 
             ["* * * * -4 php test.php", ["Line 1 has invalid value for Day of week: -4"]],
             ["* * * * -3-5 php test.php", ["Line 1 has invalid value for Day of week: -3"]],
             ["* * * * 7 php test.php", ["Line 1 has invalid value for Day of week: 7"]],
             ["* * * * 4,8 php test.php", ["Line 1 has invalid value for Day of week[1]: 8"]],
             ["* * * * 7,8 php test.php", ["Line 1 has invalid value for Day of week[0]: 7", "Line 1 has invalid value for Day of week[1]: 8"]],
-            ["* * * * 2-4-6 php test.php", ["Line 1 has too many values for the range for Day of week: 2-4-6"]],
+            ["* * * * 2-4-6 php test.php", ["Line 1 has invalid range for Day of week: 2-4-6 (too many values)"]],
             ["* * * * */7 php test.php", ["Line 1 has invalid value for Day of week: 7"]],
             ["* * * * 4-8/2 php test.php", ["Line 1 has invalid value for Day of week: 8"]],
             ["* * * * 8-10/2 php test.php", ["Line 1 has invalid value for Day of week: 8", "Line 1 has invalid value for Day of week: 10"]],
@@ -144,7 +144,7 @@ public static function invalidProvider(): array {
             ["* * * * thurs php test.php", ["Line 1 has invalid value for Day of week: thurs"]],
             ["* * * * 6-0 php test.php", ["Line 1 has invalid range for Day of week: 6-0 (values must be ordered)"]],
             ["* * * * 5-2 php test.php", ["Line 1 has invalid range for Day of week: 5-2 (values must be ordered)"]],
-            ["* * * * fri-mon php test.php", ["Line 1 has invalid range for Day of week: fri-mon (values in range must be numeric)"]],
+            ["* * * * fri-mon php test.php", ["Line 1 has invalid range for Day of week: fri-mon (values must be numeric)"]],
 
             ["* * * 18 45 php test.php", ["Line 1 has invalid value for Month: 18", "Line 1 has invalid value for Day of week: 45"]],
         ];