Ensured JSON paths are strings, clean-up

Author: jaaufauvre

src/Developer/Json/JsonPath.php

@@ -23,8 +23,8 @@ private function __construct() {}
      * @throws \InvalidArgumentException
      */
     static function normalizePath($path) {
-        if (empty($path)) {
-            throw new \InvalidArgumentException('Empty JSON path!');
+        if (empty($path) || !is_string($path)) {
+            throw new \InvalidArgumentException('JSON path must be a non-empty string!');
         }
         if ($path === '$') {
             return $path;

src/Developer/Utils/StringUtils.php

@@ -3,15 +3,15 @@
 
 class StringUtils {
 
-    public static function startsWith($haystack, $needle) {
-        return empty($needle) || strrpos($haystack, $needle, -strlen($haystack)) !== false;
+    public static function startsWith($string, $prefix) {
+        return empty($prefix) || strrpos($string, $prefix, -strlen($string)) !== false;
     }
 
-    public static function endsWith($haystack, $needle) {
-        if (empty($needle)) {
+    public static function endsWith($string, $suffix) {
+        if (empty($suffix)) {
             return true;
         }
-        $diff = strlen($haystack) - strlen($needle);
-        return $diff >= 0 && strpos($haystack, $needle, $diff) !== false;
+        $diff = strlen($string) - strlen($suffix);
+        return $diff >= 0 && strpos($string, $suffix, $diff) !== false;
     }
 }

tests/Developer/Json/JsonPathTest.php

@@ -39,7 +39,20 @@ public function testNormalizePath_ShouldThrowInvalidArgumentException_WhenJsonPa
 
         // THEN
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Empty JSON path!');
+        $this->expectExceptionMessage('JSON path must be a non-empty string!');
+
+        // WHEN
+        JsonPath::normalizePath($jsonPath);
+    }
+
+    public function testNormalizePath_ShouldThrowInvalidArgumentException_WhenJsonPathIsNotAString() {
+
+        // GIVEN
+        $jsonPath = [];
+
+        // THEN
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('JSON path must be a non-empty string!');
 
         // WHEN
         JsonPath::normalizePath($jsonPath);
@@ -187,7 +200,7 @@ public function testGetParentPath_ShouldThrowInvalidArgumentException_WhenJsonPa
 
         // THEN
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Empty JSON path!');
+        $this->expectExceptionMessage('JSON path must be a non-empty string!');
 
         // WHEN
         JsonPath::getParentPath($jsonPath);
@@ -200,7 +213,7 @@ public function testGetElementKey_ShouldThrowInvalidArgumentException_WhenJsonPa
 
         // THEN
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Empty JSON path!');
+        $this->expectExceptionMessage('JSON path must be a non-empty string!');
 
         // WHEN
         JsonPath::getElementKey($jsonPath);