Skip to content

Commit bb3f403

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.4
* 2.3: fixed types in phpdocs Conflicts: src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Templating/PhpEngine.php
2 parents 4476c94 + 0bc1cf7 commit bb3f403

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
@@ -39,7 +39,7 @@ public function decode($data, $format, array $context = array());
3939
*
4040
* @param string $format format name
4141
*
42-
* @return Boolean
42+
* @return bool
4343
*/
4444
public function supportsDecoding($format);
4545
}

‎Encoder/EncoderInterface.php‎

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

‎Encoder/JsonDecode.php‎

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

2828
/**
2929
* Specifies the recursion depth.
3030
*
31-
* @var integer
31+
* @var int
3232
*/
3333
private $recursionDepth;
3434

@@ -50,7 +50,7 @@ public function __construct($associative = false, $depth = 512)
5050
/**
5151
* Returns the last decoding error (if any).
5252
*
53-
* @return integer
53+
* @return int
5454
*
5555
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
5656
*/

‎Encoder/JsonEncode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct($bitmask = 0)
2929
/**
3030
* Returns the last encoding error (if any)
3131
*
32-
* @return integer
32+
* @return int
3333
*
3434
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
3535
*/

‎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
public function getLastEncodingError()
4545
{
@@ -49,7 +49,7 @@ public function getLastEncodingError()
4949
/**
5050
* Returns the last decoding error (if any)
5151
*
52-
* @return integer
52+
* @return int
5353
*/
5454
public function getLastDecodingError()
5555
{

‎Encoder/XmlEncoder.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function getRootNodeName()
155155
* @param \DOMNode $node
156156
* @param string $val
157157
*
158-
* @return Boolean
158+
* @return bool
159159
*/
160160
final protected function appendXMLString(\DOMNode $node, $val)
161161
{
@@ -174,7 +174,7 @@ final protected function appendXMLString(\DOMNode $node, $val)
174174
* @param \DOMNode $node
175175
* @param string $val
176176
*
177-
* @return Boolean
177+
* @return bool
178178
*/
179179
final protected function appendText(\DOMNode $node, $val)
180180
{
@@ -188,7 +188,7 @@ final protected function appendText(\DOMNode $node, $val)
188188
* @param \DOMNode $node
189189
* @param string $val
190190
*
191-
* @return Boolean
191+
* @return bool
192192
*/
193193
final protected function appendCData(\DOMNode $node, $val)
194194
{
@@ -202,7 +202,7 @@ final protected function appendCData(\DOMNode $node, $val)
202202
* @param \DOMNode $node
203203
* @param \DOMDocumentFragment $fragment
204204
*
205-
* @return Boolean
205+
* @return bool
206206
*/
207207
final protected function appendDocumentFragment(\DOMNode $node, $fragment)
208208
{
@@ -220,7 +220,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment)
220220
*
221221
* @param string $name
222222
*
223-
* @return Boolean
223+
* @return bool
224224
*/
225225
final protected function isElementNameValid($name)
226226
{
@@ -287,7 +287,7 @@ private function parseXml(\SimpleXmlElement $node)
287287
* @param array|object $data
288288
* @param string|null $xmlRootNodeName
289289
*
290-
* @return Boolean
290+
* @return bool
291291
*
292292
* @throws UnexpectedValueException
293293
*/
@@ -356,7 +356,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
356356
* @param string $nodeName
357357
* @param string $key
358358
*
359-
* @return Boolean
359+
* @return bool
360360
*/
361361
private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
362362
{
@@ -378,7 +378,7 @@ private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
378378
*
379379
* @param string $val
380380
*
381-
* @return Boolean
381+
* @return bool
382382
*/
383383
private function needsCdataWrapping($val)
384384
{
@@ -391,7 +391,7 @@ private function needsCdataWrapping($val)
391391
* @param \DOMNode $node
392392
* @param mixed $val
393393
*
394-
* @return Boolean
394+
* @return bool
395395
*/
396396
private function selectNodeType(\DOMNode $node, $val)
397397
{

‎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
@@ -198,7 +198,7 @@ public function supportsDenormalization($data, $type, $format = null)
198198
*
199199
* @param string $class
200200
*
201-
* @return Boolean
201+
* @return bool
202202
*/
203203
private function supports($class)
204204
{
@@ -218,7 +218,7 @@ private function supports($class)
218218
*
219219
* @param \ReflectionMethod $method the method to check
220220
*
221-
* @return Boolean whether the method is a getter.
221+
* @return bool whether the method is a getter.
222222
*/
223223
private function isGetMethod(\ReflectionMethod $method)
224224
{

0 commit comments

Comments
 (0)