Merge remote-tracking branch 'origin/5.2' into 5.2

laravel · May 15, 2016 · 43aa875 · 43aa875
2 parents 5de4291 + 3c8e0cf
commit 43aa875
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Illuminate/Filesystem/Filesystem.php b/src/Illuminate/Filesystem/Filesystem.php
@@ -345,11 +345,12 @@ public function files($directory)
      * Get all of the files from the given directory (recursive).
      *
      * @param  string  $directory
+     * @param  bool  $hidden
      * @return array
      */
-    public function allFiles($directory)
+    public function allFiles($directory, $hidden = false)
     {
-        return iterator_to_array(Finder::create()->files()->in($directory), false);
+        return iterator_to_array(Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory), false);
     }
 
     /**