Merge branch '2.5' into 2.6

* 2.5:
  [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
	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php

Author: fabpot

Encoder/JsonDecode.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
- * Decodes JSON data
+ * Decodes JSON data.
  *
  * @author Sander Coolen <[email protected]>
  */

Encoder/JsonEncoder.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Encoder;
 
 /**
- * Encodes JSON data
+ * Encodes JSON data.
  *
  * @author Jordi Boggiano <[email protected]>
  */

Encoder/XmlEncoder.php

@@ -377,7 +377,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
                         /**
                          * Create nodes to append to $parentNode based on the $key of this array
                          * Produces <xml><item>0</item><item>1</item></xml>
-                         * From array("item" => array(0,1));
+                         * From array("item" => array(0,1));.
                          */
                         foreach ($data as $subData) {
                             $append = $this->appendNode($parentNode, $subData, $key);

Exception/Exception.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * Base exception
+ * Base exception.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */

Exception/InvalidArgumentException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * InvalidArgumentException
+ * InvalidArgumentException.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */

Exception/LogicException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * LogicException
+ * LogicException.
  *
  * @author Lukas Kahwe Smith <[email protected]>
  */

Exception/RuntimeException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * RuntimeException
+ * RuntimeException.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */

Exception/UnexpectedValueException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * UnexpectedValueException
+ * UnexpectedValueException.
  *
  * @author Lukas Kahwe Smith <[email protected]>
  */

Exception/UnsupportedException.php

@@ -12,7 +12,7 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * UnsupportedException
+ * UnsupportedException.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */