From fad2a4e498e11026c99a78e17729e17e6a2f5ce2 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 27 Apr 2017 11:48:59 +0200 Subject: [PATCH] FEATURE: Allow empty feature yaml files * Handle empty yaml files for features in options class. --- src/Standards/Typo3Update/Options.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Standards/Typo3Update/Options.php b/src/Standards/Typo3Update/Options.php index 935da03..6db1bd2 100644 --- a/src/Standards/Typo3Update/Options.php +++ b/src/Standards/Typo3Update/Options.php @@ -140,10 +140,11 @@ class Options ); foreach ($fileNames as $file) { - $option = array_merge( - $option, - Yaml::parse(file_get_contents((string) $file)) - ); + $content = Yaml::parse(file_get_contents((string) $file)); + if ($content === null) { + $content = []; + } + $option = array_merge($option, $content); } return $option;