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
symfony · Dec 22, 2014 · 3163e33 · 3163e33
2 parents 5f69e63 + b3f0147
commit 3163e33
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/Comparator/NumberComparator.php b/Comparator/NumberComparator.php
@@ -27,7 +27,6 @@
  *
  * @author    Fabien Potencier <fabien@symfony.com> PHP port
  * @author    Richard Clamp <richardc@unixbeard.net> Perl version
- *
  * @copyright 2004-2005 Fabien Potencier <fabien@symfony.com>
  * @copyright 2002 Richard Clamp <richardc@unixbeard.net>
  *

diff --git a/Iterator/RecursiveDirectoryIterator.php b/Iterator/RecursiveDirectoryIterator.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Finder\SplFileInfo;
 
 /**
- * Extends the \RecursiveDirectoryIterator to support relative paths
+ * Extends the \RecursiveDirectoryIterator to support relative paths.
  *
  * @author Victor Berchet <victor@suumit.com>
  */
@@ -51,7 +51,7 @@ public function __construct($path, $flags, $ignoreUnreadableDirs = false)
     }
 
     /**
-     * Return an instance of SplFileInfo with support for relative paths
+     * Return an instance of SplFileInfo with support for relative paths.
      *
      * @return SplFileInfo File information
      */
@@ -87,7 +87,7 @@ public function getChildren()
     }
 
     /**
-     * Do nothing for non rewindable stream
+     * Do nothing for non rewindable stream.
      */
     public function rewind()
     {

diff --git a/SplFileInfo.php b/SplFileInfo.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Finder;
 
 /**
- * Extends \SplFileInfo to support relative paths
+ * Extends \SplFileInfo to support relative paths.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -22,7 +22,7 @@ class SplFileInfo extends \SplFileInfo
     private $relativePathname;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param string $file             The file name
      * @param string $relativePath     The relative path
@@ -36,7 +36,7 @@ public function __construct($file, $relativePath, $relativePathname)
     }
 
     /**
-     * Returns the relative path
+     * Returns the relative path.
      *
      * @return string the relative path
      */
@@ -46,7 +46,7 @@ public function getRelativePath()
     }
 
     /**
-     * Returns the relative path name
+     * Returns the relative path name.
      *
      * @return string the relative path name
      */
@@ -56,7 +56,7 @@ public function getRelativePathname()
     }
 
     /**
-     * Returns the contents of the file
+     * Returns the contents of the file.
      *
      * @return string the contents of the file
      *

diff --git a/Tests/Expression/RegexTest.php b/Tests/Expression/RegexTest.php
@@ -23,7 +23,7 @@ public function testHasFlags($regex, $start, $end)
         $expr = new Expression($regex);
 
         $this->assertEquals($start, $expr->getRegex()->hasStartFlag());
-        $this->assertEquals($end,   $expr->getRegex()->hasEndFlag());
+        $this->assertEquals($end, $expr->getRegex()->hasEndFlag());
     }
 
     /**
@@ -34,7 +34,7 @@ public function testHasJokers($regex, $start, $end)
         $expr = new Expression($regex);
 
         $this->assertEquals($start, $expr->getRegex()->hasStartJoker());
-        $this->assertEquals($end,   $expr->getRegex()->hasEndJoker());
+        $this->assertEquals($end, $expr->getRegex()->hasEndJoker());
     }
 
     /**

diff --git a/Tests/Iterator/IteratorTestCase.php b/Tests/Iterator/IteratorTestCase.php
@@ -60,7 +60,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
     }
 
     /**
-     * Same as IteratorTestCase::assertIterator with foreach usage
+     * Same as IteratorTestCase::assertIterator with foreach usage.
      *
      * @param array        $expected
      * @param \Traversable $iterator
@@ -80,7 +80,7 @@ protected function assertIteratorInForeach($expected, \Traversable $iterator)
     }
 
     /**
-     * Same as IteratorTestCase::assertOrderedIterator with foreach usage
+     * Same as IteratorTestCase::assertOrderedIterator with foreach usage.
      *
      * @param array        $expected
      * @param \Traversable $iterator