diff options
author | VirtualTam <virtualtam@flibidi.net> | 2015-07-11 01:29:12 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2015-07-13 13:06:06 +0200 |
commit | d1e2f8e52c931f84c11d4f54f32959710d528182 (patch) | |
tree | be5ad2fcfeb31136e7afca0603a3cd3da3d76b57 /tests/ConfigTest.php | |
parent | 5b0ebbc5de06b8a0e9679b78b45d0dc755db7986 (diff) | |
download | Shaarli-d1e2f8e52c931f84c11d4f54f32959710d528182.tar.gz Shaarli-d1e2f8e52c931f84c11d4f54f32959710d528182.tar.zst Shaarli-d1e2f8e52c931f84c11d4f54f32959710d528182.zip |
PHP: ensure 5.3 compatibility, refactor timezone utilities
Relates to #250
Modifications
- supported version
- bump required version from 5.1.0 to 5.3.x
- update README
- add PHP 5.3 to Travis environments
- rewrite array declarations: explicitely use array() instead of []
- move checkPHPVersion to application/Utils.php
- move timezone functions to application/TimeZone.php
- cleanup code
- improve test coverage
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'tests/ConfigTest.php')
-rwxr-xr-x | tests/ConfigTest.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 4279c57e..a239d8b7 100755 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php | |||
@@ -18,7 +18,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase | |||
18 | */ | 18 | */ |
19 | public function setUp() | 19 | public function setUp() |
20 | { | 20 | { |
21 | self::$_configFields = [ | 21 | self::$_configFields = array( |
22 | 'login' => 'login', | 22 | 'login' => 'login', |
23 | 'hash' => 'hash', | 23 | 'hash' => 'hash', |
24 | 'salt' => 'salt', | 24 | 'salt' => 'salt', |
@@ -28,13 +28,13 @@ class ConfigTest extends PHPUnit_Framework_TestCase | |||
28 | 'redirector' => '', | 28 | 'redirector' => '', |
29 | 'disablesessionprotection' => false, | 29 | 'disablesessionprotection' => false, |
30 | 'privateLinkByDefault' => false, | 30 | 'privateLinkByDefault' => false, |
31 | 'config' => [ | 31 | 'config' => array( |
32 | 'CONFIG_FILE' => 'tests/config.php', | 32 | 'CONFIG_FILE' => 'tests/config.php', |
33 | 'DATADIR' => 'tests', | 33 | 'DATADIR' => 'tests', |
34 | 'config1' => 'config1data', | 34 | 'config1' => 'config1data', |
35 | 'config2' => 'config2data', | 35 | 'config2' => 'config2data', |
36 | ] | 36 | ) |
37 | ]; | 37 | ); |
38 | } | 38 | } |
39 | 39 | ||
40 | /** | 40 | /** |
@@ -174,4 +174,4 @@ class ConfigTest extends PHPUnit_Framework_TestCase | |||
174 | include self::$_configFields['config']['CONFIG_FILE']; | 174 | include self::$_configFields['config']['CONFIG_FILE']; |
175 | $this->assertEquals(self::$_configFields['login'], $GLOBALS['login']); | 175 | $this->assertEquals(self::$_configFields['login'], $GLOBALS['login']); |
176 | } | 176 | } |
177 | } \ No newline at end of file | 177 | } |