From 35ac98056cae895a24c22af2fb04c5e7ec4e93c0 Mon Sep 17 00:00:00 2001
From: meadsteve <meadsteve@gmail.com>
Date: Sat, 7 Dec 2013 09:34:28 +0000
Subject: [PATCH] bring bootstrap.php up to date.

---
 bootstrap.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/bootstrap.php b/bootstrap.php
index afb67c31..17aaf608 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,5 +1,14 @@
 <?php
+/**
+* PHPCI - Continuous Integration for PHP
+*
+* @copyright    Copyright 2013, Block 8 Limited.
+* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
+* @link         http://www.phptesting.org/
+*/
 
+// Let PHP take a guess as to the default timezone, if the user hasn't set one:
+date_default_timezone_set(@date_default_timezone_get());
 
 // Set up a basic autoloader for PHPCI:
 $autoload = function ($class) {
@@ -18,8 +27,27 @@ $autoload = function ($class) {
 
 spl_autoload_register($autoload, true, true);
 
+if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) {
+    header('Location: install.php');
+    die;
+}
+
+if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
+    file_put_contents('php://stderr', 'Please install PHPCI with "composer install" before using console');
+    exit(1);
+}
 
 
 // Load Composer autoloader:
 require_once(dirname(__FILE__) . '/vendor/autoload.php');
 
+// Load configuration if present:
+$conf = array();
+$conf['b8']['app']['namespace'] = 'PHPCI';
+$conf['b8']['app']['default_controller'] = 'Home';
+$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
+
+$config = new b8\Config($conf);
+$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml');
+
+require_once(dirname(__FILE__) . '/vars.php');