mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Removed dol_json_encode/decode in favor of native json_encode/decode
This commit is contained in:
parent
e3d858692e
commit
a391143007
|
|
@ -105,10 +105,12 @@ class JsonLibTest extends CommonClassTest
|
|||
$decoded = json_decode($encoded, true);
|
||||
$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
|
||||
|
||||
/*
|
||||
$encoded = dol_json_encode($arraytotest);
|
||||
$this->assertEquals($arrayencodedexpected, $encoded);
|
||||
$decoded = dol_json_decode($encoded, true);
|
||||
$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
|
||||
*/
|
||||
|
||||
// Same test but array start with 2 instead of 0
|
||||
$arraytotest = array(2 => array('key' => 1,'value' => 'PRODREF','label' => 'Product ref with é and special chars \\ \' "'));
|
||||
|
|
@ -119,20 +121,22 @@ class JsonLibTest extends CommonClassTest
|
|||
$decoded = json_decode($encoded, true);
|
||||
$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
|
||||
|
||||
/*
|
||||
$encoded = dol_json_encode($arraytotest);
|
||||
$this->assertEquals($arrayencodedexpected, $encoded);
|
||||
$decoded = dol_json_decode($encoded, true);
|
||||
$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
|
||||
*/
|
||||
|
||||
$encoded = dol_json_encode(123);
|
||||
$encoded = json_encode(123);
|
||||
$this->assertEquals(123, $encoded);
|
||||
$decoded = dol_json_decode($encoded, true);
|
||||
$this->assertEquals(123, $decoded, 'test for dol_json_xxx 123');
|
||||
$decoded = json_decode($encoded, true);
|
||||
$this->assertEquals(123, $decoded, 'test for json_xxx 123');
|
||||
|
||||
$encoded = dol_json_encode('abc');
|
||||
$encoded = json_encode('abc');
|
||||
$this->assertEquals('"abc"', $encoded);
|
||||
$decoded = dol_json_decode($encoded, true);
|
||||
$this->assertEquals('abc', $decoded, "test for dol_json_xxx 'abc'");
|
||||
$decoded = json_decode($encoded, true);
|
||||
$this->assertEquals('abc', $decoded, "test for json_xxx 'abc'");
|
||||
|
||||
// Test with object
|
||||
$now = gmmktime(12, 0, 0, 1, 1, 1970);
|
||||
|
|
@ -140,7 +144,7 @@ class JsonLibTest extends CommonClassTest
|
|||
$objecttotest->property1 = 'abc';
|
||||
$objecttotest->property2 = 1234;
|
||||
$objecttotest->property3 = $now;
|
||||
$encoded = dol_json_encode($objecttotest);
|
||||
$encoded = json_encode($objecttotest);
|
||||
$this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user