Skip to content

Commit f089b9e

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] CS And DocBlock Fixes [2.3] CS Fixes Conflicts: src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2 parents e5255fc + 699c735 commit f089b9e

25 files changed

+45
-42
lines changed

Encoder/ChainDecoder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public function supportsDecoding($format)
5858
* @param string $format
5959
*
6060
* @return DecoderInterface
61+
*
6162
* @throws RuntimeException if no decoder is found
6263
*/
6364
private function getDecoder($format)

Encoder/ChainEncoder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function needsNormalization($format)
8080
* @param string $format
8181
*
8282
* @return EncoderInterface
83+
*
8384
* @throws RuntimeException if no encoder is found
8485
*/
8586
private function getEncoder($format)

Encoder/DecoderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
1515

1616
/**
17-
* Defines the interface of decoders
17+
* Defines the interface of decoders.
1818
*
1919
* @author Jordi Boggiano <[email protected]>
2020
*/

Encoder/EncoderInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
1515

1616
/**
17-
* Defines the interface of encoders
17+
* Defines the interface of encoders.
1818
*
1919
* @author Jordi Boggiano <[email protected]>
2020
*/
2121
interface EncoderInterface
2222
{
2323
/**
24-
* Encodes data into the given format
24+
* Encodes data into the given format.
2525
*
2626
* @param mixed $data Data to encode
2727
* @param string $format Format name
@@ -34,7 +34,7 @@ interface EncoderInterface
3434
public function encode($data, $format, array $context = array());
3535

3636
/**
37-
* Checks whether the serializer can encode to given format
37+
* Checks whether the serializer can encode to given format.
3838
*
3939
* @param string $format format name
4040
*

Encoder/JsonDecode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
1515

1616
/**
17-
* Decodes JSON data
17+
* Decodes JSON data.
1818
*
1919
* @author Sander Coolen <[email protected]>
2020
*/

Encoder/JsonEncode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
1515

1616
/**
17-
* Encodes JSON data
17+
* Encodes JSON data.
1818
*
1919
* @author Sander Coolen <[email protected]>
2020
*/
@@ -43,7 +43,7 @@ public function getLastError()
4343
}
4444

4545
/**
46-
* Encodes PHP data to a JSON string
46+
* Encodes PHP data to a JSON string.
4747
*
4848
* {@inheritdoc}
4949
*/

Encoder/JsonEncoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Encoder;
1313

1414
/**
15-
* Encodes JSON data
15+
* Encodes JSON data.
1616
*
1717
* @author Jordi Boggiano <[email protected]>
1818
*/
@@ -37,7 +37,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
3737
}
3838

3939
/**
40-
* Returns the last encoding error (if any)
40+
* Returns the last encoding error (if any).
4141
*
4242
* @return int
4343
*
@@ -49,7 +49,7 @@ public function getLastEncodingError()
4949
}
5050

5151
/**
52-
* Returns the last decoding error (if any)
52+
* Returns the last decoding error (if any).
5353
*
5454
* @return int
5555
*

Encoder/NormalizationAwareInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Encoder;
1313

1414
/**
15-
* Defines the interface of encoders that will normalize data themselves
15+
* Defines the interface of encoders that will normalize data themselves.
1616
*
1717
* Implementing this interface essentially just tells the Serializer that the
1818
* data should not be pre-normalized before being passed to this Encoder.

Encoder/SerializerAwareEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Serializer\SerializerAwareInterface;
1616

1717
/**
18-
* SerializerAware Encoder implementation
18+
* SerializerAware Encoder implementation.
1919
*
2020
* @author Jordi Boggiano <[email protected]>
2121
*/

Encoder/XmlEncoder.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
1515

1616
/**
17-
* Encodes XML data
17+
* Encodes XML data.
1818
*
1919
* @author Jordi Boggiano <[email protected]>
2020
* @author John Wards <[email protected]>
@@ -134,7 +134,7 @@ public function supportsDecoding($format)
134134
}
135135

136136
/**
137-
* Sets the root node name
137+
* Sets the root node name.
138138
*
139139
* @param string $name root node name
140140
*/
@@ -144,7 +144,8 @@ public function setRootNodeName($name)
144144
}
145145

146146
/**
147-
* Returns the root node name
147+
* Returns the root node name.
148+
*
148149
* @return string
149150
*/
150151
public function getRootNodeName()
@@ -217,7 +218,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment)
217218
}
218219

219220
/**
220-
* Checks the name is a valid xml element name
221+
* Checks the name is a valid xml element name.
221222
*
222223
* @param string $name
223224
*
@@ -335,7 +336,7 @@ private function parseXmlValue(\DOMNode $node)
335336
}
336337

337338
/**
338-
* Parse the data and convert it to DOMElements
339+
* Parse the data and convert it to DOMElements.
339340
*
340341
* @param \DOMNode $parentNode
341342
* @param array|object $data
@@ -364,7 +365,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
364365
/**
365366
* Create nodes to append to $parentNode based on the $key of this array
366367
* Produces <xml><item>0</item><item>1</item></xml>
367-
* From array("item" => array(0,1));
368+
* From array("item" => array(0,1));.
368369
*/
369370
foreach ($data as $subData) {
370371
$append = $this->appendNode($parentNode, $subData, $key);
@@ -440,7 +441,7 @@ private function needsCdataWrapping($val)
440441
}
441442

442443
/**
443-
* Tests the value being passed and decide what sort of element to create
444+
* Tests the value being passed and decide what sort of element to create.
444445
*
445446
* @param \DOMNode $node
446447
* @param mixed $val

Exception/Exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* Base exception
15+
* Base exception.
1616
*
1717
* @author Johannes M. Schmitt <[email protected]>
1818
*/

Exception/InvalidArgumentException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* InvalidArgumentException
15+
* InvalidArgumentException.
1616
*
1717
* @author Johannes M. Schmitt <[email protected]>
1818
*/

Exception/LogicException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* LogicException
15+
* LogicException.
1616
*
1717
* @author Lukas Kahwe Smith <[email protected]>
1818
*/

Exception/RuntimeException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* RuntimeException
15+
* RuntimeException.
1616
*
1717
* @author Johannes M. Schmitt <[email protected]>
1818
*/

Exception/UnexpectedValueException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* UnexpectedValueException
15+
* UnexpectedValueException.
1616
*
1717
* @author Lukas Kahwe Smith <[email protected]>
1818
*/

Exception/UnsupportedException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Exception;
1313

1414
/**
15-
* UnsupportedException
15+
* UnsupportedException.
1616
*
1717
* @author Johannes M. Schmitt <[email protected]>
1818
*/

Normalizer/DenormalizableInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Normalizer;
1313

1414
/**
15-
* Defines the most basic interface a class must implement to be denormalizable
15+
* Defines the most basic interface a class must implement to be denormalizable.
1616
*
1717
* If a denormalizer is registered for the class and it doesn't implement
1818
* the Denormalizable interfaces, the normalizer will be used instead

Normalizer/DenormalizerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
interface DenormalizerInterface
2020
{
2121
/**
22-
* Denormalizes data back into an object of the given class
22+
* Denormalizes data back into an object of the given class.
2323
*
2424
* @param mixed $data data to restore
2525
* @param string $class the expected class to instantiate
@@ -31,7 +31,7 @@ interface DenormalizerInterface
3131
public function denormalize($data, $class, $format = null, array $context = array());
3232

3333
/**
34-
* Checks whether the given class is supported for denormalization by this normalizer
34+
* Checks whether the given class is supported for denormalization by this normalizer.
3535
*
3636
* @param mixed $data Data to denormalize from.
3737
* @param string $type The class to which the data should be denormalized.

Normalizer/GetSetMethodNormalizer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function setCallbacks(array $callbacks)
6262
}
6363

6464
/**
65-
* Set ignored attributes for normalization
65+
* Set ignored attributes for normalization.
6666
*
6767
* @param array $ignoredAttributes
6868
*
@@ -76,7 +76,7 @@ public function setIgnoredAttributes(array $ignoredAttributes)
7676
}
7777

7878
/**
79-
* Set attributes to be camelized on denormalize
79+
* Set attributes to be camelized on denormalize.
8080
*
8181
* @param array $camelizedAttributes
8282
*
@@ -185,7 +185,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
185185
/**
186186
* Format attribute name to access parameters or methods
187187
* As option, if attribute name is found on camelizedAttributes array
188-
* returns attribute name in camelcase format
188+
* returns attribute name in camelcase format.
189189
*
190190
* @param string $attributeName
191191
*

Normalizer/NormalizableInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Serializer\Normalizer;
1313

1414
/**
15-
* Defines the most basic interface a class must implement to be normalizable
15+
* Defines the most basic interface a class must implement to be normalizable.
1616
*
1717
* If a normalizer is registered for the class and it doesn't implement
1818
* the Normalizable interfaces, the normalizer will be used instead

Normalizer/NormalizerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
interface NormalizerInterface
2020
{
2121
/**
22-
* Normalizes an object into a set of arrays/scalars
22+
* Normalizes an object into a set of arrays/scalars.
2323
*
2424
* @param object $object object to normalize
2525
* @param string $format format the normalization result will be encoded as
@@ -30,7 +30,7 @@ interface NormalizerInterface
3030
public function normalize($object, $format = null, array $context = array());
3131

3232
/**
33-
* Checks whether the given class is supported for normalization by this normalizer
33+
* Checks whether the given class is supported for normalization by this normalizer.
3434
*
3535
* @param mixed $data Data to normalize.
3636
* @param string $format The format being (de-)serialized from or into.

Normalizer/SerializerAwareNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Serializer\SerializerAwareInterface;
1616

1717
/**
18-
* SerializerAware Normalizer implementation
18+
* SerializerAware Normalizer implementation.
1919
*
2020
* @author Jordi Boggiano <[email protected]>
2121
*/

Serializer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
2222

2323
/**
24-
* Serializer serializes and deserializes data
24+
* Serializer serializes and deserializes data.
2525
*
2626
* objects are turned into arrays by normalizers
2727
* arrays are turned into various output formats by encoders
@@ -219,7 +219,7 @@ final public function decode($data, $format, array $context = array())
219219
}
220220

221221
/**
222-
* Normalizes an object into a set of arrays/scalars
222+
* Normalizes an object into a set of arrays/scalars.
223223
*
224224
* @param object $object object to normalize
225225
* @param string $format format name, present to give the option to normalizers to act differently based on formats
@@ -243,7 +243,7 @@ private function normalizeObject($object, $format, array $context = array())
243243
}
244244

245245
/**
246-
* Denormalizes data back into an object of the given class
246+
* Denormalizes data back into an object of the given class.
247247
*
248248
* @param mixed $data data to restore
249249
* @param string $class the expected class to instantiate

SerializerAwareInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
namespace Symfony\Component\Serializer;
1313

1414
/**
15-
* Defines the interface of encoders
15+
* Defines the interface of encoders.
1616
*
1717
* @author Jordi Boggiano <[email protected]>
1818
*/
1919
interface SerializerAwareInterface
2020
{
2121
/**
22-
* Sets the owning Serializer object
22+
* Sets the owning Serializer object.
2323
*
2424
* @param SerializerInterface $serializer
2525
*/

SerializerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
namespace Symfony\Component\Serializer;
1313

1414
/**
15-
* Defines the interface of the Serializer
15+
* Defines the interface of the Serializer.
1616
*
1717
* @author Jordi Boggiano <[email protected]>
1818
*/
1919
interface SerializerInterface
2020
{
2121
/**
22-
* Serializes data in the appropriate format
22+
* Serializes data in the appropriate format.
2323
*
2424
* @param mixed $data any data
2525
* @param string $format format name

0 commit comments

Comments
 (0)