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

Merge branch 'release/3.1.1' into 3.1/master

Browse source
This commit is contained in:
Jeremy Bush 2011-02-16 10:56:33 -06:00
parent cd2f9fc890 25ed33232c
commit 4035f1a33c
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,3 +1,3 @@
# Kohana PHP Framework, version 3.1 (release)
This is the current development version of [Kohana](http://kohanaframework.org/).
This is the current release version of [Kohana](http://kohanaframework.org/).

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

6
index.php
View file

@ -56,15 +56,15 @@ error_reporting(E_ALL | E_STRICT);
// Set the full path to the docroot
define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
// Make the application relative to the docroot
// Make the application relative to the docroot, for symlink'd index.php
if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
$application = DOCROOT.$application;
// Make the modules relative to the docroot
// Make the modules relative to the docroot, for symlink'd index.php
if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
$modules = DOCROOT.$modules;
// Make the system relative to the docroot
// Make the system relative to the docroot, for symlink'd index.php
if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
$system = DOCROOT.$system;

2
modules/unittest

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

2
system

@ -1 +1 @@
Subproject commit 1cb969039b2f9cfc3920c030066179033e981d1b
Subproject commit 3fea2fbbcd1ac9b7318dd44e80c2c6ca02823ebe