Merge pull request #55 from humanmade/fix/directory-iteration

Switch to a recursive directory iterator for the file fetcher
humanmade · Mar 21, 2019 · bf5cc1f · bf5cc1f
2 parents b83b881 + 51a4706
commit bf5cc1f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/inc/classes/iterator/files/class-base.php b/inc/classes/iterator/files/class-base.php
@@ -92,13 +92,14 @@ protected function get_files_in_path() {
  }
 
  if ( is_dir( $path_found ) ) {
+ $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator( $path_found ) );
+ $files = [];
 
- $files = array_map( function( $item ) use ( $path_found ) {
-
- return $path_found . '/' . $item;
-
- }, scandir( $path_found ) );
-
+ foreach ( $iterator as $pointer ) {
+ if ( ! $pointer->isDir() ) {
+ $files[] = $pointer->getPathname();
+ }
+ }
  } else {
 
  $files = [ $path_found ];