From df08777d58fac730aae02fc6448b4085ae0d4b7c Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Fri, 11 May 2012 17:31:14 +0200 Subject: 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. --- _test/tests/inc/json.test.php | 3 +++ _test/tests/inc/remote.test.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to '_test/tests') 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'); -- cgit v1.2.3