diff options
| author | Nikita Popov <nikic@php.net> | 2016-08-06 15:24:23 +0200 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-08-23 10:29:15 +0300 |
| commit | 906456c4106ac74da0688b2481e91e27de3b176b (patch) | |
| tree | 2f63f965aa2d372339999f7a5a1973161348e0f4 /ext/phar | |
| parent | 26d74a0420d7b915c701b0a6afc2a90b5ac5782f (diff) | |
| download | php-git-906456c4106ac74da0688b2481e91e27de3b176b.tar.gz | |
call_user_func(_array): Don't abort on reference warning
Change zend_call_function() to not abort the call if a non-reference
is passed to a reference argument. The usual warning will still be
thrown, but the call will proceed as usual.
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/tests/cache_list/files/frontcontroller17.phar | bin | 315 -> 344 bytes | |||
| -rw-r--r-- | ext/phar/tests/cache_list/files/frontcontroller17.phar.inc | 2 | ||||
| -rw-r--r-- | ext/phar/tests/cache_list/frontcontroller32.phpt | 2 | ||||
| -rw-r--r-- | ext/phar/tests/files/frontcontroller17.phar | bin | 315 -> 344 bytes | |||
| -rw-r--r-- | ext/phar/tests/files/frontcontroller17.phar.inc | 2 | ||||
| -rw-r--r-- | ext/phar/tests/frontcontroller32.phpt | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/ext/phar/tests/cache_list/files/frontcontroller17.phar b/ext/phar/tests/cache_list/files/frontcontroller17.phar Binary files differindex b83d41fd5b..d9b8330e63 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller17.phar +++ b/ext/phar/tests/cache_list/files/frontcontroller17.phar diff --git a/ext/phar/tests/cache_list/files/frontcontroller17.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller17.phar.inc index 85b8729f31..715479552a 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller17.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller17.phar.inc @@ -6,7 +6,7 @@ echo "hi"; '; $a->setStub('<?php try { -Phar::webPhar("test.phar", "/index.php", null, array(), "sort"); +Phar::webPhar("test.phar", "/index.php", null, array(), function() { throw new Exception; }); } catch (Exception $e) { die($e->getMessage() . "\n"); } diff --git a/ext/phar/tests/cache_list/frontcontroller32.phpt b/ext/phar/tests/cache_list/frontcontroller32.phpt index 59116907a5..cb9abb8c19 100644 --- a/ext/phar/tests/cache_list/frontcontroller32.phpt +++ b/ext/phar/tests/cache_list/frontcontroller32.phpt @@ -13,4 +13,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller17.phar --EXPECTF-- -%ahar error: failed to call rewrite callback
\ No newline at end of file +%ahar error: rewrite callback must return a string or false diff --git a/ext/phar/tests/files/frontcontroller17.phar b/ext/phar/tests/files/frontcontroller17.phar Binary files differindex b83d41fd5b..4dab78a9ec 100644 --- a/ext/phar/tests/files/frontcontroller17.phar +++ b/ext/phar/tests/files/frontcontroller17.phar diff --git a/ext/phar/tests/files/frontcontroller17.phar.inc b/ext/phar/tests/files/frontcontroller17.phar.inc index 85b8729f31..715479552a 100644 --- a/ext/phar/tests/files/frontcontroller17.phar.inc +++ b/ext/phar/tests/files/frontcontroller17.phar.inc @@ -6,7 +6,7 @@ echo "hi"; '; $a->setStub('<?php try { -Phar::webPhar("test.phar", "/index.php", null, array(), "sort"); +Phar::webPhar("test.phar", "/index.php", null, array(), function() { throw new Exception; }); } catch (Exception $e) { die($e->getMessage() . "\n"); } diff --git a/ext/phar/tests/frontcontroller32.phpt b/ext/phar/tests/frontcontroller32.phpt index 58f6fffa00..032d0f571d 100644 --- a/ext/phar/tests/frontcontroller32.phpt +++ b/ext/phar/tests/frontcontroller32.phpt @@ -12,4 +12,4 @@ Content-type: text/html; charset=UTF-8 --FILE_EXTERNAL-- files/frontcontroller17.phar --EXPECTF-- -%ahar error: failed to call rewrite callback
\ No newline at end of file +%ahar error: rewrite callback must return a string or false |