TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for unit testing

This commit is contained in:
Samuel Georges 2015-02-21 11:41:43 +11:00
parent c0839464fd
commit 9f17c7add0
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/system/classes/PluginManager.php
View File

@ -66,13 +66,23 @@ class PluginManager
*/
protected function init()
{
$this->app = App::make('app');
$this->bindSoftDependencies();
$this->metaFile = storage_path() . '/cms/disabled.json';
$this->loadDisabled();
$this->loadPlugins();
$this->loadDependencies();
}
/**
* These objects are "soft singletons" and may be lost when
* the IoC container reboots. This provides a way to rebuild
* for the purposes of unit testing.
*/
public function bindSoftDependencies()
{
$this->app = App::make('app');
}
/**
* Finds all available plugins and loads them in to the $plugins array.
* @return array

9
modules/system/classes/UpdateManager.php
View File

@ -75,11 +75,10 @@ class UpdateManager
{
$this->pluginManager = PluginManager::instance();
$this->versionManager = VersionManager::instance();
$this->migrator = App::make('migrator');
$this->repository = App::make('migration.repository');
$this->tempDirectory = temp_path();
$this->baseDirectory = base_path();
$this->disableCoreUpdates = Config::get('cms.disableCoreUpdates', false);
$this->bindSoftDependencies();
/*
* Ensure temp directory exists
@ -89,6 +88,12 @@ class UpdateManager
}
}
public function bindSoftDependencies()
{
$this->migrator = App::make('migrator');
$this->repository = App::make('migration.repository');
}
/**
* Creates the migration table and updates
* @return self