Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Check that object can actually return a class entry. I need this for a 

class-entry-less helper objects that should not be present in the class
table.
PHP-5.1
Andrei Zmievski 22 years ago
parent
d42656b033
commit
f8fc9a3256
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ext/standard/array.c

4
ext/standard/array.c
View File

@ -323,7 +323,7 @@ PHP_FUNCTION(count)
/* it the object implements Countable we call its count() method */ /* it the object implements Countable we call its count() method */
zval *retval; zval *retval;
if (instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval); zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
RETVAL_LONG(Z_LVAL_P(retval)); RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(&retval); zval_ptr_dtor(&retval);
@ -331,7 +331,7 @@ PHP_FUNCTION(count)
} }
#endif #endif
/* if not we return the number of properties (not taking visibility into account) */ /* if not we return the number of properties (not taking visibility into account) */
if (Z_OBJ_HT(*array)->count_elements) {
if (Z_OBJ_HT_P(array)->count_elements) {
RETVAL_LONG(1); RETVAL_LONG(1);
if (SUCCESS == Z_OBJ_HT(*array)->count_elements(array, &Z_LVAL_P(return_value) TSRMLS_CC)) { if (SUCCESS == Z_OBJ_HT(*array)->count_elements(array, &Z_LVAL_P(return_value) TSRMLS_CC)) {
return; return;

Write Preview
Loading…
Cancel
Save