Skip to content

Commit bc47dc9

Browse files
dstogovdstogov
committed
Merge branch 'master' into jit-dynasm
* master: Remove custom error handler in mbstring tests Remove more zpp error tests Remove tests for zpp failure conditions add NEWS entry Fixed support for callbacks with "void" return type Update NEWS Fix bug #77630 - safer rename() procedure Replace --with-gd by --enable-gd for Travis Fix test portability Update NEWS Fixed bug #77691 Move Makefile.global and Makefile.gcov to build directory Revert "Detect invalid uses of parent:: during compilation" Replace PHP_TM_GMTOFF with AC_CHECK_MEMBERS Remove mkinstalldirs, install-sh and missing add NEWS entries
2 parents b5e2ae2 + 8032428 commit bc47dc9

File tree

188 files changed

+206
-6179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+206
-6179
lines changed

‎.gitignore‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ Makefile
8181
Makefile.fragments
8282
Makefile.objects
8383

84-
# Generated by `./buildconf` or `cd ext/name && phpize`
85-
install-sh
86-
missing
87-
mkinstalldirs
88-
8984
# RPM specification file generated by `./configure`
9085
/php.spec
9186

@@ -266,7 +261,7 @@ phpt.*
266261
tmp-php.ini
267262

268263
# ------------------------------------------------------------------------------
269-
# Generated by GCC's gcov and LCOV via Makefile.gcov and gcov.php.net
264+
# Generated by GCC's gcov and LCOV via build/Makefile.gcov and gcov.php.net
270265
# ------------------------------------------------------------------------------
271266
*.gcda
272267
*.gcno

‎Zend/tests/class_name_as_scalar_error_002.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ namespace Foo\Bar {
1111
}
1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot use "parent" when current class scope has no parent in %s on line %d
14+
Fatal error: Uncaught Error: Cannot use "parent" when current class scope has no parent in %s:%d
15+
Stack trace:
16+
#0 {main}
17+
thrown in %s on line %d

‎Zend/zend_compile.c‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,16 +1295,10 @@ static uint32_t zend_get_class_fetch_type_ast(zend_ast *name_ast) /* {{{ */
12951295

12961296
static void zend_ensure_valid_class_fetch_type(uint32_t fetch_type) /* {{{ */
12971297
{
1298-
if (fetch_type != ZEND_FETCH_CLASS_DEFAULT && zend_is_scope_known()) {
1299-
zend_class_entry *ce = CG(active_class_entry);
1300-
if (!ce) {
1301-
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"%s\" when no class scope is active",
1302-
fetch_type == ZEND_FETCH_CLASS_SELF ? "self" :
1303-
fetch_type == ZEND_FETCH_CLASS_PARENT ? "parent" : "static");
1304-
} else if (fetch_type == ZEND_FETCH_CLASS_PARENT && !ce->parent_name) {
1305-
zend_error_noreturn(E_COMPILE_ERROR,
1306-
"Cannot use \"parent\" when current class scope has no parent");
1307-
}
1298+
if (fetch_type != ZEND_FETCH_CLASS_DEFAULT && !CG(active_class_entry) && zend_is_scope_known()) {
1299+
zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"%s\" when no class scope is active",
1300+
fetch_type == ZEND_FETCH_CLASS_SELF ? "self" :
1301+
fetch_type == ZEND_FETCH_CLASS_PARENT ? "parent" : "static");
13081302
}
13091303
}
13101304
/* }}} */

‎acinclude.m4‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ EOF
160160
eval echo "$i = \$$i" >> Makefile
161161
done
162162
163-
cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile
163+
cat $abs_srcdir/build/Makefile.global Makefile.fragments Makefile.objects >> Makefile
164164
])
165165

166166
dnl
@@ -1337,20 +1337,6 @@ int readdir_r(DIR *, struct dirent *);
13371337
fi
13381338
])
13391339

1340-
dnl
1341-
dnl PHP_TM_GMTOFF
1342-
dnl
1343-
AC_DEFUN([PHP_TM_GMTOFF],[
1344-
AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
1345-
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
1346-
#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],
1347-
[ac_cv_struct_tm_gmtoff=yes], [ac_cv_struct_tm_gmtoff=no])])
1348-
1349-
if test "$ac_cv_struct_tm_gmtoff" = yes; then
1350-
AC_DEFINE(HAVE_TM_GMTOFF,1,[whether you have tm_gmtoff in struct tm])
1351-
fi
1352-
])
1353-
13541340
dnl
13551341
dnl PHP_STRUCT_FLOCK
13561342
dnl

Makefile.gcov renamed to build/Makefile.gcov

File renamed without changes.

Makefile.global renamed to build/Makefile.global

File renamed without changes.

‎build/build2.mk‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
include generated_lists
1818

19-
TOUCH_FILES = mkinstalldirs install-sh missing
20-
2119
config_h_in = main/php_config.h.in
2220

23-
targets = $(TOUCH_FILES) configure $(config_h_in)
21+
targets = configure $(config_h_in)
2422

2523
PHP_AUTOCONF ?= 'autoconf'
2624
PHP_AUTOHEADER ?= 'autoheader'
@@ -36,9 +34,6 @@ $(config_h_in): configure
3634
@rm -f $@
3735
$(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS)
3836

39-
$(TOUCH_FILES):
40-
touch $(TOUCH_FILES)
41-
4237
aclocal.m4: configure.ac acinclude.m4
4338
@echo rebuilding $@
4439
cat acinclude.m4 ./build/libtool.m4 > $@

‎configure.ac‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,6 @@ AC_STRUCT_TIMEZONE
500500

501501
PHP_MISSING_TIME_R_DECL
502502
PHP_MISSING_FCLOSE_DECL
503-
504-
PHP_TM_GMTOFF
505503
PHP_STRUCT_FLOCK
506504
PHP_SOCKLEN_T
507505

@@ -550,7 +548,8 @@ PHP_CHECK_CPU_SUPPORTS([sse4.2])
550548
PHP_CHECK_CPU_SUPPORTS([avx])
551549
PHP_CHECK_CPU_SUPPORTS([avx2])
552550

553-
dnl Check for members of the stat structure
551+
dnl Check for structure members
552+
AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
554553
AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev])
555554
dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exist
556555
dnl The WARNING_LEVEL required because cc in QNX hates -w option without an argument
@@ -870,7 +869,7 @@ if test "$PHP_GCOV" = "yes"; then
870869
fi
871870

872871
AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
873-
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
872+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir)
874873

875874
dnl Remove all optimization flags from CFLAGS
876875
changequote({,})

‎ext/bcmath/tests/bcadd_error1.phpt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ext/bcmath/tests/bcdiv_error2.phpt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)