[Finder] Fixed leading/trailing / in filename

lyrixx · lyrixx · commit adb48adb0f56 · 2018-02-27T19:48:35.000+01:00
Without this patch, we go this:

```
--- Expected
+++ Actual
@@ @@
 Array (
-    0 =&gt; '/tmp/symfony_finder/foo bar'
-    1 =&gt; '/tmp/symfony_finder/foo/bar.tmp'
-    2 =&gt; '/tmp/symfony_finder/test.php'
-    3 =&gt; '/tmp/symfony_finder/test.py'
+    0 =&gt; '///tmp/symfony_finder///foo bar'
+    1 =&gt; '///tmp/symfony_finder///foo/bar.tmp'
+    2 =&gt; '///tmp/symfony_finder///test.php'
+    3 =&gt; '///tmp/symfony_finder///test.py'
 )
```
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -633,6 +633,8 @@ public function in($dirs)
             }
         }
 
+        $resolvedDirs = array_map('realpath', $resolvedDirs);
+
         $this->dirs = array_merge($this->dirs, $resolvedDirs);
 
         return $this;
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -45,9 +45,21 @@ public function testFiles()
         $finder->files();
         $finder->directories();
         $finder->files();
+
         $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')), $finder->in(self::$tmpDir)->getIterator());
     }
 
+    public function testRemoveTrailingSlash()
+    {
+        $finder = $this->buildFinder();
+
+        $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar'));
+        $in = realpath(self::$tmpDir);
+        $in = '//'.realpath(self::$tmpDir).'//';
+
+        $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+    }
+
     public function testDepth()
     {
         $finder = $this->buildFinder();

Original file line number	Diff line number	Diff line change
`@@ -633,6 +633,8 @@ public function in($dirs)`
`633`	`633`	`}`
`634`	`634`	`}`
`635`	`635`
	`636`	`+ $resolvedDirs = array_map('realpath', $resolvedDirs);`
	`637`	`+`
`636`	`638`	`$this->dirs = array_merge($this->dirs, $resolvedDirs);`
`637`	`639`
`638`	`640`	`return $this;`