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 files changed, 4 insertions, 3 deletions

diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 1d40c8d..0585204 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -30,14 +30,14 @@ class ClassUtils
     const MARKER = '__CG__';
 
     /**
-     * Length of the proxy marker
+     * Length of the proxy marker.
      *
      * @var int
      */
     const MARKER_LENGTH = 6;
 
     /**
-     * This class should not be instantiated
+     * This class should not be instantiated.
      */
     private function __construct()
     {
@@ -47,6 +47,7 @@ class ClassUtils
      * Gets the real class name of a class name that could be a proxy.
      *
      * @param string|object
+     *
      * @return string
      */
     public static function getRealClass($object)
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
index f326fe0..e8f3e3b 100644
--- a/Core/Util/StringUtils.php
+++ b/Core/Util/StringUtils.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\Security\Core\Util;
 class StringUtils
 {
     /**
-     * This class should not be instantiated
+     * This class should not be instantiated.
      */
     private function __construct()
     {