Merge branch '2.3' into 2.4

fabpot · fabpot · commit c94f69ddcbd1 · 2014-05-16T13:54:29.000+02:00
* 2.3:
  [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed
  Fixed incorrect regular plural for -ves words
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -140,6 +140,14 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
         if ('single_text' === $options['widget']) {
             $view->vars['type'] = 'time';
+
+            // we need to force the browser to display the seconds by
+            // adding the HTML attribute step if not already defined.
+            // Otherwise the browser will not display and so not send the seconds
+            // therefore the value will always be considered as invalid.
+            if ($options['with_seconds'] && !isset($view->vars['attr']['step'])) {
+                $view->vars['attr']['step'] = 1;
+            }
         }
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -492,6 +492,33 @@ public function testSingleTextWidgetShouldUseTheRightInputType()
         $this->assertEquals('time', $view->vars['type']);
     }
 
+    public function testSingleTextWidgetWithSecondsShouldHaveRightStepAttribute()
+    {
+        $form = $this->factory->create('time', null, array(
+            'widget' => 'single_text',
+            'with_seconds' => true,
+        ));
+
+        $view = $form->createView();
+        $this->assertArrayHasKey('step', $view->vars['attr']);
+        $this->assertEquals(1, $view->vars['attr']['step']);
+    }
+
+    public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()
+    {
+        $form = $this->factory->create('time', null, array(
+            'widget' => 'single_text',
+            'with_seconds' => true,
+            'attr' => array(
+                'step' => 30
+            )
+        ));
+
+        $view = $form->createView();
+        $this->assertArrayHasKey('step', $view->vars['attr']);
+        $this->assertEquals(30, $view->vars['attr']['step']);
+    }
+
     public function testPassDefaultEmptyValueToViewIfNotRequired()
     {
         $form = $this->factory->create('time', null, array(
diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php
@@ -81,8 +81,8 @@ class StringUtil
         // moves (move)
         array('sevom', 5, true, true, 'move'),
 
-        // hooves (hoof), dwarves (dwarf), elves (elf), leaves (leaf)
-        array('sev', 3, true, true, 'f'),
+        // hooves (hoof), dwarves (dwarf), elves (elf), leaves (leaf), caves (cave), staves (staff)
+        array('sev', 3, true, true, array('f', 've', 'ff')),
 
         // axes (axis), axes (ax), axes (axe)
         array('sexa', 4, false, false, array('ax', 'axe', 'axis')),
diff --git a/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php b/src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
@@ -38,7 +38,7 @@ public function singularifyProvider()
             array('feet', 'foot'),
             array('nebulae', 'nebula'),
             array('babies', 'baby'),
-            array('hooves', 'hoof'),
+            array('hooves', array('hoof', 'hoove', 'hooff')),
             array('chateaux', 'chateau'),
             array('echoes', array('echo', 'echoe')),
             array('analyses', array('analys', 'analyse', 'analysis')),
@@ -64,14 +64,14 @@ public function singularifyProvider()
             array('batches', array('batch', 'batche')),
             array('bushes', array('bush', 'bushe')),
             array('buses', array('bus', 'buse', 'busis')),
-            array('calves', 'calf'),
+            array('calves', array('calf', 'calve', 'calff')),
             array('circuses', array('circus', 'circuse', 'circusis')),
             array('crises', array('cris', 'crise', 'crisis')),
-            array('dwarves', 'dwarf'),
-            array('elves', 'elf'),
+            array('dwarves', array('dwarf', 'dwarve', 'dwarff')),
+            array('elves', array('elf', 'elve', 'elff')),
             array('emphases', array('emphas', 'emphase', 'emphasis')),
             array('faxes', 'fax'),
-            array('halves', 'half'),
+            array('halves', array('half', 'halve', 'halff')),
             array('heroes', array('hero', 'heroe')),
             array('hoaxes', 'hoax'),
             array('irises', array('iris', 'irise', 'irisis')),
@@ -86,13 +86,15 @@ public function singularifyProvider()
             array('plateaux', 'plateau'),
             array('poppies', 'poppy'),
             array('quizzes', 'quiz'),
-            array('scarves', 'scarf'),
+            array('scarves', array('scarf', 'scarve', 'scarff')),
             array('spies', 'spy'),
             array('stories', 'story'),
             array('syllabi', 'syllabus'),
-            array('thieves', 'thief'),
+            array('thieves', array('thief', 'thieve', 'thieff')),
             array('waltzes', array('waltz', 'waltze')),
-            array('wharves', 'wharf'),
+            array('wharves', array('wharf', 'wharve', 'wharff')),
+            array('caves', array('caf', 'cave', 'caff')),
+            array('staves', array('staf', 'stave', 'staff')),
             array('wives', 'wife'),
             array('ions', 'ion'),
             array('bases', array('bas', 'base', 'basis')),

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,14 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`140`	`140`
`141`	`141`	`if ('single_text' === $options['widget']) {`
`142`	`142`	`$view->vars['type'] = 'time';`
	`143`	`+`
	`144`	`+ // we need to force the browser to display the seconds by`
	`145`	`+ // adding the HTML attribute step if not already defined.`
	`146`	`+ // Otherwise the browser will not display and so not send the seconds`
	`147`	`+ // therefore the value will always be considered as invalid.`
	`148`	`+ if ($options['with_seconds'] && !isset($view->vars['attr']['step'])) {`
	`149`	`+ $view->vars['attr']['step'] = 1;`
	`150`	`+ }`
`143`	`151`	`}`
`144`	`152`	`}`
`145`	`153`