[Form] PropertyPath now can handle elements with special characters

webmozart · webmozart · commit e787d5dc22f0 · 2011-04-15T15:25:19.000+02:00
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -64,7 +64,7 @@ public function __construct($propertyPath)
         $remaining = $propertyPath;
 
         // first element is evaluated differently - no leading dot for properties
-        $pattern = '/^((\w+)|\[([^\]]+)\])(.*)/';
+        $pattern = '/^(([^\.\[]+)|\[([^\]]+)\])(.*)/';
 
         while (preg_match($pattern, $remaining, $matches)) {
             if ($matches[2] !== '') {
diff --git a/tests/Symfony/Tests/Component/Form/PropertyPathTest.php b/tests/Symfony/Tests/Component/Form/PropertyPathTest.php
@@ -48,6 +48,15 @@ public function testGetValueReadsIndexWithSpecialChars()
         $this->assertEquals('Bernhard', $path->getValue($array));
     }
 
+    public function testGetValueReadsElementWithSpecialCharsExceptDOt()
+    {
+        $array = array('#!@$' => 'Bernhard');
+
+        $path = new PropertyPath('#!@$');
+
+        $this->assertEquals('Bernhard', $path->getValue($array));
+    }
+
     public function testGetValueReadsNestedIndexWithSpecialChars()
     {
         $array = array('root' => array('#!@$.' => 'Bernhard'));
