From aa90f747fd36cc583b334246e2c16fa32e21ca3b Mon Sep 17 00:00:00 2001
From: Tobias Tom <t.tom@succont.de>
Date: Wed, 31 Jul 2013 08:08:19 +0200
Subject: [PATCH 1/2] Removed magix execution of composer.

---
 console | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/console b/console
index f571c454..dd71d058 100755
--- a/console
+++ b/console
@@ -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');

From 695d57c68cd86d5dd83d911c47b4045c9b3f1089 Mon Sep 17 00:00:00 2001
From: Tobias Tom <t.tom@succont.de>
Date: Wed, 31 Jul 2013 08:15:07 +0200
Subject: [PATCH 2/2] Added additional installation step.

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa1eff8a..7acf5f4c 100644
--- a/README.md
+++ b/README.md
@@ -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.