From 6ec2e855535b0c81dff82641b4ec0975791a8fe1 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Thu, 10 Feb 2011 20:18:19 +0000
Subject: [PATCH 1/4] Fixes #3657 - Environments and KOHANA_ENV

Conflicts:

	application/bootstrap.php
---
 application/bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/bootstrap.php b/application/bootstrap.php
index 27462b8..d6081cd 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -61,9 +61,9 @@ I18n::lang('en-us');
  * Note: If you supply an invalid environment name, a PHP warning will be thrown
  * saying "Couldn't find constant Kohana::<INVALID_ENV_NAME>"
  */
-if (getenv('KOHANA_ENV') !== FALSE)
+if (isset($_SERVER['KOHANA_ENV']))
 {
-	Kohana::$environment = constant('Kohana::'.strtoupper(getenv('KOHANA_ENV')));
+	Kohana::$environment = constant('Kohana::'.strtoupper($_SERVER['KOHANA_ENV']));
 }
 
 /**

From 2869dce59fef35f3667991fbce54b7de416900bf Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Thu, 10 Feb 2011 20:58:11 +0000
Subject: [PATCH 2/4] Refs #3724 - Removing unused properties from build.xml

Conflicts:

	build.xml
---
 build.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 7006053..9c2cfd6 100644
--- a/build.xml
+++ b/build.xml
@@ -1,12 +1,11 @@
-<project name="kohana" default="help" basedir=".">
-<!--	<property environment="env"/>-->
+<?xml version="1.0" ?>
+<project name="kohana" default="help">
+	<property environment="env"/>
 
 	<property name="basedir" value="${project.basedir}"/>
 	<property name="builddir" value="${basedir}/build"/>
 
-	<property name="repo" value="git@github.com:kohana/kohana.git"/>
 	<property name="branch" value="3.1/develop"/>
-	<property name="tag" value="${env.TAG}"/>
 
 	<property name="submodules" value="system,modules/auth,modules/cache,modules/codebench,modules/database,modules/image,modules/orm,modules/unittest,modules/userguide"/>
 
@@ -170,12 +169,12 @@
 
 	<!-- Run unit tests -->
 	<target name="test">
-		<exec command="phpunit --bootstrap=modules/unittest/bootstrap.php modules/unittest/tests.php" passthru="true"/>
+		<exec command="phpunit --bootstrap=modules/unittest/bootstrap.php modules/unittest/tests.php" checkreturn="true" passthru="true"/>
 	</target>
 
 	<!-- Run unit tests and generate junit.xml and clover.xml -->
 	<target name="test-log">
-		<exec command="phpunit --bootstrap=modules/unittest/bootstrap.php --coverage-html=${builddir}/coverage --log-junit=${builddir}/logs/junit.xml --coverage-clover=${builddir}/logs/clover.xml modules/unittest/tests.php" passthru="true"/>
+		<exec command="phpunit --bootstrap=modules/unittest/bootstrap.php --coverage-html=${builddir}/coverage --log-junit=${builddir}/logs/junit.xml --coverage-clover=${builddir}/logs/clover.xml modules/unittest/tests.php" checkreturn="true" passthru="true"/>
 	</target>
 
 	<!-- Run PHP Code Sniffer -->

From 4ff1926f9d3987c2a576260e076d22eee349dd8c Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Thu, 10 Feb 2011 21:12:26 +0000
Subject: [PATCH 3/4] Updating submodules

---
 modules/unittest | 2 +-
 system           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/unittest b/modules/unittest
index 748b8d1..bb20b54 160000
--- a/modules/unittest
+++ b/modules/unittest
@@ -1 +1 @@
-Subproject commit 748b8d16add146c3674bd34387856c6f55506c5a
+Subproject commit bb20b54e1e8b449cab8d2ec8db275a069a258307
diff --git a/system b/system
index dc9e883..dd80dae 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit dc9e8832bf5d5e61f596b83a5c57d51cbeec707b
+Subproject commit dd80dae948e6b52cdd79230319615e24b10cbc3f

From 83e0f9d28cd504c863b0b98c171c3a6878249460 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Thu, 10 Feb 2011 21:13:22 +0000
Subject: [PATCH 4/4] Updating submodules

---
 modules/unittest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/unittest b/modules/unittest
index bb20b54..ac22963 160000
--- a/modules/unittest
+++ b/modules/unittest
@@ -1 +1 @@
-Subproject commit bb20b54e1e8b449cab8d2ec8db275a069a258307
+Subproject commit ac2296343083736b4abaef02eae0a224e1b8cf99