bug #11117 [Validator] Fix array notation in the PropertyPath::append() (jakzal)

fabpot · fabpot · commit 88a954cf9f36 · 2014-06-13T15:18:45.000+02:00
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #11117). Discussion ---------- [Validator] Fix array notation in the PropertyPath::append() | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | related #11072 #11046 (not fixed yet) | License | MIT | Doc PR | - Commits ------- aa6b08d [Validator] Fix array notation in the PropertyPath::append()
diff --git a/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Validator/Tests/Util/PropertyPathTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Util;
+
+use Symfony\Component\Validator\Util\PropertyPath;
+
+class PropertyPathTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideAppendPaths
+     */
+    public function testAppend($basePath, $subPath, $expectedPath, $message)
+    {
+        $this->assertSame($expectedPath, PropertyPath::append($basePath, $subPath), $message);
+    }
+
+    public function provideAppendPaths()
+    {
+        return array(
+            array('foo', '', 'foo', 'It returns the basePath if subPath is empty'),
+            array('', 'bar', 'bar', 'It returns the subPath if basePath is empty'),
+            array('foo', 'bar', 'foo.bar', 'It append the subPath to the basePath'),
+            array('foo', '[bar]', 'foo[bar]', 'It does not include the dot separator if subPath uses the array notation')
+        );
+    }
+}
diff --git a/src/Symfony/Component/Validator/Util/PropertyPath.php b/src/Symfony/Component/Validator/Util/PropertyPath.php
@@ -38,7 +38,7 @@ class PropertyPath
     public static function append($basePath, $subPath)
     {
         if ('' !== (string) $subPath) {
-            if ('[' === $subPath{1}) {
+            if ('[' === $subPath{0}) {
                 return $basePath.$subPath;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class PropertyPath`
`38`	`38`	`public static function append($basePath, $subPath)`
`39`	`39`	`{`
`40`	`40`	`if ('' !== (string) $subPath) {`
`41`		`- if ('[' === $subPath{1}) {`
	`41`	`+ if ('[' === $subPath{0}) {`
`42`	`42`	`return $basePath.$subPath;`
`43`	`43`	`}`
`44`	`44`