Merge remote branch 'pborreli/form-typo'

fabpot · fabpot · commit c6e0ccfdcd80 · 2011-04-24T21:56:47.000+02:00
* pborreli/form-typo:
  [Form] Fixed typos
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php
@@ -18,9 +18,8 @@ class MonthChoiceList extends PaddedChoiceList
     /**
      * Generates an array of localized month choices
      *
-     * @param  array $months  The month numbers to generate
-     * @return array          The localized months respecting the configured
-     *                        locale and date format
+     * @param IntlDateFormatter $formatter An IntlDateFormatter instance
+     * @param array             $months    The month numbers to generate
      */
     public function __construct(\IntlDateFormatter $formatter, array $months)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -26,7 +26,6 @@ class TimeType extends AbstractType
     public function buildForm(FormBuilder $builder, array $options)
     {
         $hourOptions = $minuteOptions = $secondOptions = array();
-        $parts = array('hour', 'minute');
 
         if ($options['widget'] === 'choice') {
             $hourOptions['choice_list'] =  new PaddedChoiceList(
diff --git a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php
@@ -156,8 +156,6 @@ private function buildNamePathMapping(FormInterface $form, array &$forms, $nameP
         $iterator = new \RecursiveIteratorIterator($iterator);
 
         foreach ($iterator as $child) {
-            $path = (string)$child->getAttribute('property_path');
-
             $nestedNamePath = $namePath . $child->getName();
             $forms[$nestedNamePath] = $child;
 
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form;
 
-use Symfony\Component\Form\Guess\TypeGuesserInterface;
 use Symfony\Component\Form\Guess\Guess;
 use Symfony\Component\Form\Exception\FormException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
@@ -119,7 +118,6 @@ public function createNamedBuilder($type, $name, $data = null, array $options =
     {
         $builder = null;
         $types = array();
-        $typeExtensions = array();
         $knownOptions = array();
         $passedOptions = array_keys($options);
 
diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php
@@ -125,7 +125,7 @@ public function getElements()
     /**
      * Returns the element at the given index in the property path
      *
-     * @param $index The index key
+     * @param integer $index The index key
      *
      * @return string  A property or index name
      */

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ class MonthChoiceList extends PaddedChoiceList`
`18`	`18`	`/**`
`19`	`19`	`* Generates an array of localized month choices`
`20`	`20`	`*`
`21`		`- * @param array $months The month numbers to generate`
`22`		`- * @return array The localized months respecting the configured`
`23`		`- * locale and date format`
	`21`	`+ * @param IntlDateFormatter $formatter An IntlDateFormatter instance`
	`22`	`+ * @param array $months The month numbers to generate`
`24`	`23`	`*/`
`25`	`24`	`public function __construct(\IntlDateFormatter $formatter, array $months)`
`26`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ class TimeType extends AbstractType`
`26`	`26`	`public function buildForm(FormBuilder $builder, array $options)`
`27`	`27`	`{`
`28`	`28`	`$hourOptions = $minuteOptions = $secondOptions = array();`
`29`		`- $parts = array('hour', 'minute');`
`30`	`29`
`31`	`30`	`if ($options['widget'] === 'choice') {`
`32`	`31`	`$hourOptions['choice_list'] = new PaddedChoiceList(`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function getElements()`
`125`	`125`	`/**`
`126`	`126`	`* Returns the element at the given index in the property path`
`127`	`127`	`*`
`128`		`- * @param $index The index key`
	`128`	`+ * @param integer $index The index key`
`129`	`129`	`*`
`130`	`130`	`* @return string A property or index name`
`131`	`131`	`*/`