Merge pull request #825 from catalyst/issue824

Close issue #824 - fix: properly handle limit in directory_file_list_trait
catalyst · Aug 11, 2023 · 3ad7f30 · 3ad7f30
2 parents a553594 + 41afec2
commit 3ad7f30
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/classes/local/step/directory_file_list_trait.php b/classes/local/step/directory_file_list_trait.php
@@ -252,6 +252,7 @@ function ($filename) use ($basepath) {
 
         $func($filelist);
 
+        $limit = empty($limit) ? null : $limit;
         // Apply the offset and limit.
         $filelist = array_slice($filelist, $offset, $limit);
 

diff --git a/tests/tool_dataflows_sftp_test.php b/tests/tool_dataflows_sftp_test.php
@@ -99,6 +99,16 @@ public function sftp_list_constraints_provider(): array {
                     'test.csv',
                 ],
             ],
+            [
+                ['relativepath', 'alpha', 0, 0, false, '', '*.csv'],
+                [
+                    '2019-08-03-123451001.csv',
+                    '2019-08-03-123451002.csv',
+                    '2019-08-03-123451003.csv',
+                    'output/2019-08-03-123451002-final.csv',
+                    'test.csv',
+                ],
+            ],
             [
                 ['relativepath', 'alpha_reverse', 0, 1, false, '', '*.csv'],
                 ['test.csv'],