diff options
author | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-03-11 20:04:43 +0100 |
commit | a190d78a0238a0a6abd463823321bef15713e312 (patch) | |
tree | a4e49327f8e6ca1660018cebf3b06131ae3e5faf /tests/codeigniter/core/Log_test.php | |
parent | 3b74f57cfa6c43eab4c7cce440a454d095974a45 (diff) | |
parent | 4f9b20ae507dda7379d392386fb7ce5702626a91 (diff) |
Merge branch '3.0-stable' into develop
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'tests/codeigniter/core/Log_test.php')
-rw-r--r-- | tests/codeigniter/core/Log_test.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/codeigniter/core/Log_test.php b/tests/codeigniter/core/Log_test.php index d44cbac0f..2dd9d90d2 100644 --- a/tests/codeigniter/core/Log_test.php +++ b/tests/codeigniter/core/Log_test.php @@ -1,9 +1,13 @@ <?php - class Log_test extends CI_TestCase { public function test_configuration() { + if ( ! is_php('5.3')) + { + return $this->markTestSkipped("PHP 5.2 doesn't have ReflectionProperty::setAccessible() and can't run this test"); + } + $path = new ReflectionProperty('CI_Log', '_log_path'); $path->setAccessible(TRUE); $threshold = new ReflectionProperty('CI_Log', '_threshold'); @@ -50,6 +54,11 @@ class Log_test extends CI_TestCase { public function test_format_line() { + if ( ! is_php('5.3')) + { + return $this->markTestSkipped("PHP 5.2 doesn't have ReflectionProperty::setAccessible() and can't run this test"); + } + $this->ci_set_config('log_path', ''); $this->ci_set_config('log_threshold', 0); $instance = new CI_Log(); |