minor #34097 [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 (alexpott)

Tobion · Tobion · commit c953ba88d7f5 · 2019-10-25T15:07:00.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #34097). Discussion ---------- [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Drupal is testing on PHP7.4 and hitting a problem with the line `if ('[' === $subPath[0]) {` because `$subPath` is not a string. We're already doing string casting in the method so we could do it once and be done. Note this is not a problem on the master branch / SF5 because of primitive typehinting. Without this fix on PHP7.4 you see errors like... ``` 1) Symfony\Component\Validator\Tests\Util\PropertyPathTest::testAppend with data set #5 ('0', 1, '0.1', 'Numeric subpaths do not cause...rrors.') Trying to access array offset on value of type int ``` Commits ------- 6244a1e [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4
diff --git a/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php
@@ -32,6 +32,7 @@ public function provideAppendPaths()
             ['foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'],
             ['foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation'],
             ['0', 'bar', '0.bar', 'Leading zeros are kept.'],
+            ['0', 1, '0.1', 'Numeric subpaths do not cause PHP 7.4 errors.'],
         ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Util/PropertyPath.php b/src/Symfony/Component/Validator/Util/PropertyPath.php
@@ -36,12 +36,13 @@ class PropertyPath
      */
     public static function append($basePath, $subPath)
     {
-        if ('' !== (string) $subPath) {
+        $subPath = (string) $subPath;
+        if ('' !== $subPath) {
             if ('[' === $subPath[0]) {
                 return $basePath.$subPath;
             }
 
-            return '' !== (string) $basePath ? $basePath.'.'.$subPath : $subPath;
+            return '' !== $basePath ? $basePath.'.'.$subPath : $subPath;
         }
 
         return $basePath;

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public function provideAppendPaths()`
`32`	`32`	`['foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'],`
`33`	`33`	`['foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation'],`
`34`	`34`	`['0', 'bar', '0.bar', 'Leading zeros are kept.'],`
	`35`	`+ ['0', 1, '0.1', 'Numeric subpaths do not cause PHP 7.4 errors.'],`
`35`	`36`	`];`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,13 @@ class PropertyPath`
`36`	`36`	`*/`
`37`	`37`	`public static function append($basePath, $subPath)`
`38`	`38`	`{`
`39`		`- if ('' !== (string) $subPath) {`
	`39`	`+ $subPath = (string) $subPath;`
	`40`	`+ if ('' !== $subPath) {`
`40`	`41`	`if ('[' === $subPath[0]) {`
`41`	`42`	`return $basePath.$subPath;`
`42`	`43`	`}`
`43`	`44`
`44`		`- return '' !== (string) $basePath ? $basePath.'.'.$subPath : $subPath;`
	`45`	`+ return '' !== $basePath ? $basePath.'.'.$subPath : $subPath;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`return $basePath;`