oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote branch 'origin/3.1/develop' into 3.1/develop

Browse source 
Conflicts:
	system
This commit is contained in:
Jeremy Bush 2011-02-10 17:14:57 -06:00
parent 19ef9544bf 83e0f9d28c
commit 5a30c25af1
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/bootstrap.php
View file

@ -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']));
}
/**

11
build.xml
View file

@ -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 -->

2
modules/unittest

@ -1 +1 @@
Subproject commit 748b8d16add146c3674bd34387856c6f55506c5a
Subproject commit ac2296343083736b4abaef02eae0a224e1b8cf99

2
system

@ -1 +1 @@
Subproject commit 129d45aa971b41aa2b8d2df28c2ed81c33b33364
Subproject commit 6150fc1de0bb8060b9f6dc42dd801351a6aa36de