Skip to content

Commit 31a3282

Browse files
Merge branch '3.4'
* 3.4: [3.4] Remove useless docblocks [3.3] More docblock fixes [2.7] More docblock fixes [TwigBridge] Fix BC break due required twig environment Random fixes Docblock fixes [DI] Fix cannot bind env var Fix some signatures in PHP-DSLs [HttpKernel] Enhance deprecation message bumped Symfony version to 3.4.0 updated VERSION for 3.4.0-BETA3 updated CHANGELOG for 3.4.0-BETA3 [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents 7784f13 + dc4889e commit 31a3282

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

Extension/Core/Type/ChoiceType.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ public function getBlockPrefix()
346346

347347
/**
348348
* Adds the sub fields for an expanded choice field.
349-
*
350-
* @param FormBuilderInterface $builder The form builder
351-
* @param array $choiceViews The choice view objects
352-
* @param array $options The build options
353349
*/
354350
private function addSubForms(FormBuilderInterface $builder, array $choiceViews, array $options)
355351
{
@@ -370,11 +366,6 @@ private function addSubForms(FormBuilderInterface $builder, array $choiceViews,
370366
}
371367

372368
/**
373-
* @param FormBuilderInterface $builder
374-
* @param $name
375-
* @param $choiceView
376-
* @param array $options
377-
*
378369
* @return mixed
379370
*/
380371
private function addSubForm(FormBuilderInterface $builder, $name, ChoiceView $choiceView, array $options)

Extension/Core/Type/DateType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public function getBlockPrefix()
285285
private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
286286
{
287287
$pattern = $formatter->getPattern();
288-
$timezone = $formatter->getTimezoneId();
288+
$timezone = $formatter->getTimeZoneId();
289289
$formattedTimestamps = array();
290290

291291
$formatter->setTimeZone('UTC');

FormEvent.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ class FormEvent extends Event
2121
private $form;
2222
protected $data;
2323

24-
/**
25-
* Constructs an event.
26-
*
27-
* @param FormInterface $form The associated form
28-
* @param mixed $data The data
29-
*/
3024
public function __construct(FormInterface $form, $data)
3125
{
3226
$this->form = $form;

Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ protected function setUp()
4141
}
4242

4343
/**
44-
* @param $path
45-
*
4644
* @return \PHPUnit_Framework_MockObject_MockObject
4745
*/
4846
private function getPropertyPath($path)

0 commit comments

Comments
 (0)