Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions src/Symfony/Component/JsonPath/Tests/Fixtures/cts.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]",
Expand All @@ -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]",
Expand All @@ -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]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down