Commit 306b0cea authored by drumm's avatar drumm Committed by Neil Drumm

Resolve conflict

parents 07a8aa87 f6a8586b
......@@ -116,9 +116,6 @@ function provision_drupal_drush_exit() {
provision_save_platform_data();
}
}
elseif (PROVISION_CONTEXT_SERVER) {
// provision_save_server_data();
}
}
}
......
......@@ -69,7 +69,7 @@ class provisionEnvironment {
*/
function __get($name) {
if ($name == 'options') {
return array_merge(drush_sitealias_get_record($this->name), drush_get_context('stdin'), drush_get_context('options'));
return array_merge(drush_sitealias_get_record($this->name), array_filter(drush_get_context('stdin')), array_filter(drush_get_context('options')));
}
if (array_key_exists($name, $this->properties)) {
if (isset($this->oid_map[$name]) && !empty($this->properties[$name])) {
......@@ -295,7 +295,7 @@ class provisionPlatform extends provisionEnvironment {
parent::init();
$this->type = 'platform';
$this->setProperty('root', $_SERVER['PWD']);
$this->setProperty('root');
$this->setProperty('server', '@server_localhost');
$this->is_oid('server');
......@@ -321,6 +321,13 @@ class provisionSite extends provisionEnvironment {
parent::init();
$this->type = 'site';
$this->setProperty('platform');
$this->is_oid('platform');
// we need to set the alias root to the platform root, otherwise drush will cause problems.
$this->root = $this->platform->root;
$this->setProperty('uri');
$this->setProperty('site_url', str_replace(array('https://', 'http://'), '', $this->uri));
$this->setProperty('language', 'en');
......@@ -343,4 +350,9 @@ class provisionSite extends provisionEnvironment {
// this can potentially be handled by a drupal sub class
$this->setProperty('profile', 'default');
}
function verify() {
$this->service('db')->verify();
$this->service('http')->verify();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment