Skip to content

Commit cd2a4d9

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
2 parents 3c632bf + 505e644 commit cd2a4d9

9 files changed

+9
-9
lines changed

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/JsonEncoder.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-
* Encodes JSON data
15+
* Encodes JSON data.
1616
*
1717
* @author Jordi Boggiano <[email protected]>
1818
*/

Encoder/XmlEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
378378
/**
379379
* Create nodes to append to $parentNode based on the $key of this array
380380
* Produces <xml><item>0</item><item>1</item></xml>
381-
* From array("item" => array(0,1));
381+
* From array("item" => array(0,1));.
382382
*/
383383
foreach ($data as $subData) {
384384
$append = $this->appendNode($parentNode, $subData, $key);

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
*/

0 commit comments

Comments
 (0)