tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix behat issues

Browse Source
This commit is contained in:
Damian Mooyman 2017-06-21 21:04:39 +12:00
parent 5b59a912b6
commit f9b2ba4755
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli-script.php
View File

@ -2,8 +2,8 @@
// CLI specific bootstrapping // CLI specific bootstrapping
use SilverStripe\Control\CLIRequestBuilder; use SilverStripe\Control\CLIRequestBuilder;
use SilverStripe\Control\HTTPApplication;
use SilverStripe\Core\CoreKernel; use SilverStripe\Core\CoreKernel;
use SilverStripe\Core\HTTPApplication;
require __DIR__ . '/src/includes/autoload.php'; require __DIR__ . '/src/includes/autoload.php';

13
src/Core/CoreKernel.php
View File

@ -186,6 +186,16 @@ class CoreKernel implements Kernel
$this->bootManifests($flush); $this->bootManifests($flush);
$this->bootErrorHandling(); $this->bootErrorHandling();
$this->bootDatabase(); $this->bootDatabase();
$this->bootConfigs();
}
/**
* Include all _config.php files
*/
protected function bootConfigs()
{
// After loading all other app manifests, include _config.php files
$this->getModuleLoader()->getManifest()->activateConfig();
} }
/** /**
@ -436,9 +446,6 @@ class CoreKernel implements Kernel
} }
} }
// After loading config, boot _config.php files
$this->getModuleLoader()->getManifest()->activateConfig();
// Find default templates // Find default templates
$defaultSet = $this->getThemeResourceLoader()->getSet('$default'); $defaultSet = $this->getThemeResourceLoader()->getSet('$default');
if ($defaultSet instanceof ThemeManifest) { if ($defaultSet instanceof ThemeManifest) {

2
src/ORM/DB.php
View File

@ -316,7 +316,7 @@ class DB
* @param string $name * @param string $name
* @return mixed * @return mixed
*/ */
public static function getConfig($name) public static function getConfig($name = 'default')
{ {
if (isset(static::$configs[$name])) { if (isset(static::$configs[$name])) {
return static::$configs[$name]; return static::$configs[$name];

1
tests/behat/serve-bootstrap.php
View File

@ -2,4 +2,3 @@
require __DIR__ . '/../bootstrap/init.php'; require __DIR__ . '/../bootstrap/init.php';
require __DIR__ . '/../bootstrap/environment.php'; require __DIR__ . '/../bootstrap/environment.php';
require __DIR__ . '/../bootstrap/mysite.php';