[Finder] Fixed leading/trailing / in filename

lyrixx · lyrixx · commit e17a63457aa0 · 2018-03-20T15:14:56.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/SplFileInfo.php b/src/Symfony/Component/Finder/SplFileInfo.php
@@ -28,7 +28,7 @@ class SplFileInfo extends \SplFileInfo
      */
     public function __construct($file, $relativePath, $relativePathname)
     {
-        parent::__construct($file);
+        parent::__construct(realpath($file) ?: $file);
         $this->relativePath = $relativePath;
         $this->relativePathname = $relativePathname;
     }
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -48,6 +48,20 @@ public function testFiles()
         $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')), $finder->in(self::$tmpDir)->getIterator());
     }
 
+    public function testRemoveTrailingSlash()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('This test cannot be run on Windows.');
+        }
+
+        $finder = $this->buildFinder();
+
+        $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar'));
+        $in = '//'.realpath(self::$tmpDir).'//';
+
+        $this->assertIterator($expected, $finder->in($in)->files()->getIterator());
+    }
+
     public function testDepth()
     {
         $finder = $this->buildFinder();
@@ -504,8 +518,8 @@ public function testMultipleLocationsWithSubDirectories()
         $finder->in($locations)->depth('< 10')->name('*.neon');
 
         $expected = array(
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
+            __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
         );
 
         $this->assertIterator($expected, $finder);
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php
@@ -31,7 +31,7 @@ public function testSubPath($baseDir, array $paths, array $subPaths, array $subP
 
     public function getSubPathData()
     {
-        $tmpDir = sys_get_temp_dir().'/symfony_finder';
+        $tmpDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfony_finder';
 
         return array(
             array(

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class SplFileInfo extends \SplFileInfo`
`28`	`28`	`*/`
`29`	`29`	`public function __construct($file, $relativePath, $relativePathname)`
`30`	`30`	`{`
`31`		`- parent::__construct($file);`
	`31`	`+ parent::__construct(realpath($file) ?: $file);`
`32`	`32`	`$this->relativePath = $relativePath;`
`33`	`33`	`$this->relativePathname = $relativePathname;`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testSubPath($baseDir, array $paths, array $subPaths, array $subP`
`31`	`31`
`32`	`32`	`public function getSubPathData()`
`33`	`33`	`{`
`34`		`- $tmpDir = sys_get_temp_dir().'/symfony_finder';`
	`34`	`+ $tmpDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfony_finder';`
`35`	`35`
`36`	`36`	`return array(`
`37`	`37`	`array(`