bug #28604 [Finder] fixed root directory access for ftp/sftp wrapper (DerDu)

fabpot · fabpot · commit 636eb9e55140 · 2018-10-03T10:46:53.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes #28604). Discussion ---------- [Finder] fixed root directory access for ftp/sftp wrapper | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27423 | License | MIT | Doc PR | symfony/symfony-docs#...  This fixes a flaw introduced in 3.4.7 by #26763 In order to access the root folder with ftp wrapper, there MUST BE a slash present. - Currently: from 3.4.7 on it just ```rtrim``` all seperators (```/```, ```\```) from directories - Now: IF the directory is a (s)ftp:// wrapper (```#^s?ftp://#```) this fix just adds a slash (```/```) again Commits ------- 9630a38 [Finder] fixed root directory access for ftp/sftp wrapper
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -732,12 +732,20 @@ private function searchInDirectory($dir)
     /**
      * Normalizes given directory names by removing trailing slashes.
      *
+     * Excluding: (s)ftp:// wrapper
+     *
      * @param string $dir
      *
      * @return string
      */
     private function normalizeDir($dir)
     {
-        return rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+        $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+
+        if (preg_match('#^s?ftp://#', $dir)) {
+            $dir .= '/';
+        }
+
+        return $dir;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -732,12 +732,20 @@ private function searchInDirectory($dir)`
`732`	`732`	`/**`
`733`	`733`	`* Normalizes given directory names by removing trailing slashes.`
`734`	`734`	`*`
	`735`	`+ * Excluding: (s)ftp:// wrapper`
	`736`	`+ *`
`735`	`737`	`* @param string $dir`
`736`	`738`	`*`
`737`	`739`	`* @return string`
`738`	`740`	`*/`
`739`	`741`	`private function normalizeDir($dir)`
`740`	`742`	`{`
`741`		`- return rtrim($dir, '/'.\DIRECTORY_SEPARATOR);`
	`743`	`+ $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);`
	`744`	`+`
	`745`	`+ if (preg_match('#^s?ftp://#', $dir)) {`
	`746`	`+ $dir .= '/';`
	`747`	`+ }`
	`748`	`+`
	`749`	`+ return $dir;`
`742`	`750`	`}`
`743`	`751`	`}`