Skip to content

Commit b0139dc

Browse files
dstogovdstogov
committed
Merge branch 'master' into preload
* master: Mark "top-level" functions. Don't initialize static_member_tables during start-up, when inherit internal classes. [ci skip] Update NEWS [ci skip] Update NEWS [ci skip] Update NEWS Fix #77035: The phpize and ./configure create redundant .deps file Remove outdated PEAR artefacts Fix tests/output/bug74815.phpt generating errors.log Revert "Use C++ symbols, when C++11 or upper is compiled" Use C++ symbols, when C++11 or upper is compiled Added new line Remove stamp-h Move all testing docs to qa.php.net Fix a typo in UPGRADING.INTERNALS Fix test when it's run on another drive [ci skip] Update UPGRADING wrt. tidyp support Fixed incorrect reallocation Fix #77027: tidy::getOptDoc() not available on Windows Run CI tests under opcache.protect_memory=1
2 parents a609520 + 3fe698b commit b0139dc

27 files changed

+67
-251
lines changed

‎.gitignore‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*.tar.xz.asc
2727
.FBCIndex
2828
.FBCLockFolder
29-
.deps
3029
.libs
3130
phpt.*
3231
core
@@ -71,24 +70,16 @@ php_test_results_*.txt
7170
php_version.h
7271
results.txt
7372
shlibtool
74-
stamp-h
7573
test.php3
7674
tmp-php.ini
77-
stamp-h.in
7875
scan_makefile_in.awk
7976
main/php_config.h
8077
main/php_config.h.in
8178
main/build-defs.h
8279
main/internal_functions_cli.c
8380
main/config.w32.h
84-
main/stamp-h1
8581
main/streams/build-defs.h
86-
main/streams/stamp-h1
8782
pear/install-pear-nozlib.phar
88-
pear/phpize
89-
pear/run-tests
90-
pear/php-config
91-
pear/scripts
9283
sapi/apache2handler/libphp7.module
9384
sapi/cgi/php-cgi
9485
sapi/cgi/php-cgi.1

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ before_script:
6969

7070
# Run PHPs run-tests.php
7171
script:
72-
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
72+
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
7373

7474
after_success:
7575
- ccache --show-stats

‎CODING_STANDARDS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Testing
251251
-------
252252

253253
1. Extensions should be well tested using *.phpt tests. Read about that
254-
in README.TESTING.
254+
at https://qa.php.net/write-test.php.
255255

256256
Documentation and Folding Hooks
257257
-------------------------------

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ We love getting new tests! PHP is a huge project and improving code coverage is
5252
a huge win for every PHP user.
5353

5454
[Our QA site includes a page detailing how to write test cases.](http://qa.php.net/write-test.php)
55-
Please note that the section on submitting pull requests is outdated: in
56-
addition to the process listed there, you can also
57-
[submit pull requests](#pull-requests).
5855

5956
## Writing documentation
6057

‎Makefile.global‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ clean:
118118
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
119119

120120
distclean: clean
121-
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
121+
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
122122
rm -f php7.spec main/build-defs.h scripts/phpize
123123
rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
124124
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1

‎README.SUBMITTING_PATCH‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,10 @@ work on "master".
138138

139139
Read CODING_STANDARDS before you start working.
140140

141-
After modifying the source see README.TESTING and
142-
http://qa.php.net/write-test.php for how to test. Submitting test
143-
scripts helps us to understand what functionality has changed. It is
144-
important for the stability and maintainability of PHP that tests are
145-
comprehensive.
141+
After modifying the source see https://qa.php.net/write-test.php for
142+
how to test. Submitting test scripts helps us to understand what
143+
functionality has changed. It is important for the stability and
144+
maintainability of PHP that tests are comprehensive.
146145

147146
After testing is finished, create a patch file using the command:
148147

‎README.TESTING‎

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

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@ Guidelines for contributors
3737
- [README.GIT-RULES](/README.GIT-RULES)
3838
- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
3939
- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
40+
41+
## Testing
42+
43+
To run tests the `make test` is used after successful compilation of the sources.
44+
45+
See [Creating new test files](https://qa.php.net/write-test.php) chapter for more
46+
information about testing.

‎UPGRADING.INTERNALS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PHP 7.4 INTERNALS UPGRADE NOTES
3434
c. Function/property/class flags changes
3535
- ZEND_ACC_CTOR and ZEND_ACC_DTOR are removed. It's possible to check if
3636
method is a constructor/destructor using the following condition
37-
(func->commpon.scope->constructor == func).
37+
(func->common.scope->constructor == func).
3838
- ZEND_ACC_IMPLEMENTED_ABSTRACT is removed (it was used only internally
3939
during inheritance).
4040
- ZEND_ACC_IMPLICIT_PUBLIC is removed (it was used only for reflection)

‎Zend/zend_compile.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5895,6 +5895,10 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /*
58955895

58965896
CG(active_op_array) = op_array;
58975897

5898+
if (toplevel) {
5899+
op_array->fn_flags |= ZEND_ACC_TOP_LEVEL;
5900+
}
5901+
58985902
zend_oparray_context_begin(&orig_oparray_context);
58995903

59005904
if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) {

0 commit comments

Comments
 (0)