From e0e5f0c3795399528b8232f189f42c80f00f1144 Mon Sep 17 00:00:00 2001
From: Roland Franssen <franssen.roland@gmail.com>
Date: Sat, 13 Aug 2016 10:02:45 +0000
Subject: [PATCH] apply rtrim

---
 .../Iterator/ExcludeDirectoryFilterIterator.php    |  3 ++-
 .../ExcludeDirectoryFilterIteratorTest.php         | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
index b7bb3c4f31..3f5a5dfeb1 100644
--- a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -35,6 +35,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
         $this->isRecursive = $iterator instanceof \RecursiveIterator;
         $patterns = array();
         foreach ($directories as $directory) {
+            $directory = rtrim($directory, '/');
             if (!$this->isRecursive || false !== strpos($directory, '/')) {
                 $patterns[] = preg_quote($directory, '#');
             } else {
@@ -51,7 +52,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
     /**
      * Filters the iterator values.
      *
-     * @return bool true if the value should be kept, false otherwise
+     * @return bool True if the value should be kept, false otherwise
      */
     public function accept()
     {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
index c5f4ba495a..fa192c31f4 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
@@ -58,9 +58,23 @@ class ExcludeDirectoryFilterIteratorTest extends RealIteratorTestCase
             'foo bar',
         );
 
+        $toto = array(
+            '.bar',
+            '.foo',
+            '.foo/.bar',
+            '.foo/bar',
+            '.git',
+            'test.py',
+            'foo',
+            'foo/bar.tmp',
+            'test.php',
+            'foo bar',
+        );
+
         return array(
             array(array('foo'), $this->toAbsolute($foo)),
             array(array('fo'), $this->toAbsolute($fo)),
+            array(array('toto/'), $this->toAbsolute($toto)),
         );
     }
 }