Skip to content

Commit 461b783

Browse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: fixed types in phpdocs fixed types in phpdocs Conflicts: src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ElementMetadata.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/MetadataFactoryInterface.php
2 parents d0094ab + bb3f403 commit 461b783

11 files changed

+24
-24
lines changed

‎Encoder/ChainEncoder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function supportsEncoding($format)
5757
*
5858
* @param string $format
5959
*
60-
* @return Boolean
60+
* @return bool
6161
*/
6262
public function needsNormalization($format)
6363
{

‎Encoder/DecoderInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function decode($data, $format, array $context = array());
4343
*
4444
* @param string $format format name
4545
*
46-
* @return Boolean
46+
* @return bool
4747
*/
4848
public function supportsDecoding($format);
4949
}

‎Encoder/EncoderInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function encode($data, $format, array $context = array());
3838
*
3939
* @param string $format format name
4040
*
41-
* @return Boolean
41+
* @return bool
4242
*/
4343
public function supportsEncoding($format);
4444
}

‎Encoder/JsonDecode.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class JsonDecode implements DecoderInterface
2323
/**
2424
* Specifies if the returned result should be an associative array or a nested stdClass object hierarchy.
2525
*
26-
* @var Boolean
26+
* @var bool
2727
*/
2828
private $associative;
2929

3030
/**
3131
* Specifies the recursion depth.
3232
*
33-
* @var integer
33+
* @var int
3434
*/
3535
private $recursionDepth;
3636

@@ -53,7 +53,7 @@ public function __construct($associative = false, $depth = 512)
5353
/**
5454
* Returns the last decoding error (if any).
5555
*
56-
* @return integer
56+
* @return int
5757
*
5858
* @deprecated since 2.5, decode() throws an exception if error found, will be removed in 3.0
5959
*

‎Encoder/JsonEncode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct($bitmask = 0)
3131
/**
3232
* Returns the last encoding error (if any).
3333
*
34-
* @return integer
34+
* @return int
3535
*
3636
* @deprecated since 2.5, encode() throws an exception if error found, will be removed in 3.0
3737
*

‎Encoder/JsonEncoder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
3939
/**
4040
* Returns the last encoding error (if any)
4141
*
42-
* @return integer
42+
* @return int
4343
*
4444
* @deprecated since 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0
4545
*/
@@ -51,7 +51,7 @@ public function getLastEncodingError()
5151
/**
5252
* Returns the last decoding error (if any)
5353
*
54-
* @return integer
54+
* @return int
5555
*
5656
* @deprecated since 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0
5757
*/

‎Encoder/XmlEncoder.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function getRootNodeName()
156156
* @param \DOMNode $node
157157
* @param string $val
158158
*
159-
* @return Boolean
159+
* @return bool
160160
*/
161161
final protected function appendXMLString(\DOMNode $node, $val)
162162
{
@@ -175,7 +175,7 @@ final protected function appendXMLString(\DOMNode $node, $val)
175175
* @param \DOMNode $node
176176
* @param string $val
177177
*
178-
* @return Boolean
178+
* @return bool
179179
*/
180180
final protected function appendText(\DOMNode $node, $val)
181181
{
@@ -189,7 +189,7 @@ final protected function appendText(\DOMNode $node, $val)
189189
* @param \DOMNode $node
190190
* @param string $val
191191
*
192-
* @return Boolean
192+
* @return bool
193193
*/
194194
final protected function appendCData(\DOMNode $node, $val)
195195
{
@@ -203,7 +203,7 @@ final protected function appendCData(\DOMNode $node, $val)
203203
* @param \DOMNode $node
204204
* @param \DOMDocumentFragment $fragment
205205
*
206-
* @return Boolean
206+
* @return bool
207207
*/
208208
final protected function appendDocumentFragment(\DOMNode $node, $fragment)
209209
{
@@ -221,7 +221,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment)
221221
*
222222
* @param string $name
223223
*
224-
* @return Boolean
224+
* @return bool
225225
*/
226226
final protected function isElementNameValid($name)
227227
{
@@ -341,7 +341,7 @@ private function parseXmlValue(\DOMNode $node)
341341
* @param array|object $data
342342
* @param string|null $xmlRootNodeName
343343
*
344-
* @return Boolean
344+
* @return bool
345345
*
346346
* @throws UnexpectedValueException
347347
*/
@@ -410,7 +410,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
410410
* @param string $nodeName
411411
* @param string $key
412412
*
413-
* @return Boolean
413+
* @return bool
414414
*/
415415
private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
416416
{
@@ -432,7 +432,7 @@ private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
432432
*
433433
* @param string $val
434434
*
435-
* @return Boolean
435+
* @return bool
436436
*/
437437
private function needsCdataWrapping($val)
438438
{
@@ -445,7 +445,7 @@ private function needsCdataWrapping($val)
445445
* @param \DOMNode $node
446446
* @param mixed $val
447447
*
448-
* @return Boolean
448+
* @return bool
449449
*/
450450
private function selectNodeType(\DOMNode $node, $val)
451451
{

‎Normalizer/CustomNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
4141
* @param mixed $data Data to normalize.
4242
* @param string $format The format being (de-)serialized from or into.
4343
*
44-
* @return Boolean
44+
* @return bool
4545
*/
4646
public function supportsNormalization($data, $format = null)
4747
{
@@ -55,7 +55,7 @@ public function supportsNormalization($data, $format = null)
5555
* @param string $type The class to which the data should be denormalized.
5656
* @param string $format The format being deserialized from.
5757
*
58-
* @return Boolean
58+
* @return bool
5959
*/
6060
public function supportsDenormalization($data, $type, $format = null)
6161
{

‎Normalizer/DenormalizerInterface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
3737
* @param string $type The class to which the data should be denormalized.
3838
* @param string $format The format being deserialized from.
3939
*
40-
* @return Boolean
40+
* @return bool
4141
*/
4242
public function supportsDenormalization($data, $type, $format = null);
4343
}

‎Normalizer/GetSetMethodNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function supportsDenormalization($data, $type, $format = null)
210210
*
211211
* @param string $class
212212
*
213-
* @return Boolean
213+
* @return bool
214214
*/
215215
private function supports($class)
216216
{
@@ -230,7 +230,7 @@ private function supports($class)
230230
*
231231
* @param \ReflectionMethod $method the method to check
232232
*
233-
* @return Boolean whether the method is a getter or boolean getter.
233+
* @return bool whether the method is a getter or boolean getter.
234234
*/
235235
private function isGetMethod(\ReflectionMethod $method)
236236
{

0 commit comments

Comments
 (0)