merged branch acasademont/camelize_property_path_add_and_remove_methods (PR symfony#4673)

fabpot · fabpot · commit f7d2ad21756c · 2012-06-28T15:05:21.000+02:00
Commits ------- 9fabb3d [Form] Camelize 'add' and 'remove' methods in the PropertyPath Discussion ---------- [Form] Camelize 'add' and 'remove' methods in the PropertyPath Bug fix: yes Feature addition: no Backwards compatibility break: yes Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/acasademont/symfony.png?branch=camelize_property_path_add_and_remove_methods)](http://travis-ci.org/acasademont/symfony) Fixes the following tickets: - License of the code: MIT Documentation PR: - This issue camelizes the 'add' and 'remove' methods, as it is already done with the 'set' method. This fixes a problem with properties like 'custom_messages', where the 'add' and 'remove' methods are 'addCustom_message' and 'removeCustom_message' instead of 'addCustomMessage' and 'removeCustomMessage'. --------------------------------------------------------------------------- by acasademont at 2012-06-27T18:16:36Z Seems the tests are failing due to some unrelated test in PHP 5.3.14 and PHP 5.4. PHP 5.3.3 works fine --------------------------------------------------------------------------- by travisbot at 2012-06-27T18:38:39Z This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1722847) (merged 9fabb3d into d0e1547).
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -535,8 +535,8 @@ protected function camelize($string)
     private function findAdderAndRemover(\ReflectionClass $reflClass, $singular)
     {
         if (null !== $singular) {
-            $addMethod = 'add' . ucfirst($singular);
-            $removeMethod = 'remove' . ucfirst($singular);
+            $addMethod = 'add' . $this->camelize($singular);
+            $removeMethod = 'remove' . $this->camelize($singular);
 
             if (!$this->isAccessible($reflClass, $addMethod, 1)) {
                 throw new InvalidPropertyException(sprintf(
@@ -558,7 +558,7 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, $singular)
         }
 
         // The plural form is the last element of the property path
-        $plural = ucfirst($this->elements[$this->length - 1]);
+        $plural = $this->camelize($this->elements[$this->length - 1]);
 
         // Any of the two methods is required, but not yet known
         $singulars = (array) FormUtil::singularify($plural);
