Skip to content

Commit 48ba1f6

Browse files
sergey-dryabzhinskysergey-dryabzhinsky
committed
Version 1.0.32
- revert stdClass use - php-4 has it too
1 parent d44e985 commit 48ba1f6

File tree

2 files changed

+54
-62
lines changed

2 files changed

+54
-62
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ env PHP_MEMORY_LIMIT=64 PHP_TIME_LIMIT=30 php bench.php
7878

7979
## ChangeLog
8080

81+
@ 2018-08-08, v1.0.32
82+
83+
* Были неправы - stdClass есть в php-4 тоже
84+
8185
@ 2018-08-08, v1.0.31
8286

8387
* Исправили тесты с различной сериализацией - объекты есть только в php-5+

‎bench.php

Lines changed: 50 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
# Author : Sergey Dryabzhinsky #
1111
# Company : Rusoft Ltd, Russia #
1212
# Date : Aug 08, 2018 #
13-
# Version : 1.0.31 #
13+
# Version : 1.0.32 #
1414
# License : Creative Commons CC-BY license #
1515
# Website : https://github.com/rusoft/php-simple-benchmark-script #
1616
# Website : https://git.rusoft.ru/open-source/php-simple-benchmark-script #
1717
# #
1818
################################################################################
1919
*/
2020

21-
$scriptVersion = '1.0.31';
21+
$scriptVersion = '1.0.32';
2222

2323
// Used in hacks/fixes checks
2424
$phpversion = explode('.', PHP_VERSION);
@@ -932,16 +932,14 @@ function test_09_Json_Encode()
932932
null,
933933
false,
934934
);
935-
if (PHP_MAJOR_VERSION >=5) {
936-
$obj = new stdClass();
937-
$obj->fieldStr = 'value';
938-
$obj->fieldInt = 123456;
939-
$obj->fieldFloat = 123.456;
940-
$obj->fieldArray = array(123456);
941-
$obj->fieldNull = null;
942-
$obj->fieldBool = false;
943-
$data[] = $obj;
944-
}
935+
$obj = new stdClass();
936+
$obj->fieldStr = 'value';
937+
$obj->fieldInt = 123456;
938+
$obj->fieldFloat = 123.456;
939+
$obj->fieldArray = array(123456);
940+
$obj->fieldNull = null;
941+
$obj->fieldBool = false;
942+
$data[] = $obj;
945943

946944
$count = $testsLoopLimits['09_json_encode'];
947945
$time_start = get_microtime();
@@ -970,16 +968,14 @@ function test_10_Json_Decode()
970968
null,
971969
false,
972970
);
973-
if (PHP_MAJOR_VERSION >=5) {
974-
$obj = new stdClass();
975-
$obj->fieldStr = 'value';
976-
$obj->fieldInt = 123456;
977-
$obj->fieldFloat = 123.456;
978-
$obj->fieldArray = array(123456);
979-
$obj->fieldNull = null;
980-
$obj->fieldBool = false;
981-
$data[] = $obj;
982-
}
971+
$obj = new stdClass();
972+
$obj->fieldStr = 'value';
973+
$obj->fieldInt = 123456;
974+
$obj->fieldFloat = 123.456;
975+
$obj->fieldArray = array(123456);
976+
$obj->fieldNull = null;
977+
$obj->fieldBool = false;
978+
$data[] = $obj;
983979

984980
foreach ($data as $key => $value) {
985981
$data[$key] = json_encode($value);
@@ -1012,16 +1008,14 @@ function test_11_Serialize()
10121008
null,
10131009
false,
10141010
);
1015-
if (PHP_MAJOR_VERSION >=5) {
1016-
$obj = new stdClass();
1017-
$obj->fieldStr = 'value';
1018-
$obj->fieldInt = 123456;
1019-
$obj->fieldFloat = 123.456;
1020-
$obj->fieldArray = array(123456);
1021-
$obj->fieldNull = null;
1022-
$obj->fieldBool = false;
1023-
$data[] = $obj;
1024-
}
1011+
$obj = new stdClass();
1012+
$obj->fieldStr = 'value';
1013+
$obj->fieldInt = 123456;
1014+
$obj->fieldFloat = 123.456;
1015+
$obj->fieldArray = array(123456);
1016+
$obj->fieldNull = null;
1017+
$obj->fieldBool = false;
1018+
$data[] = $obj;
10251019

10261020
$count = $testsLoopLimits['11_serialize'];
10271021
$time_start = get_microtime();
@@ -1050,16 +1044,14 @@ function test_12_Unserialize()
10501044
null,
10511045
false,
10521046
);
1053-
if (PHP_MAJOR_VERSION >=5) {
1054-
$obj = new stdClass();
1055-
$obj->fieldStr = 'value';
1056-
$obj->fieldInt = 123456;
1057-
$obj->fieldFloat = 123.456;
1058-
$obj->fieldArray = array(123456);
1059-
$obj->fieldNull = null;
1060-
$obj->fieldBool = false;
1061-
$data[] = $obj;
1062-
}
1047+
$obj = new stdClass();
1048+
$obj->fieldStr = 'value';
1049+
$obj->fieldInt = 123456;
1050+
$obj->fieldFloat = 123.456;
1051+
$obj->fieldArray = array(123456);
1052+
$obj->fieldNull = null;
1053+
$obj->fieldBool = false;
1054+
$data[] = $obj;
10631055

10641056
foreach ($data as $key => $value) {
10651057
$data[$key] = serialize($value);
@@ -1292,16 +1284,14 @@ function test_24_XmlRpc_Encode()
12921284
null,
12931285
false,
12941286
);
1295-
if (PHP_MAJOR_VERSION >=5) {
1296-
$obj = new stdClass();
1297-
$obj->fieldStr = 'value';
1298-
$obj->fieldInt = 123456;
1299-
$obj->fieldFloat = 123.456;
1300-
$obj->fieldArray = array(123456);
1301-
$obj->fieldNull = null;
1302-
$obj->fieldBool = false;
1303-
$data[] = $obj;
1304-
}
1287+
$obj = new stdClass();
1288+
$obj->fieldStr = 'value';
1289+
$obj->fieldInt = 123456;
1290+
$obj->fieldFloat = 123.456;
1291+
$obj->fieldArray = array(123456);
1292+
$obj->fieldNull = null;
1293+
$obj->fieldBool = false;
1294+
$data[] = $obj;
13051295

13061296
$count = $testsLoopLimits['24_xmlrpc_encode'];
13071297
$time_start = get_microtime();
@@ -1331,16 +1321,14 @@ function test_25_XmlRpc_Decode()
13311321
null,
13321322
false,
13331323
);
1334-
if (PHP_MAJOR_VERSION >=5) {
1335-
$obj = new stdClass();
1336-
$obj->fieldStr = 'value';
1337-
$obj->fieldInt = 123456;
1338-
$obj->fieldFloat = 123.456;
1339-
$obj->fieldArray = array(123456);
1340-
$obj->fieldNull = null;
1341-
$obj->fieldBool = false;
1342-
$data[] = $obj;
1343-
}
1324+
$obj = new stdClass();
1325+
$obj->fieldStr = 'value';
1326+
$obj->fieldInt = 123456;
1327+
$obj->fieldFloat = 123.456;
1328+
$obj->fieldArray = array(123456);
1329+
$obj->fieldNull = null;
1330+
$obj->fieldBool = false;
1331+
$data[] = $obj;
13441332

13451333
foreach ($data as $key => $value) {
13461334
$data[$key] = xmlrpc_encode($value);

0 commit comments

Comments
 (0)