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

This commit is contained in:
Dan Cryer 2013-05-22 16:37:15 +01:00
commit ced7e15e0e
2 changed files with 4 additions and 3 deletions

View file

@ -35,7 +35,8 @@ _**Please be aware that this is a brand new project, in an alpha state, so there
* PHP 5.3.3+
* A web server. We prefer nginx.
* A MySQL server to connect to (doesn't have to be on the same server.)
* PHPCI needs to be able to run `exec()`, so make sure this is not disabled.
* PHPCI needs to be able to run `exec()`, so make sure this is not disabled
* Php-openssl must be available.
####Installing from Github:

View file

@ -16,11 +16,11 @@ define('PHPCI_DIR', dirname(__FILE__) . '/');
if (!file_exists(PHPCI_DIR . 'vendor/autoload.php') || !file_exists(PHPCI_DIR . 'composer.phar')) {
print 'INSTALLING: Composer' . PHP_EOL;
file_put_contents(PHPCI_DIR . 'composerinstaller.php', file_get_contents('https://getcomposer.org/installer'));
shell_exec('php ' . PHPCI_DIR . 'composerinstaller.php');
shell_exec('php ' . escapeshellarg(PHPCI_DIR . 'composerinstaller.php'));
unlink(PHPCI_DIR . 'composerinstaller.php');
print 'RUNNING: Composer' . PHP_EOL;
shell_exec('php '.PHPCI_DIR.'composer.phar install');
shell_exec('php '.escapeshellarg(PHPCI_DIR.'composer.phar').' install');
}
require('bootstrap.php');