php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src

Browse Source 
* git://github.com/php/php-src:
  Add zend assert deleted by accident
  Let's keep it simple
  Improve internal function return types checking for parent
This commit is contained in:
Dmitry Stogov
2015-03-04 18:17:06 +03:00
parent 13eed2676d 49073fcf38
commit ff039c3c6d
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/return_types/026.phpt
+9
View File
@@ -0,0 +1,9 @@
--TEST--
Return type of parent is not allowed in function
--FILE--
<?php
function test(): parent {}
--EXPECTF--
Fatal error: Cannot declare a return type of parent outside of a class scope in %s on line 3
Zend/tests/return_types/027.phpt
+9
View File
@@ -0,0 +1,9 @@
--TEST--
Return type of parent is not allowed in closure
--FILE--
<?php
$c = function(): parent {};
--EXPECTF--
Fatal error: Cannot declare a return type of parent outside of a class scope in %s on line 3
Zend/zend_API.c
+2 -2
View File
@@ -2007,8 +2007,8 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
if (info->type_hint) {
if (info->class_name) {
ZEND_ASSERT(info->type_hint == IS_OBJECT);
if (!strcasecmp(info->class_name, "self") && !scope) {
zend_error(E_CORE_ERROR, "Cannot declare a return type of self outside of a class scope");
if (!scope && (!strcasecmp(info->class_name, "self") || !strcasecmp(info->class_name, "parent"))) {
zend_error(E_CORE_ERROR, "Cannot declare a return type of %s outside of a class scope", info->class_name);
}
}