Merge branch '7.3' into 7.4

* 7.3:
  register attribute loader arguments in a forward-compatible way
  ensure compatibility with RelayCluster 0.20.0
  mark test using a Redis connection as an integration test
  ensure compatibility with Relay extension 0.20.0
  [DependencyInjection] Fix `query_string` env processor for URLs without query string
  [HttpFoundation] Fix Expires response header for EventStream
  [DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports
  [FrameworkBundle] Add missing `useAttributeAsKey` calls
  [DependencyInjection] Fix loose validation in #[Autowire] attribute
  [HttpClient] Fix releasing uploaded stream resources
  Fix JsonPath throwing on quoted True/False/Null

Author: xabbuh

Tests/Fixtures/cts.json

@@ -4354,6 +4354,58 @@
         "case"
       ]
     },
+    {
+      "name": "filter, quoted True, double quotes",
+      "selector": "$[?@.a==\"True\"]",
+      "document": [
+        {
+          "a": "True"
+        },
+        {
+          "a": true
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "True"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
+    {
+      "name": "filter, quoted True, single quotes",
+      "selector": "$[?@.a=='True']",
+      "document": [
+        {
+          "a": "True"
+        },
+        {
+          "a": true
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "True"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
     {
       "name": "filter, false, incorrectly capitalized",
       "selector": "$[?@==False]",
@@ -4362,6 +4414,58 @@
         "case"
       ]
     },
+    {
+      "name": "filter, quoted False, double quotes",
+      "selector": "$[?@.a==\"False\"]",
+      "document": [
+        {
+          "a": "False"
+        },
+        {
+          "a": false
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "False"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
+    {
+      "name": "filter, quoted False, single quotes",
+      "selector": "$[?@.a=='False']",
+      "document": [
+        {
+          "a": "False"
+        },
+        {
+          "a": false
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "False"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
     {
       "name": "filter, null, incorrectly capitalized",
       "selector": "$[?@==Null]",
@@ -4370,6 +4474,58 @@
         "case"
       ]
     },
+    {
+      "name": "filter, quoted Null, double quotes",
+      "selector": "$[?@.a==\"Null\"]",
+      "document": [
+        {
+          "a": "Null"
+        },
+        {
+          "a": null
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "Null"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
+    {
+      "name": "filter, quoted Null, single quotes",
+      "selector": "$[?@.a=='Null']",
+      "document": [
+        {
+          "a": "Null"
+        },
+        {
+          "a": null
+        },
+        {
+          "a": "SomethingElse"
+        }
+      ],
+      "result": [
+        {
+          "a": "Null"
+        }
+      ],
+      "result_paths": [
+        "$[0]"
+      ],
+      "tags": [
+        "case"
+      ]
+    },
     {
       "name": "index selector, first element",
       "selector": "$[0]",

Tests/Tokenizer/JsonPathTokenizerTest.php

@@ -349,4 +349,18 @@ public static function provideInvalidUtf8PropertyName(): array
             'dash sign' => ['-test'],
         ];
     }
+
+    public function testQuotedTrueFalseNullShouldNotThrow()
+    {
+        foreach (['True', 'False', 'Null'] as $value) {
+            JsonPathTokenizer::tokenize(
+                new JsonPath(\sprintf('$[?@.a=="%s"]', $value))
+            );
+            JsonPathTokenizer::tokenize(
+                new JsonPath(\sprintf('$[?@.a==\'%s\']', $value))
+            );
+        }
+
+        $this->expectNotToPerformAssertions();
+    }
 }

Tokenizer/JsonPathTokenizer.php

@@ -355,7 +355,7 @@ private static function validateBareLiterals(string $expr, int $position): void
         $filterExpr = ltrim($expr, '?');
         $filterExpr = trim($filterExpr);
 
-        if (preg_match('/\b(True|False|Null)\b/', $filterExpr)) {
+        if (preg_match('/(?<!["\'])\b(True|False|Null)\b(?!["\'])/', $filterExpr)) {
             throw new InvalidJsonPathException('Incorrectly capitalized literal in filter expression.', $position);
         }