bug #62691 [JsonPath] Update and fix the compliance test suite (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit e1bb5dccdc6d · 2025-12-10T11:17:44.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [JsonPath] Update and fix the compliance test suite | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT New cases have been added the compliance test suite and this PR fixes the failures. Commits ------- 710bbd4 [JsonPath] Update and fix the compliance test suite
diff --git a/src/Symfony/Component/JsonPath/JsonCrawler.php b/src/Symfony/Component/JsonPath/JsonCrawler.php
@@ -42,6 +42,8 @@ final class JsonCrawler implements JsonCrawlerInterface
         'value' => true,
     ];
 
+    private const SINGULAR_ARGUMENT_FUNCTIONS = ['length', 'match', 'search'];
+
     /**
      * Comparison operators and their corresponding lengths.
      */
@@ -780,6 +782,10 @@ private function evaluateFunction(string $name, string $args, mixed $context): m
         $value = $argList[0] ?? null;
         $nodelistSize = $nodelistSizes[0] ?? 0;
 
+        if ($nodelistSize > 1 && \in_array($name, self::SINGULAR_ARGUMENT_FUNCTIONS, true)) {
+            throw new JsonCrawlerException($args, \sprintf('non-singular query is not allowed as argument to "%s" function', $name));
+        }
+
         return match ($name) {
             'length' => match (true) {
                 \is_string($value) => mb_strlen($value),
@@ -833,8 +839,8 @@ private function compare(mixed $left, mixed $right, string $operator): bool
 
     private function compareEquality(mixed $left, mixed $right): bool
     {
-        $leftIsNothing = $left === Nothing::Nothing;
-        $rightIsNothing = $right === Nothing::Nothing;
+        $leftIsNothing = Nothing::Nothing === $left;
+        $rightIsNothing = Nothing::Nothing === $right;
 
         if (
             $leftIsNothing && $rightIsNothing
@@ -1033,11 +1039,31 @@ private function validateFilterExpression(string $expr): void
                     throw new JsonCrawlerException($left, 'non-singular query is not comparable');
                 }
 
+                $this->validateFunctionArguments($left);
+                $this->validateFunctionArguments($right);
+
                 return;
             }
         }
     }
 
+    private function validateFunctionArguments(string $expr): void
+    {
+        // is there a function call?
+        if (!preg_match('/^(\w+)\((.*)\)$/', trim($expr), $matches)) {
+            return;
+        }
+
+        if (!\in_array($functionName = $matches[1], self::SINGULAR_ARGUMENT_FUNCTIONS, true)) {
+            return;
+        }
+
+        $arg = trim($matches[2]);
+        if (str_starts_with($arg, '@') && $this->isNonSingularRelativeQuery($arg)) {
+            throw new JsonCrawlerException($arg, \sprintf('non-singular query is not allowed as argument to "%s" function', $functionName));
+        }
+    }
+
     /**
      * Transforms JSONPath regex patterns to comply with RFC 9485.
      *
diff --git a/src/Symfony/Component/JsonPath/Tests/Fixtures/Makefile b/src/Symfony/Component/JsonPath/Tests/Fixtures/Makefile
@@ -1,4 +1,4 @@
-override hash := 05f6cac786bf0cce95437e6f1adedc3186d54a71
+override hash := b9d7153e58711ad38bb8e35ece69c13f4b2f7d63
 
 .PHONY: cts.json
 cts.json:
diff --git a/src/Symfony/Component/JsonPath/Tests/Fixtures/cts.json b/src/Symfony/Component/JsonPath/Tests/Fixtures/cts.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-override hash := 05f6cac786bf0cce95437e6f1adedc3186d54a71`
	`1`	`+override hash := b9d7153e58711ad38bb8e35ece69c13f4b2f7d63`
`2`	`2`
`3`	`3`	`.PHONY: cts.json`
`4`	`4`	`cts.json:`