merged branch bschussek/issue5388 (PR #5778)

This PR was merged into the 2.1 branch. Commits ------- bda29b3 [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature Discussion ---------- [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #5388 Todo: - License of the code: MIT Documentation PR: -
symfony · Oct 18, 2012 · 0a9b136 · 0a9b136
2 parents 9006294 + 55492f1
commit 0a9b136
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Tests/Util/PropertyPathCollectionTest.php b/Tests/Util/PropertyPathCollectionTest.php
@@ -299,8 +299,10 @@ public function noAdderRemoverData()
         $expectedMessage = sprintf(
             'Neither element "axes" nor method "setAxes()" exists in class '
                 .'"%s", nor could adders and removers be found based on the '
-                .'guessed singulars: %s (provide a singular by suffixing the '
-                .'property path with "|{singular}" to override the guesser)',
+                .'guessed singulars: %s'
+//                . '(provide a singular by suffixing the '
+//                .'property path with "|{singular}" to override the guesser)'
+                ,
             get_class($car),
             implode(', ', (array) $singulars = FormUtil::singularify('Axes'))
         );
@@ -324,9 +326,10 @@ public function noAdderRemoverData()
         $propertyPath = new PropertyPath('axes');
         $expectedMessage = sprintf(
             'Property "axes" is not public in class "%s", nor could adders and '
-                .'removers be found based on the guessed singulars: %s '
-                .'(provide a singular by suffixing the property path with '
-                .'"|{singular}" to override the guesser). Maybe you should '
+                .'removers be found based on the guessed singulars: %s'
+//                .' (provide a singular by suffixing the property path with '
+//                .'"|{singular}" to override the guesser)'
+                . '. Maybe you should '
                 .'create the method "setAxes()"?',
             get_class($car),
             implode(', ', (array) $singulars = FormUtil::singularify('Axes'))

diff --git a/Util/PropertyPath.php b/Util/PropertyPath.php
@@ -521,7 +521,8 @@ private function writeProperty(&$objectOrArray, $property, $singular, $isIndex,
                 } else {
                     $adderRemoverError = ', nor could adders and removers be found based on the ';
                     if (null === $singular) {
-                        $adderRemoverError .= 'guessed singulars: '.implode(', ', $singulars).' (provide a singular by suffixing the property path with "|{singular}" to override the guesser)';
+                        // $adderRemoverError .= 'guessed singulars: '.implode(', ', $singulars).' (provide a singular by suffixing the property path with "|{singular}" to override the guesser)';
+                        $adderRemoverError .= 'guessed singulars: '.implode(', ', $singulars);
                     } else {
                         $adderRemoverError .= 'passed singular: '.$singular;
                     }