diff options
| author | msquare <msquare@notrademark.de> | 2019-11-30 15:37:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 15:37:48 +0100 |
| commit | a18c7d13fcae0af77cdaef1947f2160cbf1dc56a (patch) | |
| tree | 98633eb27bc514e51643766c0c4c45fc5cecfdd3 /src/Config/ConfigServiceProvider.php | |
| parent | 14f8d208b817d8d7dccebdb5f7a6ada2bcb9d5f4 (diff) | |
| parent | e80fb54522c307afec3d8bb474a47dd9d2d5da64 (diff) | |
Merge pull request #682 from MyIgel/php7.4
PHP 7.4 compatibility, PHP min version 7.2, Twig 3
Diffstat (limited to 'src/Config/ConfigServiceProvider.php')
| -rw-r--r-- | src/Config/ConfigServiceProvider.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Config/ConfigServiceProvider.php b/src/Config/ConfigServiceProvider.php index 2c320fdd..aff7918d 100644 --- a/src/Config/ConfigServiceProvider.php +++ b/src/Config/ConfigServiceProvider.php @@ -40,10 +40,11 @@ class ConfigServiceProvider extends ServiceProvider continue; } - $config->set(array_replace_recursive( + $configuration = array_replace_recursive( $config->get(null), require $file - )); + ); + $config->set($configuration); } if (empty($config->get(null))) { |