diff options
author | ftwbzhao <b.zhao1@gmail.com> | 2015-07-06 10:47:54 +0200 |
---|---|---|
committer | ftwbzhao <b.zhao1@gmail.com> | 2015-07-06 10:47:54 +0200 |
commit | 5cd726abed384ce594d07cc59dcd61f613f10d49 (patch) | |
tree | a59af74d4084620ab360a26a403eb2a7495364d2 /system/libraries/Unit_test.php | |
parent | 820f06f63de3da890a87a88161daea0fd1be8caa (diff) | |
parent | c79a62c5c43c75a3dbc0af77433694340b235047 (diff) |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'system/libraries/Unit_test.php')
-rw-r--r-- | system/libraries/Unit_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index 7b744adc6..60b046ba0 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -152,7 +152,7 @@ class CI_Unit_test { return FALSE; } - if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE)) + if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null', 'is_resource'), TRUE)) { $expected = str_replace('is_double', 'is_float', $expected); $result = $expected($test); |