Merge pull request #109 from tobiastom/composer-dependency

Removed magix execution of composer.
This commit is contained in:
Dan Cryer 2013-07-31 00:54:43 -07:00
commit 3923bef664
2 changed files with 5 additions and 9 deletions

View file

@ -41,7 +41,8 @@ _**Please be aware that PHPCI is a beta-release project, so whilst it is very st
####Installing from Github:
* Step 1: `git clone https://github.com/Block8/PHPCI.git`
* Step 2: `cd PHPCI`
* Step 3: `chmod +x ./console && ./console phpci:install`
* Step 3: `composer install`
* Step 4: `chmod +x ./console && ./console phpci:install`
* When prompted, enter your database host, username, password and the database name that PHPCI should use.
* The script will attempt to create the database if it does not exist already.
* If you intend to use the MySQL plugin to create / destroy databases, the user you entered above will need CREATE / DELETE permissions on the server.

11
console
View file

@ -14,14 +14,9 @@ define('ENABLE_SHELL_PLUGIN', false);
// If this is the first time ./console has been run, we probably don't have Composer or any of our dependencies yet.
// So we need to install and run Composer.
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 ' . escapeshellarg(PHPCI_DIR . 'composerinstaller.php'));
unlink(PHPCI_DIR . 'composerinstaller.php');
print 'RUNNING: Composer' . PHP_EOL;
shell_exec('php '.escapeshellarg(PHPCI_DIR.'composer.phar').' install');
if (!file_exists(PHPCI_DIR . 'vendor/autoload.php')) {
file_put_contents('php://stderr', 'Please install PHPCI with "composer install" before using console');
exit( 1 );
}
require('bootstrap.php');