summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--system/helpers/inflector_helper.php2
-rw-r--r--tests/phpunit.xml (renamed from phpunit.xml)10
3 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index c5a999359..4e13a83d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ before_script:
- pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
- phpenv rehash
-script: phpunit --configuration phpunit.xml \ No newline at end of file
+script: phpunit --configuration tests/phpunit.xml \ No newline at end of file
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 02c425b8a..5acfd6bc5 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -173,7 +173,7 @@ if ( ! function_exists('camelize'))
{
function camelize($str)
{
- return substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
+ return strtolower($str[0]).substr(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $str))), 1);
}
}
diff --git a/phpunit.xml b/tests/phpunit.xml
index 2ae7ba3b8..abb9881b9 100644
--- a/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
- bootstrap="tests/Bootstrap.php"
+ bootstrap="Bootstrap.php"
colors="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
@@ -11,10 +11,10 @@
stopOnSkipped="false">
<testsuites>
<testsuite name="CodeIgniter Core Test Suite">
- <file>tests/codeigniter/Setup_test.php</file>
- <directory suffix="test.php">tests/codeigniter/core</directory>
- <directory suffix="test.php">tests/codeigniter/helpers</directory>
- <directory suffix="test.php">tests/codeigniter/libraries</directory>
+ <file>codeigniter/Setup_test.php</file>
+ <directory suffix="test.php">codeigniter/core</directory>
+ <directory suffix="test.php">codeigniter/helpers</directory>
+ <directory suffix="test.php">codeigniter/libraries</directory>
<!-- We'll worry about these later ...
<directory suffix="test.php">codeigniter/libraries</directory>
<directory suffix="test.php">codeigniter/helpers</directory>