Merge pull request #55 from Galbar/normalize_length_op

Normalize behavior of .length operation.

Author: Galbar

src/Galbar/JsonPath/JsonObject.php

@@ -219,7 +219,7 @@ public function getJson($options=0)
     public function get($jsonPath)
     {
         list($result, $hasDiverged) = JsonPath::get($this->jsonObject, $jsonPath);
-        if ($this->smartGet && $result !== false && !$hasDiverged && is_array($result)) {
+        if ($this->smartGet && $result !== false && !$hasDiverged) {
             return $result[0];
         }
         return $result;
@@ -251,7 +251,7 @@ public function getJsonObjects($jsonPath)
                 $jsonObject->jsonObject = &$value;
                 $objs[] = $jsonObject;
             }
-            if ($this->smartGet && !$hasDiverged && is_array($result)) {
+            if ($this->smartGet && !$hasDiverged) {
                 return $objs[0];
             }
             return $objs;

src/Galbar/JsonPath/JsonPath.php

@@ -47,12 +47,8 @@ public static function subtreeGet(&$root, &$partial, $jsonPath, $createInexisten
                     $newSelection = array_merge($newSelection, $result);
                 }
                 if (empty($newSelection) && Language\Token::LENGTH === $childName) {
-                    if (count($selection) > 1) {
-                        foreach ($selection as $item) {
-                            $newSelection[] = is_array($item) ? count($item) : strlen($item);
-                        }
-                    } else if (count($selection) == 1) {
-                        $newSelection = is_array($selection[0]) ? count($selection[0]) : strlen($selection[0]);
+                    foreach ($selection as $item) {
+                        $newSelection[] = is_array($item) ? count($item) : strlen($item);
                     }
                 }
                 if (empty($newSelection)) {

tests/Galbar/JsonPath/JsonObjectLengthOperatorTest.php

@@ -156,22 +156,22 @@ public function testLength()
         $jsonObject = new JsonObject($this->json);
         $result = $jsonObject->get($jsonPath);
         $this->assertEquals(
-            3,
+            [3],
             $result
         );
 
         /** String Length Test */
         $jsonPath = '$.music.bands[0].albums[0].length.length';
         $result = $jsonObject->get($jsonPath);
         $this->assertEquals(
-            5,
+            [5],
             $result
         );
 
         $jsonPath = '$.music.bands[0].albums[1].title.length';
         $result = $jsonObject->get($jsonPath);
         $this->assertEquals(
-            6,
+            [6],
             $result
         );
     }
@@ -260,4 +260,59 @@ public function testArrayLength()
             $result
         );
     }
+
+    /**
+     * @throws InvalidJsonException
+     */
+    public function testArrayLengthSmartGet()
+    {
+        /** Arrays Count Length Test */
+        $jsonPath = '$.music.bands[*].albums.length';
+        $jsonObject = new JsonObject($this->json, true);
+        $result = $jsonObject->get($jsonPath);
+        $this->assertEquals(
+            [
+                3,
+                3
+            ],
+            $result
+        );
+
+        /** String Length Test */
+        $jsonPath = '$.music.bands[0].albums[*].length.length';
+        $result = $jsonObject->get($jsonPath);
+        $this->assertEquals(
+            [
+                5,
+                5,
+                6
+            ],
+            $result
+        );
+
+        $jsonPath = '$.music.bands[0].albums[*].title.length';
+        $result = $jsonObject->get($jsonPath);
+        $this->assertEquals(
+            [
+                5,
+                6,
+                5
+            ],
+            $result
+        );
+
+        $jsonPath = '$.music.bands[*].albums[*].length.length';
+        $result = $jsonObject->get($jsonPath);
+        $this->assertEquals(
+            [
+                5,
+                5,
+                6,
+                6,
+                6,
+                6
+            ],
+            $result
+        );
+    }
 }