Skip to content

Commit 3dab6cb

Browse files
Merge branch '3.4'
* 3.4: [HttpFoundation] refactoring: calculate when need [Serializer] Fix extra attributes when no group specified [Intl] Make intl-data tests pass and save language aliases again [FrameworkBundle][Config] fix: do not add resource checkers for debug=false [DI] Fix "almost-circular" dependencies handling [Console] Fix CommandTester::setInputs() docblock Only enabling validation if it is present Fix displaying errors for bootstrap 4 [Serializer] readd default argument value Fix reference dump for deprecated nodes [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass [HttpKernel] Let the storage manage the session starts [VarDumper] fix trailling comma when dumping an exception [Validator] Fix TraceableValidator is reset on data collector instantiation Remove useless docblocks [FrameworkBundle] Fix docblocks [PropertyInfo] Remove useless docblocks
2 parents 134423f + ae45fce commit 3dab6cb

40 files changed

+41
-280
lines changed

AbstractRendererEngine.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ abstract protected function loadResourceForBlockName($cacheKey, FormView $view,
127127
*
128128
* @see getResourceForBlockHierarchy()
129129
*
130-
* @param string $cacheKey the cache key used for storing the
130+
* @param string $cacheKey The cache key used for storing the
131131
* resource
132-
* @param FormView $view the form view for finding the applying
132+
* @param FormView $view The form view for finding the applying
133133
* themes
134-
* @param array $blockNameHierarchy the block hierarchy, with the most
134+
* @param array $blockNameHierarchy The block hierarchy, with the most
135135
* specific block name at the end
136-
* @param int $hierarchyLevel the level in the block hierarchy that
136+
* @param int $hierarchyLevel The level in the block hierarchy that
137137
* should be loaded
138138
*
139139
* @return bool True if the resource could be loaded, false otherwise

CallbackTransformer.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,7 @@
1616

1717
class CallbackTransformer implements DataTransformerInterface
1818
{
19-
/**
20-
* The callback used for forward transform.
21-
*
22-
* @var callable
23-
*/
2419
private $transform;
25-
26-
/**
27-
* The callback used for reverse transform.
28-
*
29-
* @var callable
30-
*/
3120
private $reverseTransform;
3221

3322
/**

ChoiceList/LazyChoiceList.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
*/
2828
class LazyChoiceList implements ChoiceListInterface
2929
{
30-
/**
31-
* The choice loader.
32-
*
33-
* @var ChoiceLoaderInterface
34-
*/
3530
private $loader;
3631

3732
/**
@@ -51,8 +46,7 @@ class LazyChoiceList implements ChoiceListInterface
5146
* argument.
5247
*
5348
* @param ChoiceLoaderInterface $loader The choice loader
54-
* @param null|callable $value The callable generating the choice
55-
* values
49+
* @param null|callable $value The callable generating the choice values
5650
*/
5751
public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
5852
{

ChoiceList/View/ChoiceGroupView.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,14 @@
1818
*/
1919
class ChoiceGroupView implements \IteratorAggregate
2020
{
21-
/**
22-
* The label of the group.
23-
*
24-
* @var string
25-
*/
2621
public $label;
27-
28-
/**
29-
* The choice views in the group.
30-
*
31-
* @var ChoiceGroupView[]|ChoiceView[]
32-
*/
3322
public $choices;
3423

3524
/**
3625
* Creates a new choice group view.
3726
*
3827
* @param string $label The label of the group
39-
* @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the
40-
* group
28+
* @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the group
4129
*/
4230
public function __construct($label, array $choices = array())
4331
{

ChoiceList/View/ChoiceListView.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,14 @@
2222
*/
2323
class ChoiceListView
2424
{
25-
/**
26-
* The choices.
27-
*
28-
* @var ChoiceGroupView[]|ChoiceView[]
29-
*/
3025
public $choices;
31-
32-
/**
33-
* The preferred choices.
34-
*
35-
* @var ChoiceGroupView[]|ChoiceView[]
36-
*/
3726
public $preferredChoices;
3827

3928
/**
4029
* Creates a new choice list view.
4130
*
4231
* @param ChoiceGroupView[]|ChoiceView[] $choices The choice views
43-
* @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred
44-
* choice views
32+
* @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred choice views
4533
*/
4634
public function __construct(array $choices = array(), array $preferredChoices = array())
4735
{

ChoiceList/View/ChoiceView.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,8 @@
1818
*/
1919
class ChoiceView
2020
{
21-
/**
22-
* The label displayed to humans.
23-
*
24-
* @var string
25-
*/
2621
public $label;
27-
28-
/**
29-
* The view representation of the choice.
30-
*
31-
* @var string
32-
*/
3322
public $value;
34-
35-
/**
36-
* The original choice value.
37-
*
38-
* @var mixed
39-
*/
4023
public $data;
4124

4225
/**

Extension/Core/CoreExtension.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,7 @@
2626
*/
2727
class CoreExtension extends AbstractExtension
2828
{
29-
/**
30-
* @var PropertyAccessorInterface
31-
*/
3229
private $propertyAccessor;
33-
34-
/**
35-
* @var ChoiceListFactoryInterface
36-
*/
3730
private $choiceListFactory;
3831

3932
public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)

Extension/Core/DataTransformer/BooleanToStringTransformer.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@
2222
*/
2323
class BooleanToStringTransformer implements DataTransformerInterface
2424
{
25-
/**
26-
* The value emitted upon transform if the input is true.
27-
*
28-
* @var string
29-
*/
3025
private $trueValue;
3126

3227
/**
33-
* Sets the value emitted upon transform if the input is true.
34-
*
35-
* @param string $trueValue
28+
* @param string $trueValue The value emitted upon transform if the input is true
3629
*/
3730
public function __construct($trueValue)
3831
{

Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function reverseTransform($value)
149149
/**
150150
* Returns a preconfigured IntlDateFormatter instance.
151151
*
152-
* @param bool $ignoreTimezone use UTC regardless of the configured timezone
152+
* @param bool $ignoreTimezone Use UTC regardless of the configured timezone
153153
*
154154
* @return \IntlDateFormatter
155155
*

Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
3232
);
3333

3434
private $type;
35-
3635
private $scale;
3736

3837
/**

0 commit comments

Comments
 (0)