Skip to content

Commit e1d646e

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: [CS] Apply phpdoc_annotation_without_dot bumped Symfony version to 3.3.10 updated VERSION for 3.3.9 updated CHANGELOG for 3.3.9 [DomCrawler] Fix conversion to int on GetPhpFiles Remove `protected_to_private` rule. Filtering empty uuids in ORMQueryBuilderLoader.
2 parents ca9a7c8 + bba58c1 commit e1d646e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Encoder/ChainDecoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function supportsDecoding($format/*, array $context = array()*/)
6464
*
6565
* @return DecoderInterface
6666
*
67-
* @throws RuntimeException If no decoder is found.
67+
* @throws RuntimeException if no decoder is found
6868
*/
6969
private function getDecoder($format, array $context)
7070
{

Normalizer/NormalizableInterface.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ interface NormalizableInterface
2727
* It is important to understand that the normalize() call should normalize
2828
* recursively all child objects of the implementor.
2929
*
30-
* @param NormalizerInterface $normalizer The normalizer is given so that you
31-
* can use it to normalize objects contained within this object.
32-
* @param string|null $format The format is optionally given to be able to normalize differently
33-
* based on different output formats.
34-
* @param array $context Options for normalizing this object
30+
* @param NormalizerInterface $normalizer the normalizer is given so that you
31+
* can use it to normalize objects contained within this object
32+
* @param string|null $format the format is optionally given to be able to normalize differently
33+
* based on different output formats
34+
* @param array $context options for normalizing this object
3535
*
3636
* @return array|scalar
3737
*/

0 commit comments

Comments
 (0)