From c003574f77556de352c8228e49185cd41a97aeee Mon Sep 17 00:00:00 2001 From: Josef Nevoral Date: Tue, 4 Feb 2014 23:04:49 +0700 Subject: [PATCH 1/2] Fixed: Array access for $config, which is already object create in bootstrap.php --- public/install.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/install.php b/public/install.php index 15f15216..f1e61a23 100644 --- a/public/install.php +++ b/public/install.php @@ -81,6 +81,11 @@ if ($installOK && strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') { */ require_once(PHPCI_DIR . 'vendor/autoload.php'); + /** + * Temporary save phpci URL for redirect after install ($config is replaced in bootstrap.php) + */ + $phpciUrl = $config['phpci']['url']; + /** * Write config file: */ @@ -139,7 +144,7 @@ if ($installOK && strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') { $store->save($user); } - $formAction = rtrim( $config['phpci']['url'], '/' ) . '/session/login'; + $formAction = rtrim( $phpciUrl, '/' ) . '/session/login'; } } From 079a567cf0a2d7df46e0d0f7fa929c9d7f7116f7 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 25 Feb 2014 10:57:44 +0000 Subject: [PATCH 2/2] Update Codeception.php --- PHPCI/Plugin/Codeception.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index f2e580c7..bd168145 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -69,8 +69,8 @@ class Codeception implements \PHPCI\Plugin return false; } - $cmd = $codecept . ' run -c "%s"'; - $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath . $configPath); + $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s"'; + $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $this->phpci->buildPath . $configPath); return $success; }