Skip to content

Commit c29033f

Browse files
committed
Merge branch '3.1'
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
2 parents 73d6da4 + e8621c2 commit c29033f

10 files changed

+18
-18
lines changed

Encoder/DecoderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface DecoderInterface
2525
*
2626
* @param string $data Data to decode
2727
* @param string $format Format name
28-
* @param array $context options that decoders have access to.
28+
* @param array $context options that decoders have access to
2929
*
3030
* The format parameter specifies which format the data is in; valid values
3131
* depend on the specific implementation. Authors implementing this interface

Encoder/EncoderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ interface EncoderInterface
2525
*
2626
* @param mixed $data Data to encode
2727
* @param string $format Format name
28-
* @param array $context options that normalizers/encoders have access to.
28+
* @param array $context options that normalizers/encoders have access to
2929
*
3030
* @return scalar
3131
*

Encoder/XmlEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ private function resolveXmlRootName(array $context = array())
511511
/**
512512
* Create a DOM document, taking serializer options into account.
513513
*
514-
* @param array $context options that the encoder has access to.
514+
* @param array $context options that the encoder has access to
515515
*
516516
* @return \DOMDocument
517517
*/

Mapping/ClassMetadataInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ interface ClassMetadataInterface
2727
/**
2828
* Returns the name of the backing PHP class.
2929
*
30-
* @return string The name of the backing class.
30+
* @return string The name of the backing class
3131
*/
3232
public function getName();
3333

NameConverter/CamelCaseToSnakeCaseNameConverter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
2929
private $lowerCamelCase;
3030

3131
/**
32-
* @param null|array $attributes The list of attributes to rename or null for all attributes.
33-
* @param bool $lowerCamelCase Use lowerCamelCase style.
32+
* @param null|array $attributes The list of attributes to rename or null for all attributes
33+
* @param bool $lowerCamelCase Use lowerCamelCase style
3434
*/
3535
public function __construct(array $attributes = null, $lowerCamelCase = true)
3636
{

Normalizer/CustomNormalizer.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public function denormalize($data, $class, $format = null, array $context = arra
4343
/**
4444
* Checks if the given class implements the NormalizableInterface.
4545
*
46-
* @param mixed $data Data to normalize.
47-
* @param string $format The format being (de-)serialized from or into.
46+
* @param mixed $data Data to normalize
47+
* @param string $format The format being (de-)serialized from or into
4848
*
4949
* @return bool
5050
*/
@@ -56,9 +56,9 @@ public function supportsNormalization($data, $format = null)
5656
/**
5757
* Checks if the given class implements the NormalizableInterface.
5858
*
59-
* @param mixed $data Data to denormalize from.
60-
* @param string $type The class to which the data should be denormalized.
61-
* @param string $format The format being deserialized from.
59+
* @param mixed $data Data to denormalize from
60+
* @param string $type The class to which the data should be denormalized
61+
* @param string $format The format being deserialized from
6262
*
6363
* @return bool
6464
*/

Normalizer/DenormalizableInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface DenormalizableInterface
2929
*
3030
* @param DenormalizerInterface $denormalizer The denormalizer is given so that you
3131
* can use it to denormalize objects contained within this object
32-
* @param array|scalar $data The data from which to re-create the object.
32+
* @param array|scalar $data The data from which to re-create the object
3333
* @param string|null $format The format is optionally given to be able to denormalize differently
3434
* based on different input formats
3535
* @param array $context options for denormalizing

Normalizer/DenormalizerInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
3333
/**
3434
* Checks whether the given class is supported for denormalization by this normalizer.
3535
*
36-
* @param mixed $data Data to denormalize from.
37-
* @param string $type The class to which the data should be denormalized.
38-
* @param string $format The format being deserialized from.
36+
* @param mixed $data Data to denormalize from
37+
* @param string $type The class to which the data should be denormalized
38+
* @param string $format The format being deserialized from
3939
*
4040
* @return bool
4141
*/

Normalizer/GetSetMethodNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private function supports($class)
111111
*
112112
* @param \ReflectionMethod $method the method to check
113113
*
114-
* @return bool whether the method is a getter or boolean getter.
114+
* @return bool whether the method is a getter or boolean getter
115115
*/
116116
private function isGetMethod(\ReflectionMethod $method)
117117
{

Normalizer/NormalizerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public function normalize($object, $format = null, array $context = array());
3232
/**
3333
* Checks whether the given class is supported for normalization by this normalizer.
3434
*
35-
* @param mixed $data Data to normalize.
36-
* @param string $format The format being (de-)serialized from or into.
35+
* @param mixed $data Data to normalize
36+
* @param string $format The format being (de-)serialized from or into
3737
*
3838
* @return bool
3939
*/

0 commit comments

Comments
 (0)