granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3e5fdef 22a077b)

author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 6 Apr 2020 10:03:01 +0000 (12:03 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 6 Apr 2020 10:04:12 +0000 (12:04 +0200)
commit	98097138442181ba0435934d5cf4f6d257acaac6
tree	244eb8dac14c30306cca2c6f016f2f96762ce002	tree \| snapshot
parent	3e5fdef96ec213ab16ea9df16bd083338d0d1720	commit \| diff
parent	22a077b642815a2e1c36ba03df906146c9ecbe50	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
Fix #69264: __debugInfo() ignored while extending SPL classes

15 files changed:

ext/spl/spl_array.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_array.stub.php	diff1 \|	\|	blob \| history
ext/spl/spl_array_arginfo.h	diff1 \|	\|	blob \| history
ext/spl/spl_directory.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_directory.stub.php	diff1 \|	\|	blob \| history
ext/spl/spl_directory_arginfo.h	diff1 \|	\|	blob \| history
ext/spl/spl_dllist.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_dllist.stub.php	diff1 \|	\|	blob \| history
ext/spl/spl_dllist_arginfo.h	diff1 \|	\|	blob \| history
ext/spl/spl_heap.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_heap.stub.php	diff1 \|	\|	blob \| history
ext/spl/spl_heap_arginfo.h	diff1 \|	\|	blob \| history
ext/spl/spl_observer.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_observer.stub.php	diff1 \|	\|	blob \| history
ext/spl/spl_observer_arginfo.h	diff1 \|	\|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.