php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ext/standard: make debug_zval_dump() output whether the array is packed (#12641)

Browse Source
This commit is contained in:
Max Semenik
2024-01-12 03:33:14 +03:00
committed by GitHub
parent d6a0b3af68
commit a2b2830f9b
8 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -139,6 +139,7 @@ Standard:
. Cast large floats that are within int range to int in number_format so
the precision is not lost. (Marc Bennewitz)
. Add support for 4 new rounding modes to the round() function. (Jorg Sowa)
. debug_zval_dump() now indicates whether an array is packed. (Max Semenik)
XML:
. Added XML_OPTION_PARSE_HUGE parser option. (nielsdos)

1
UPGRADING
View File

@@ -310,6 +310,7 @@ PDO_SQLITE:
PHP_ROUND_FLOOR, PHP_ROUND_TOWARD_ZERO, PHP_ROUND_AWAY_FROM_ZERO.
RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function
. debug_zval_dump() now indicates whether an array is packed.
========================================
6. New Functions

2
ext/mysqli/tests/mysqli_result_references.phpt
View File

@@ -84,7 +84,7 @@ opcache.enable=0
require_once 'clean_table.inc';
?>
--EXPECTF--
array(7) refcount(2){
array(7) packed refcount(2){
[0]=>
array(2) refcount(1){
["id"]=>

4
ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
View File

@@ -52,7 +52,7 @@ require_once 'skipifconnectfailure.inc';
require_once 'clean_table.inc';
?>
--EXPECTF--
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
array(4) refcount(%d){
["row_ref"]=>
@@ -74,7 +74,7 @@ array(1) refcount(%d){
string(1) "1" interned
}
}
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
array(4) refcount(%d){
["row_ref"]=>

24
ext/standard/tests/general_functions/debug_zval_dump_b.phpt
View File

@@ -184,36 +184,36 @@ bool(false)
array(0) interned {
}
-- Iteration 44 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
NULL
}
-- Iteration 45 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
bool(true)
}
-- Iteration 46 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
string(0) "" interned
}
-- Iteration 47 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
string(0) "" interned
}
-- Iteration 48 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
int(1)
[1]=>
int(2)
}
[1]=>
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(1) "a" interned
[1]=>
@@ -228,31 +228,31 @@ array(2) refcount(%d){
string(3) "One" refcount(%d)
}
-- Iteration 50 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
int(0)
}
-- Iteration 51 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
int(-1)
}
-- Iteration 52 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
float(10.5)
[1]=>
float(5.6)
}
-- Iteration 53 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(6) "string" refcount(%d)
[1]=>
string(4) "test" refcount(%d)
}
-- Iteration 54 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(6) "string" refcount(%d)
[1]=>

24
ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt
View File

@@ -188,36 +188,36 @@ bool(false)
array(0) interned {
}
-- Iteration 44 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
NULL
}
-- Iteration 45 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
bool(true)
}
-- Iteration 46 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
string(0) "" interned
}
-- Iteration 47 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
string(0) "" interned
}
-- Iteration 48 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
int(1)
[1]=>
int(2)
}
[1]=>
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(1) "a" interned
[1]=>
@@ -232,31 +232,31 @@ array(2) refcount(%d){
string(3) "One" refcount(%d)
}
-- Iteration 50 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
int(0)
}
-- Iteration 51 --
array(1) refcount(%d){
array(1) packed refcount(%d){
[0]=>
int(-1)
}
-- Iteration 52 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
float(10.5)
[1]=>
float(5.6)
}
-- Iteration 53 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(6) "string" refcount(%d)
[1]=>
string(4) "test" refcount(%d)
}
-- Iteration 54 --
array(2) refcount(%d){
array(2) packed refcount(%d){
[0]=>
string(6) "string" refcount(%d)
[1]=>

8
ext/standard/tests/general_functions/debug_zval_dump_refs.phpt
View File

@@ -16,13 +16,13 @@ debug_zval_dump($a);
?>
--EXPECT--
array(1) refcount(2){
array(1) packed refcount(2){
[0]=>
reference refcount(2) {
int(1)
}
}
array(2) refcount(2){
array(2) packed refcount(2){
[0]=>
reference refcount(3) {
int(1)
@@ -32,13 +32,13 @@ array(2) refcount(2){
int(1)
}
}
array(1) refcount(2){
array(1) packed refcount(2){
[0]=>
reference refcount(2) {
int(1)
}
}
array(1) refcount(2){
array(1) packed refcount(2){
[0]=>
reference refcount(1) {
int(1)

6
ext/standard/var.c
View File

@@ -284,6 +284,7 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level) /* {{{ */
zend_string *key;
zval *val;
uint32_t count;
char *packed;
if (level > 1) {
php_printf("%*c", level - 1, ' ');
@@ -325,11 +326,12 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level) /* {{{ */
GC_PROTECT_RECURSION(myht);
}
count = zend_hash_num_elements(myht);
packed = HT_IS_PACKED(myht) ? "packed " : "";
if (Z_REFCOUNTED_P(struc)) {
/* -1 because of ADDREF above. */
php_printf("array(%d) refcount(%u){\n", count, Z_REFCOUNT_P(struc) - 1);
php_printf("array(%d) %srefcount(%u){\n", count, packed, Z_REFCOUNT_P(struc) - 1);
} else {
php_printf("array(%d) interned {\n", count);
php_printf("array(%d) %sinterned {\n", count, packed);
}
ZEND_HASH_FOREACH_KEY_VAL(myht, index, key, val) {
zval_array_element_dump(val, index, key, level);