From a94b3711493babee8f8042bbc0e91c93454f034c Mon Sep 17 00:00:00 2001 From: mean-cj Date: Thu, 17 Apr 2014 18:52:38 +0700 Subject: [PATCH 1/3] Update BaseProvider.php fix Invalid argument supplied for foreach() glob function return is false --- src/CeesVanEgmond/Minify/Providers/BaseProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php index 953b833..5d466d1 100644 --- a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php +++ b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php @@ -215,7 +215,7 @@ protected function countModificationTime() protected function removeOldFiles() { $pattern = $this->outputDir . $this->getHashedFilename() . '*'; - foreach (glob($pattern) as $file) + foreach ((array) glob($pattern) as $file) { if ( ! unlink($file) ) { throw new CannotRemoveFileException("File '{$file}' cannot be removed"); From db4843ed8000c7bddae0efb1dc8179922473f5ca Mon Sep 17 00:00:00 2001 From: mean-cj Date: Thu, 17 Apr 2014 18:56:18 +0700 Subject: [PATCH 2/3] Update BaseProvider.php --- src/CeesVanEgmond/Minify/Providers/BaseProvider.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php index 5d466d1..2a2752a 100644 --- a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php +++ b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php @@ -215,7 +215,9 @@ protected function countModificationTime() protected function removeOldFiles() { $pattern = $this->outputDir . $this->getHashedFilename() . '*'; - foreach ((array) glob($pattern) as $file) + $find = glob($pattern); + if( is_array($find) ) + foreach ($find as $file) { if ( ! unlink($file) ) { throw new CannotRemoveFileException("File '{$file}' cannot be removed"); From d4996fe070f859103eb0c6fd4edca40c3a49ff98 Mon Sep 17 00:00:00 2001 From: Cees van Egmond Date: Thu, 17 Apr 2014 14:14:22 +0200 Subject: [PATCH 3/3] Extra check + indenting fix --- src/CeesVanEgmond/Minify/Providers/BaseProvider.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php index 2a2752a..37e7df2 100644 --- a/src/CeesVanEgmond/Minify/Providers/BaseProvider.php +++ b/src/CeesVanEgmond/Minify/Providers/BaseProvider.php @@ -216,11 +216,14 @@ protected function removeOldFiles() { $pattern = $this->outputDir . $this->getHashedFilename() . '*'; $find = glob($pattern); - if( is_array($find) ) - foreach ($find as $file) + + if( is_array($find) && count($find) ) { - if ( ! unlink($file) ) { - throw new CannotRemoveFileException("File '{$file}' cannot be removed"); + foreach ($find as $file) + { + if ( ! unlink($file) ) { + throw new CannotRemoveFileException("File '{$file}' cannot be removed"); + } } } }