Skip to content

Commit

Permalink
[Validator] Fix array notation in the PropertyPath::append()
Browse files Browse the repository at this point in the history
  • Loading branch information
jakzal authored and fabpot committed Jun 13, 2014
1 parent 057c274 commit aa6b08d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions 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')
);
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Util/PropertyPath.php
Expand Up @@ -38,7 +38,7 @@ class PropertyPath
public static function append($basePath, $subPath)
{
if ('' !== (string) $subPath) {
if ('[' === $subPath{1}) {
if ('[' === $subPath{0}) {
return $basePath.$subPath;
}

Expand Down

0 comments on commit aa6b08d

Please sign in to comment.