Skip to content

Commit 6244a1e

Browse files
alexpottTobion
authored andcommitted
[Validator] Ensure numeric subpaths do not cause errors on PHP 7.4
1 parent 5d097d2 commit 6244a1e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function provideAppendPaths()
3232
['foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'],
3333
['foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation'],
3434
['0', 'bar', '0.bar', 'Leading zeros are kept.'],
35+
['0', 1, '0.1', 'Numeric subpaths do not cause PHP 7.4 errors.'],
3536
];
3637
}
3738
}

src/Symfony/Component/Validator/Util/PropertyPath.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ class PropertyPath
3636
*/
3737
public static function append($basePath, $subPath)
3838
{
39-
if ('' !== (string) $subPath) {
39+
$subPath = (string) $subPath;
40+
if ('' !== $subPath) {
4041
if ('[' === $subPath[0]) {
4142
return $basePath.$subPath;
4243
}
4344

44-
return '' !== (string) $basePath ? $basePath.'.'.$subPath : $subPath;
45+
return '' !== $basePath ? $basePath.'.'.$subPath : $subPath;
4546
}
4647

4748
return $basePath;

0 commit comments

Comments
 (0)