com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend_compile.c Zend/zend_execute_API .c
ext/readline/readline_cli.c main/main.c

Commit: 60f0695a0982c556c826191d28c8ba3a72fd2a2b Author: Anatol Belski <ab@php.net> Mon, 6 Oct 2014 08:42:53 +0200 Parents: 08b26382750ea0ad39b76323d1caf2497fd939ca 43f3d250f45e095150d12185f9ac8bfaad27d1cc Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60f0695a0982c556c826191d28c8ba3a72fd2a2b Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (42 commits) Add tests verifying calls work inside echo, concatenation and array access Updated NEWS and UPGRADING Fix $this CV init for include/eval Fix dynamic calls to static methods with fci->object Fix $arr =& $arr[0] Add UPGRADING stubs for a number of recent changes Regenerate tokenizer data Fix unused variable warning Remove <% and <script language="php"> tags zend_uint -> uint32_t Fix nesting for *non*-compile-time-resolveable functions See https://github.com/thekid/php-src/commit/a1a4ba95117cca77b6a669d01b1cf97ea4fcb507#commitcomment-7414223 Add tests for calls to nested, *non*-compile-time-resolveable functions See https://github.com/thekid/php-src/commit/a1a4ba95117cca77b6a669d01b1cf97ea4fcb507#commitcomment-7414362 Make list of opcodes used for nesting calculation consistent with zend_do_convert_call_user_func() in Zend/zend_compile.c Rewrite code to use ZEND_VM_JMP() instead of repeated ZEND_VM_INC_OPCODE() calls QA: Simplify code to find matching ZEND_DO_FCALL_BY_NAME CG(context).nested_calls is stored inside the initializer's result.num and inside the finalizer's op2.num, by comparing these we don't need to count manually, and are thus safer from future expansion with specialized opcodes e.g. Fix expected fatal error, now is catchable fatal Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master Check for memory leaks when not using return value Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master Add tests with arrays as parameters ... Changed paths: MM Zend/zend.c MM Zend/zend_compile.c MM Zend/zend_execute_API.c MM ext/readline/readline_cli.c MM main/main.c Diff: