clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Closure::__toString()

Browse Source
This commit is contained in:
Dmitry Stogov 2008-07-31 07:10:43 +00:00
parent 570d0c8cbf
commit bc8defa547
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zend/tests/closure_015.phpt
View File

@ -2,6 +2,11 @@
Closure 015: converting to string/unicode
--FILE--
<?php
set_error_handler('myErrorHandler', E_RECOVERABLE_ERROR);
function myErrorHandler($errno, $errstr, $errfile, $errline) {
echo "Error: $errstr at $errfile($errline)\n";
return true;
}
$x = function() { return 1; };
print (string) $x;
print "\n";
@ -10,7 +15,9 @@ print "\n";
print $x;
print "\n";
?>
--EXPECT--
Closure object
Closure object
Closure object
--EXPECTF--
Error: Object of class Closure could not be converted to string at %sclosure_015.php(8)
Error: Object of class Closure could not be converted to string at %sclosure_015.php(10)
Error: Object of class Closure could not be converted to string at %sclosure_015.php(12)

25
Zend/zend_closures.c
View File

@ -85,30 +85,6 @@ static int zend_closure_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
}
/* }}} */
static int zend_closure_cast_object_tostring(zval *readobj, zval *writeobj, int type, void *extra TSRMLS_DC) /* {{{ */
{
zend_class_entry *ce;
switch (type) {
case IS_STRING:
INIT_PZVAL(writeobj);
ZVAL_STRINGL(writeobj, ZEND_CLOSURE_PRINT_NAME, sizeof(ZEND_CLOSURE_PRINT_NAME)-1, 1);
return SUCCESS;
case IS_UNICODE:
INIT_PZVAL(writeobj);
ZVAL_UNICODEL(writeobj, USTR_MAKE(ZEND_CLOSURE_PRINT_NAME), sizeof(ZEND_CLOSURE_PRINT_NAME)-1, 0);
return SUCCESS;
default:
ce = Z_OBJCE_P(readobj);
zend_error(E_NOTICE, "Object of class %v could not be converted to %s", ce->name, zend_get_type_by_const(type));
INIT_PZVAL(writeobj);
Z_TYPE_P(writeobj) = IS_NULL;
break;
}
return FAILURE;
}
/* }}} */
static zend_function *zend_closure_get_method(zval **object_ptr, zstr method_name, int method_len TSRMLS_DC) /* {{{ */
{
unsigned int lc_name_len;
@ -235,7 +211,6 @@ void zend_register_closure_ce(TSRMLS_D) /* {{{ */
closure_handlers.has_property = zend_closure_has_property;
closure_handlers.unset_property = zend_closure_unset_property;
closure_handlers.compare_objects = zend_closure_compare_objects;
closure_handlers.cast_object = zend_closure_cast_object_tostring;
closure_handlers.clone_obj = NULL;
}
/* }}} */