summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/mysqli/tests/mysqli_result_references.phpt16
-rw-r--r--ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt2
-rw-r--r--ext/standard/tests/array/bug24766.phpt16
-rw-r--r--ext/standard/tests/array/bug25708.phpt264
-rw-r--r--ext/standard/tests/array/extract_variation1.phpt4
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phptbin4585 -> 4553 bytes
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_o.phpt442
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_v.phpt26
-rw-r--r--ext/standard/var.c4
9 files changed, 387 insertions, 387 deletions
diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt
index 6d80dc1000..8cf759cce6 100644
--- a/ext/mysqli/tests/mysqli_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_result_references.phpt
@@ -85,48 +85,48 @@ array(7) refcount(2){
[0]=>
array(2) refcount(1){
[%u|b%"id"]=>
- long(1)
+ int(1)
[%u|b%"label"]=>
%unicode|string%(1) "a" refcount(%d)
}
[1]=>
array(2) refcount(1){
[%u|b%"id"]=>
- long(2)
+ int(2)
[%u|b%"label"]=>
%unicode|string%(1) "b" refcount(%d)
}
[2]=>
array(2) refcount(1){
[%u|b%"id"]=>
- long(1)
+ int(1)
[%u|b%"label"]=>
%unicode|string%(1) "a" refcount(%d)
}
[3]=>
array(2) refcount(1){
[%u|b%"id"]=>
- long(2)
+ int(2)
[%u|b%"label"]=>
%unicode|string%(1) "b" refcount(%d)
}
[4]=>
array(3) refcount(1){
[%u|b%"id"]=>
- &long(3)
+ &int(3)
[%u|b%"label"]=>
%unicode|string%(1) "a" refcount(%d)
[%u|b%"id2"]=>
- &long(3)
+ &int(3)
}
[5]=>
array(3) refcount(1){
[%u|b%"id"]=>
- &long(4)
+ &int(4)
[%u|b%"label"]=>
%unicode|string%(1) "b" refcount(%d)
[%u|b%"id2"]=>
- &long(4)
+ &int(4)
}
[6]=>
&object(mysqli_result)#%d (5) refcount(%d){
diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
index 60c5491b54..15a3f4563a 100644
--- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
@@ -113,7 +113,7 @@ array(2) refcount(%d){
[%u|b%"id_copy"]=>
%unicode|string%(1) "2" refcount(%d)
[%u|b%"id_copy_mod"]=>
- long(2)
+ int(2)
}
}
done!
diff --git a/ext/standard/tests/array/bug24766.phpt b/ext/standard/tests/array/bug24766.phpt
index 1d688e8689..2b5f8e0830 100644
--- a/ext/standard/tests/array/bug24766.phpt
+++ b/ext/standard/tests/array/bug24766.phpt
@@ -19,27 +19,27 @@ var_dump($b[$i]);
--EXPECTF--
array(2) refcount(%d){
[1]=>
- long(18)
+ int(18)
[2]=>
- long(52)
+ int(52)
}
array(2) refcount(%d){
[1]=>
- long(18)
+ int(18)
[2]=>
- long(52)
+ int(52)
}
array(2) refcount(%d){
[0]=>
- long(1)
+ int(1)
[1]=>
- long(2)
+ int(2)
}
array(2) refcount(%d){
[0]=>
- long(1)
+ int(1)
[1]=>
- long(2)
+ int(2)
}
int(18)
int(18)
diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt
index 784f111064..ff8b9f4304 100644
--- a/ext/standard/tests/array/bug25708.phpt
+++ b/ext/standard/tests/array/bug25708.phpt
@@ -69,155 +69,155 @@ debug_zval_dump($_a, $_b);
--EXPECTF--
NULL
NULL
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(3)
-long(1)
-long(3)
---
-long(4)
-long(3)
-long(4)
-long(3)
---
-long(3)
-long(3)
-long(3)
---
-long(4)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(3)
+int(1)
+int(3)
+--
+int(4)
+int(3)
+int(4)
+int(3)
+--
+int(3)
+int(3)
+int(3)
+--
+int(4)
string(1) "x" refcount(%d)
-long(4)
+int(4)
string(1) "x" refcount(%d)
-long(3)
+int(3)
--
-long(1)
-long(2)
+int(1)
+int(2)
----a
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(3)
-long(1)
-long(3)
---
-long(4)
-long(3)
-long(4)
-long(3)
---
-long(3)
-long(3)
-long(3)
---
-long(4)
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(3)
+int(1)
+int(3)
+--
+int(4)
+int(3)
+int(4)
+int(3)
+--
+int(3)
+int(3)
+int(3)
+--
+int(4)
string(1) "x" refcount(%d)
-long(4)
+int(4)
string(1) "x" refcount(%d)
-long(3)
+int(3)
--
-long(1)
-long(2)
+int(1)
+int(2)
----ra
NULL
NULL
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(3)
-long(1)
-long(3)
---
-long(4)
-long(3)
-long(4)
-long(3)
---
-long(3)
-long(3)
-long(3)
---
-long(4)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(3)
+int(1)
+int(3)
+--
+int(4)
+int(3)
+int(4)
+int(3)
+--
+int(3)
+int(3)
+int(3)
+--
+int(4)
string(1) "x" refcount(%d)
-long(4)
+int(4)
string(1) "x" refcount(%d)
-long(3)
+int(3)
--
-long(1)
-long(2)
+int(1)
+int(2)
----
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(2)
-long(1)
-long(2)
---
-long(1)
-long(3)
-long(1)
-long(3)
---
-long(4)
-long(3)
-long(4)
-long(3)
---
-long(3)
-long(3)
-long(3)
---
-long(4)
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(2)
+int(1)
+int(2)
+--
+int(1)
+int(3)
+int(1)
+int(3)
+--
+int(4)
+int(3)
+int(4)
+int(3)
+--
+int(3)
+int(3)
+int(3)
+--
+int(4)
string(1) "x" refcount(%d)
-long(4)
+int(4)
string(1) "x" refcount(%d)
-long(3)
+int(3)
--
-long(1)
-long(2)
+int(1)
+int(2)
----r
string(2) "ok" refcount(%d)
string(2) "ok" refcount(%d)
diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt
index d102534a08..0e66c0e091 100644
--- a/ext/standard/tests/array/extract_variation1.phpt
+++ b/ext/standard/tests/array/extract_variation1.phpt
@@ -18,10 +18,10 @@ echo "\nDone";
?>
--EXPECTF--
-long(4)
+int(4)
string(4) "John" refcount(%d)
int(%d)
-long(4)
+int(4)
string(4) "John" refcount(%d)
Done
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt
index 00180da1ac..ee3c31b6e6 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt
Binary files differ
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
index 1f2b7e155d..c06dff556d 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
@@ -120,36 +120,36 @@ echo "Done\n";
-- Iteration 1 --
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -161,44 +161,44 @@ object(no_member_class)#%d (0) refcount(%d){
-- Iteration 3 --
object(contains_object_class)#%d (9) refcount(%d){
["p"]=>
- long(30)
+ int(30)
["p1":protected]=>
- long(40)
+ int(40)
["p2":"contains_object_class":private]=>
- long(50)
+ int(50)
["class_object1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -207,36 +207,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object2"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -245,36 +245,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object3":"contains_object_class":private]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -283,36 +283,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object4":protected]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -324,44 +324,44 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object5"]=>
object(contains_object_class)#%d (9) refcount(%d){
["p"]=>
- long(30)
+ int(30)
["p1":protected]=>
- long(40)
+ int(40)
["p2":"contains_object_class":private]=>
- long(50)
+ int(50)
["class_object1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -370,36 +370,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object2"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -408,36 +408,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object3":"contains_object_class":private]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -446,36 +446,36 @@ object(contains_object_class)#%d (9) refcount(%d){
["class_object4":protected]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -491,36 +491,36 @@ object(contains_object_class)#%d (9) refcount(%d){
-- Iteration 4 --
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -529,36 +529,36 @@ object(object_class)#%d (6) refcount(%d){
-- Iteration 5 --
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -572,36 +572,36 @@ NULL
-- Iteration 8 --
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -610,121 +610,121 @@ object(object_class)#%d (6) refcount(%d){
-- Iteration 9 --
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (6) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
}
}
-- Iteration 10 --
-long(30)
+int(30)
-- Iteration 11 --
NULL
-- Testing debug_zval_dump() on overwritten object variables --
-long(500)
-long(500)
-long(500)
-long(500)
+int(500)
+int(500)
+int(500)
+int(500)
-- Testing debug_zval_dump() on objects having circular reference --
object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
["obj"]=>
&object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -738,55 +738,55 @@ object(object_class)#%d (7) refcount(%d){
["obj"]=>
&object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
["obj"]=>
&object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
@@ -797,38 +797,38 @@ object(object_class)#%d (7) refcount(%d){
["obj"]=>
&object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
["obj"]=>
&object(object_class)#%d (7) refcount(%d){
["value1"]=>
- long(5)
+ int(5)
["value2":"object_class":private]=>
- long(10)
+ int(10)
["value3":protected]=>
- long(20)
+ int(20)
["value4"]=>
- long(30)
+ int(30)
["array_var"]=>
array(2) refcount(%d){
["key1"]=>
- long(1)
+ int(1)
["key2 "]=>
- long(3)
+ int(3)
}
["object_class1"]=>
*RECURSION*
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index f4b768a77e..849d8b492c 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -124,27 +124,27 @@ echo "Done\n";
--- Variation 1: global variable inside a function ---
-- Value of global variable, before calling dump_globalvar() --
-long(10)
+int(10)
-- Value of local variable inside dump_globalvar() --
-long(10)
+int(10)
-- Value of global variable inside dump_globalvar() --
-long(10)
+int(10)
-- Value of global variable, after exiting dump_globalvar() --
-long(10)
+int(10)
--- Variation 2: one variable references another ---
-- Value of $first_var: --
-long(10)
+int(10)
-- Value of $ref_first_var --
NULL
-- Value of $first_var --
-long(10)
+int(10)
-- Value of $ref_first_var --
@@ -152,18 +152,18 @@ Notice: Undefined variable: ref_first_var in %s on line %d
NULL
-- Value of $first_var --
-long(10)
+int(10)
--- Variation 3: multiple references of variables ---
-- Value of $var_1: (before referencing) --
-long(10)
+int(10)
-- Value of $var_2: (referencing var_1) --
-long(10)
+int(10)
-- Value of $var_3: (referencing var_2) --
-long(10)
+int(10)
-- Value of $var_3: (after unsetting var_3) --
@@ -171,10 +171,10 @@ Notice: Undefined variable: var_3 in %s on line %d
NULL
-- Value of $var_2: --
-long(10)
+int(10)
-- Value of $var_3: --
-long(10)
+int(10)
-- Value of $var_1: (after unsetting variable_1) --
@@ -182,7 +182,7 @@ Notice: Undefined variable: var_1 in %s on line %d
NULL
-- Value of $var_2: --
-long(10)
+int(10)
*** Testing debug_zval_dump() on miscelleneous input arguments ***
-- Iteration 1 --
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 40177cd3de..7eaff11714 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -289,10 +289,10 @@ again:
php_printf("%sNULL\n", COMMON);
break;
case IS_LONG:
- php_printf("%slong(" ZEND_LONG_FMT ")\n", COMMON, Z_LVAL_P(struc));
+ php_printf("%sint(" ZEND_LONG_FMT ")\n", COMMON, Z_LVAL_P(struc));
break;
case IS_DOUBLE:
- php_printf("%sdouble(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc));
+ php_printf("%sfloat(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_P(struc));
break;
case IS_STRING:
php_printf("%sstring(%d) \"", COMMON, Z_STRLEN_P(struc));
View Lorry Controller Status