granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1850785 61ed904)

author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 25 Jan 2021 17:48:35 +0000 (18:48 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 25 Jan 2021 17:49:22 +0000 (18:49 +0100)
commit	2e580da28ebebb35eefd084dc5a0cdbc94872ff4
tree	d40774e91f7e77c17f5a3840f854b6626c1de06f	tree \| snapshot
parent	18507853cb727361ea09fca8a7e4458b9262b145	commit \| diff
parent	61ed904cecbfd2eb6e5c39c22de3c215a2aee722	commit \| diff

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon

NEWS	diff1 \|	diff2 \|	blob \| history
ext/phar/phar.c	diff1 \|	diff2 \|	blob \| history
ext/phar/tests/phar_stub_error.phpt	diff1 \|	diff2 \|	blob \| history

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