ENGCOM-8549: Fix ftp_nlist for empty folders returns false #31308

magento-engcom-team · magento-engcom-team · commit 6a26a2cbda99 · 2020-12-28T02:21:27.000-06:00
- Merge Pull Request #31308 from Nazar65/magento2:fix_ls_method_of_ftp - Merged commits: 1. 5559a51 2. c42d022
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
@@ -313,9 +313,10 @@ public function chmod($filename, $mode)
      */
     public function ls($grep = null)
     {
-        $ls = @ftp_nlist($this->_conn, '.');
+        $ls = @ftp_nlist($this->_conn, '.') ?: [];
 
         $list = [];
+        
         foreach ($ls as $file) {
             $list[] = ['text' => $file, 'id' => $this->pwd() . '/' . $file];
         }

Original file line number	Diff line number	Diff line change
`@@ -313,9 +313,10 @@ public function chmod($filename, $mode)`
`313`	`313`	`*/`
`314`	`314`	`public function ls($grep = null)`
`315`	`315`	`{`
`316`		`- $ls = @ftp_nlist($this->_conn, '.');`
	`316`	`+ $ls = @ftp_nlist($this->_conn, '.') ?: [];`
`317`	`317`
`318`	`318`	`$list = [];`
	`319`	`+`
`319`	`320`	`foreach ($ls as $file) {`
`320`	`321`	`$list[] = ['text' => $file, 'id' => $this->pwd() . '/' . $file];`
`321`	`322`	`}`