From af0ca8328207f977a8f915c928d2082c13ad3fce Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Tue, 2 Jun 2020 09:29:24 -0700 Subject: [PATCH] Fixed hidden files not working --- app/src/Factories/FinderFactory.php | 2 +- app/src/HiddenFiles.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/Factories/FinderFactory.php b/app/src/Factories/FinderFactory.php index dc8c572..5d0c6f6 100644 --- a/app/src/Factories/FinderFactory.php +++ b/app/src/Factories/FinderFactory.php @@ -16,7 +16,7 @@ class FinderFactory /** @var Container The application container */ protected $container; - /** @var Collection Collection of hidden files */ + /** @var HiddenFiles Collection of hidden files */ protected $hiddenFiles; /** @var Glob Hidden files pattern cache */ diff --git a/app/src/HiddenFiles.php b/app/src/HiddenFiles.php index 2c27b98..5441137 100644 --- a/app/src/HiddenFiles.php +++ b/app/src/HiddenFiles.php @@ -8,7 +8,7 @@ use Tightenco\Collect\Support\Collection; class HiddenFiles extends Collection { /** - * Createa a new HiddenFiles collection object. + * Create a new HiddenFiles collection object. * * @param \DI\Container $container */ @@ -17,11 +17,13 @@ class HiddenFiles extends Collection $items = $container->get('hidden_files'); if (is_readable($container->get('hidden_files_list'))) { - array_merge($items, file($container->get('hidden_files_list'), FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)); + $items = array_merge($items, file( + $container->get('hidden_files_list'), FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES + )); } if ($container->get('hide_app_files')) { - array_merge($container->get('app_files')); + $items = array_merge($items, $container->get('app_files')); } parent::__construct(array_unique($items));