Added override and force options for Streams setup

This commit is contained in:
Djamil Legato
2016-08-25 13:47:14 -07:00
parent f29104ad5d
commit 175f3e3f0e
2 changed files with 8 additions and 1 deletions

View File

@@ -5,6 +5,7 @@
* Added new `tmp` folder at root. Accessible via stream `tmp://`. Can be cleared with `bin/grav clear --tmp-only` as well as `--all`.
* Added support for RTL in `LanguageCodes` so you can determine if a language is RTL or not
* Ability to set `custom_base_url` in system configuration
* Added `override` and `force` options for Streams setup
1. [](#improved)
* Important vendor updates to provide PHP 7.1 beta support!
* Added a `Util::arrayFlatten()` static function

View File

@@ -91,12 +91,14 @@ class Setup extends Data
],
'backup' => [
'type' => 'Stream',
'force' => true,
'prefixes' => [
'' => ['backup']
]
],
'tmp' => [
'type' => 'Stream',
'force' => true,
'prefixes' => [
'' => ['tmp']
]
@@ -200,9 +202,13 @@ class Setup extends Data
if (isset($config['paths'])) {
$locator->addPath($scheme, '', $config['paths']);
}
$override = isset($config['override']) ? $config['override'] : false;
$force = isset($config['force']) ? $config['force'] : false;
if (isset($config['prefixes'])) {
foreach ($config['prefixes'] as $prefix => $paths) {
$locator->addPath($scheme, $prefix, $paths);
$locator->addPath($scheme, $prefix, $paths, $override, $force);
}
}
}