diff options
| author | Michael Hamann <michael@content-space.de> | 2012-05-11 17:31:14 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2012-05-11 18:10:29 +0200 |
| commit | df08777d58fac730aae02fc6448b4085ae0d4b7c (patch) | |
| tree | f494e70038a6c3f52ba5531ebd93cf07b97d59dd /_test | |
| parent | 8cb3706df5ad54c654bffb76a69ac0ca1006521e (diff) | |
| download | rpg-df08777d58fac730aae02fc6448b4085ae0d4b7c.tar.gz rpg-df08777d58fac730aae02fc6448b4085ae0d4b7c.tar.bz2 | |
Adapt tests for PHP 5.4
Call-time pass-by-reference is a fatal syntax error in PHP 5.4 and
stdClass objects can't be instantiated automatically anymore.
Diffstat (limited to '_test')
| -rw-r--r-- | _test/tests/inc/json.test.php | 3 | ||||
| -rw-r--r-- | _test/tests/inc/remote.test.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/_test/tests/inc/json.test.php b/_test/tests/inc/json.test.php index ab04ffe60..ca939d885 100644 --- a/_test/tests/inc/json.test.php +++ b/_test/tests/inc/json.test.php @@ -276,8 +276,11 @@ class JSON_Object_TestCase extends DokuWikiTest { $this->obj_j = '{"a_string":"\"he\":llo}:{world","an_array":[1,2,3],"obj":{"a_number":123}}'; + $this->obj1 = new stdClass(); + $this->obj1->car1 = new stdClass(); $this->obj1->car1->color = 'tan'; $this->obj1->car1->model = 'sedan'; + $this->obj1->car2 = new stdClass(); $this->obj1->car2->color = 'red'; $this->obj1->car2->model = 'sports'; $this->obj1_j = '{"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model":"sports"}}'; diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php index 94f66538d..49152d8db 100644 --- a/_test/tests/inc/remote.test.php +++ b/_test/tests/inc/remote.test.php @@ -317,7 +317,7 @@ class remote_test extends DokuWikiTest { function test_pluginCallCustomPath() { global $EVENT_HANDLER; - $EVENT_HANDLER->register_hook('RPC_CALL_ADD', 'BEFORE', &$this, 'pluginCallCustomPathRegister'); + $EVENT_HANDLER->register_hook('RPC_CALL_ADD', 'BEFORE', $this, 'pluginCallCustomPathRegister'); $remoteApi = new RemoteAPI(); $result = $remoteApi->call('custom.path'); |