merged branch bschussek/propertypath (PR #5011)

fabpot · fabpot · commit c20c1d18dc0b · 2012-07-22T10:03:04.000+02:00
Commits ------- dd2aa54 [Form] Disabled manual singulars in PropertyPath until the syntax is finalized Discussion ---------- [Form] Disabled manual singulars in PropertyPath until the syntax is finalized Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: -
diff --git a/src/Symfony/Component/Form/Tests/Util/PropertyPathCollectionTest.php b/src/Symfony/Component/Form/Tests/Util/PropertyPathCollectionTest.php
@@ -211,6 +211,8 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
 
     public function testSetValueCallsCustomAdderAndRemover()
     {
+        $this->markTestSkipped('This feature is temporarily disabled as of 2.1');
+
         $car = $this->getMock(__CLASS__ . '_CarCustomSingular');
         $axesBefore = $this->getCollection(array(1 => 'second', 3 => 'fourth'));
         $axesAfter = $this->getCollection(array(0 => 'first', 1 => 'second', 2 => 'third'));
@@ -300,6 +302,9 @@ public function noAdderRemoverData()
         );
         $data[] = array($car, $propertyPath, $expectedMessage);
 
+        /*
+        Temporarily disabled in 2.1
+
         $propertyPath = new PropertyPath('axes|boo');
         $expectedMessage = sprintf(
             'Neither element "axes" nor method "setAxes()" exists in class '
@@ -309,6 +314,7 @@ public function noAdderRemoverData()
             'boo'
         );
         $data[] = array($car, $propertyPath, $expectedMessage);
+         */
 
         $car = $this->getMock(__CLASS__ . '_CarNoAdderAndRemoverWithProperty');
         $propertyPath = new PropertyPath('axes');
diff --git a/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php b/src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
@@ -95,6 +95,8 @@ public function testGetValueReadsProperty()
 
     public function testGetValueIgnoresSingular()
     {
+        $this->markTestSkipped('This feature is temporarily disabled as of 2.1');
+
         $object = (object) array('children' => 'Many');
 
         $path = new PropertyPath('children|child');
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -118,8 +118,9 @@ public function __construct($propertyPath)
                 $element = $matches[3];
                 $this->isIndex[] = true;
             }
-
-            $pos = strpos($element, self::SINGULAR_SEPARATOR);
+            // Disabled this behaviour as the syntax is not yet final
+            //$pos = strpos($element, self::SINGULAR_SEPARATOR);
+            $pos = false;
             $singular = null;
 
             if (false !== $pos) {

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ public function testGetValueReadsProperty()`
`95`	`95`
`96`	`96`	`public function testGetValueIgnoresSingular()`
`97`	`97`	`{`
	`98`	`+ $this->markTestSkipped('This feature is temporarily disabled as of 2.1');`
	`99`	`+`
`98`	`100`	`$object = (object) array('children' => 'Many');`
`99`	`101`
`100`	`102`	`$path = new PropertyPath('children\|child');`