deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Block8/PHPCI

Browse source
This commit is contained in:
Dan Cryer 2014-02-25 16:04:28 +00:00
commit 33c7312f8e
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PHPCI/Plugin/Codeception.php
View file

@ -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;
}

7
public/install.php
View file

@ -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';
}
}