bug #34396 [Finder] Allow ssh2 stream wrapper for sftp (damienalexandre)

fabpot · fabpot · commit 1382149a1676 · 2019-11-15T21:28:25.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Finder] Allow ssh2 stream wrapper for sftp Same fix as #28604 but for the ssh2.sftp wrapper. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #28604 maybe | License | MIT | Doc PR | Without this patch, we can't use the finder with ssh2.sftp connections. ```php $connection = \ssh2_connect('host', 22); \ssh2_auth_password($connection, 'user', 'pass'); $sftp = \ssh2_sftp($connection); $path = "ssh2.sftp://".intval($sftp)."/"; $finder = new Finder(); foreach ($finder->in($path)->files() as $directory) { dump(file_get_contents($directory)); } ``` Without the patch: > RecursiveDirectoryIterator::__construct(ssh2.sftp://838): failed to open dir: operation failed Commits ------- e6c9d77 [Finder] Allow ssh2 stream wrapper for sftp
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -746,7 +746,7 @@ private function normalizeDir($dir)
     {
         $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
 
-        if (preg_match('#^s?ftp://#', $dir)) {
+        if (preg_match('#^(ssh2\.)?s?ftp://#', $dir)) {
             $dir .= '/';
         }
 

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ private function normalizeDir($dir)`
`746`	`746`	`{`
`747`	`747`	`$dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);`
`748`	`748`
`749`		`- if (preg_match('#^s?ftp://#', $dir)) {`
	`749`	`+ if (preg_match('#^(ssh2\.)?s?ftp://#', $dir)) {`
`750`	`750`	`$dir .= '/';`
`751`	`751`	`}`
`752`	`752`