Merge pull request #27 from SG5/union-keys

key union selector, fix #22

Author: SoftCreatR

src/Filters/IndexFilter.php

@@ -20,6 +20,16 @@ class IndexFilter extends AbstractFilter
      */
     public function filter($collection): array
     {
+        if (is_array($this->token->value)) {
+            $result = [];
+            foreach ($this->token->value as $value) {
+                if (AccessHelper::keyExists($collection, $value, $this->magicIsAllowed)) {
+                    $result[] = AccessHelper::getValue($collection, $value, $this->magicIsAllowed);
+                }
+            }
+            return $result;
+        }
+
         if (AccessHelper::keyExists($collection, $this->token->value, $this->magicIsAllowed)) {
             return [
                 AccessHelper::getValue($collection, $this->token->value, $this->magicIsAllowed),

src/JSONPathLexer.php

@@ -213,6 +213,16 @@ protected function createToken(string $value): JSONPathToken
             if (isset($matches[1])) {
                 $tokenValue = $matches[1];
                 $tokenValue = trim($tokenValue);
+
+                $possibleArray = false;
+                if ($matches[0][0] === '"') {
+                    $possibleArray = explode('","', $tokenValue);
+                } elseif ($matches[0][0] === "'") {
+                    $possibleArray = explode("','", $tokenValue);
+                }
+                if ($possibleArray !== false && count($possibleArray) > 1) {
+                    $tokenValue = $possibleArray;
+                }
             } else {
                 $tokenValue = '';
             }

tests/JSONPathTest.php

@@ -683,6 +683,23 @@ public function testSlashesInIndex(): void
         self::assertEquals(["/core/img/filetypes/image.png"], $result->getData());
     }
 
+    public function testUnionWithKeys(): void
+    {
+        $result = (new JSONPath(
+            json_decode(
+                json_encode(
+                    [
+                        "key" => "value",
+                        "another" => "entry",
+                    ]
+                ),
+                false
+            )
+        ))->find("$['key','another']");
+
+        self::assertEquals(["value","entry"], $result->getData());
+    }
+
     /**
      * @throws Exception
      */