more cleanup; add COMMA spelling correction

Author: TheDigitalOrchard

src/Galbar/JsonPath/Expression/Comparison.php

@@ -30,15 +30,15 @@ public static function evaluate(&$root, &$partial, $leftExpr, $comparator, $righ
         }
         if ($comparator === Language\Token::COMP_EQ) {
             return $left === $right;
-        } else if ($comparator === Language\Token::COMP_NEQ) {
+        } elseif ($comparator === Language\Token::COMP_NEQ) {
             return $left !== $right;
-        } else if ($comparator === Language\Token::COMP_LT) {
+        } elseif ($comparator === Language\Token::COMP_LT) {
             return $left < $right;
-        } else if ($comparator === Language\Token::COMP_GT) {
+        } elseif ($comparator === Language\Token::COMP_GT) {
             return $left > $right;
-        } else if ($comparator === Language\Token::COMP_LTE) {
+        } elseif ($comparator === Language\Token::COMP_LTE) {
             return $left <= $right;
-        } else if ($comparator === Language\Token::COMP_GTE) {
+        } elseif ($comparator === Language\Token::COMP_GTE) {
             return $left >= $right;
         } else { // $comparator === Language\Token::COMP_RE_MATCH
             if (is_string($right) && is_string($left)) {

src/Galbar/JsonPath/Expression/Value.php

@@ -26,15 +26,15 @@ public static function evaluate(&$root, &$partial, $expression)
     {
         if ($expression === Language\Token::VAL_NULL) {
             return null;
-        } else if ($expression === Language\Token::VAL_TRUE) {
+        } elseif ($expression === Language\Token::VAL_TRUE) {
             return true;
-        } else if ($expression === Language\Token::VAL_FALSE) {
+        } elseif ($expression === Language\Token::VAL_FALSE) {
             return false;
-        } else if (is_numeric($expression)) {
+        } elseif (is_numeric($expression)) {
             return floatval($expression);
-        } else if (preg_match(Language\Regex::EXPR_STRING, $expression)) {
+        } elseif (preg_match(Language\Regex::EXPR_STRING, $expression)) {
             return substr($expression, 1, strlen($expression) - 2);
-        } else if (preg_match(Language\Regex::EXPR_REGEX, $expression)) {
+        } elseif (preg_match(Language\Regex::EXPR_REGEX, $expression)) {
             return $expression;
         } else {
             $match = array();
@@ -54,8 +54,7 @@ public static function evaluate(&$root, &$partial, $expression)
                 if ($length) {
                     if (is_array($result[0])) {
                         return (float) count($result[0]);
-                    }
-                    if (is_string($result[0])) {
+                    } elseif (is_string($result[0])) {
                         return (float) strlen($result[0]);
                     }
                     return false;

src/Galbar/JsonPath/InvalidJsonPathException.php

@@ -35,6 +35,6 @@ class InvalidJsonPathException extends \Exception
      */
     public function __construct($token)
     {
-        parent::__construct("Error in JSONPath near '" . $token . "'", 0, null);
+        parent::__construct("Error in JSONPath near '{$token}'", 0, null);
     }
 }

src/Galbar/JsonPath/Language/Token.php

@@ -28,6 +28,7 @@ class Token
     const EXPRESSION_END = ')';
     const ALL = '*';
     const COMA = ',';
+    const COMMA = ',';
     const COLON = ':';
     const COMP_EQ = '==';
     const COMP_NEQ = '!=';

src/Galbar/JsonPath/Operation/SelectChildren.php

@@ -49,7 +49,7 @@ function($x) { return intval(trim($x)); },
         } else if (preg_match(Language\Regex::CHILD_NAME_LIST, $contents, $match)) {
             $names = array_map(
                 function($x) { return trim($x, " \t\n\r\0\x0B'\""); },
-                explode(Language\Token::COMA, $contents)
+                explode(Language\Token::COMMA, $contents)
             );
             if (count($names) > 1) {
                 $hasDiverged = true;

src/Galbar/Utilities/ArraySlice.php

@@ -61,7 +61,7 @@ private static function adjustEndpoint($length, $endpoint, $step)
             if ($endpoint < 0) {
                 $endpoint = ($step < 0 ? -1 : 0);
             }
-        } else if ($endpoint >= $length) {
+        } elseif ($endpoint >= $length) {
             $endpoint = ($step < 0 ? $length - 1 : $length);
         }
         return $endpoint;
@@ -71,7 +71,7 @@ private static function adjustSlice($length, &$start, &$stop, &$step)
     {
         if ($step === null) {
             $step = 1;
-        } else if ($step === 0) {
+        } elseif ($step === 0) {
             throw new \Exception("Step cannot be 0");
         }