Merge pull request #1 from php/master

sync master

Author: chopins

.gitignore

@@ -80,25 +80,15 @@ include/
 libs/
 modules/
 
-# Used by scripts/dev/gen_stub.php
-scripts/dev/PHP-Parser-*
+# Used by build/gen_stub.php
+build/PHP-Parser-*
 
 # ------------------------------------------------------------------------------
 # Configuration headers generated by the PHP build system
 # ------------------------------------------------------------------------------
 config.h
 config.h.in
 /ext/date/lib/timelib_config.h
-/ext/iconv/php_have_bsd_iconv.h
-/ext/iconv/php_have_glibc_iconv.h
-/ext/iconv/php_have_ibm_iconv.h
-/ext/iconv/php_have_iconv.h
-/ext/iconv/php_have_libiconv.h
-/ext/iconv/php_iconv_aliased_libiconv.h
-/ext/iconv/php_iconv_broken_ignore.h
-/ext/iconv/php_iconv_supports_errno.h
-/ext/iconv/php_php_iconv_h_path.h
-/ext/iconv/php_php_iconv_impl.h
 /main/build-defs.h
 /main/php_config.h.in
 /main/php_config.h

.travis.yml

@@ -74,6 +74,8 @@ jobs:
           arch: amd64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
+        #- env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+        # arch: s390x
 
 before_script:
     - ccache --version
@@ -89,7 +91,9 @@ before_script:
 
 # Run PHPs run-tests.php
 script:
-    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$(nproc)
+    # ARM64 CI reports nproc=32, which is excessive.
+    - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
+    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS
     - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
 
 after_success:

CODING_STANDARDS.md

@@ -272,44 +272,23 @@ use these rules.
 1. Extensions should be well tested using `*.phpt` tests. Read about that at
     [qa.php.net](https://qa.php.net/write-test.php) documentation.
 
-## Documentation and folding hooks
+## Folding hooks
 
-In order to make sure that the online documentation stays in line with the code,
-each user-level function should have its user-level function prototype before it
-along with a brief one-line description of what the function does. It would look
-like this:
+Use `{{{` symbols for the folding mode in Emacs and vim (`set fdm=marker`).
+Folding is very useful when dealing with large files because you can scroll
+through the file quickly and just unfold the function you wish to work on.
+The `}}}` at the end of each function marks the end of the fold, and should
+be on a separate line.
 
 ```c
-/* {{{ proto int abs(int number)
-   Returns the absolute value of the number */
+/* {{{ Returns the absolute value of the number */
 PHP_FUNCTION(abs)
 {
     ...
 }
 /* }}} */
 ```
 
-The `{{{` symbols are the default folding symbols for the folding mode in Emacs
-and vim (`set fdm=marker`). Folding is very useful when dealing with large files
-because you can scroll through the file quickly and just unfold the function you
-wish to work on. The `}}}` at the end of each function marks the end of the
-fold, and should be on a separate line.
-
-The `proto` keyword there is just a helper for the `doc/genfuncsummary` script
-which generates a full function summary. Having this keyword in front of the
-function prototypes allows us to put folds elsewhere in the code without
-messing up the function summary.
-
-Optional arguments are written like this:
-
-```c
-/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters */
-```
-
-And yes, please keep the prototype on a single line, even if that line is
-massive.
-
 ## New and experimental functions
 
 To reduce the problems normally associated with the first public implementation
@@ -334,8 +313,7 @@ purposes, these will only be documented by the most current name, with the
 aliases listed in the documentation for the parent function. For ease of
 reference, user-functions with completely different names, that alias to the
 same function (such as `highlight_file` and `show_source`), will be separately
-documented. The proto should still be included, describing which function is
-aliased.
+documented.
 
 Backwards compatible functions and names should be maintained as long as the
 code can be reasonably be kept as part of the codebase. See the `README` in the

CONTRIBUTING.md

@@ -197,9 +197,6 @@ locations.
     └─ tokenizer/
        ├─ tokenizer_data.c          # Generated by `ext/tokenizer/tokenizer_data_gen.sh`
        └─ ...
-    └─ xmlrpc/
-       ├─ libxmlrpc/                # Forked and maintained in php-src
-       └─ ...
     └─ zend_test                    # For testing internal APIs. Not needed for regular builds.
        └─ ...
     └─ zip/                         # Bundled https://github.com/pierrejoye/php_zip

EXTENSIONS

@@ -214,11 +214,6 @@ PRIMARY MAINTAINER:  Rob Richards <[email protected]> (2004 - 2010)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           xmlrpc
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Orphaned
-STATUS:              Experimental
--------------------------------------------------------------------------------
 EXTENSION:           xmlwriter
 PRIMARY MAINTAINER:  Rob Richards <[email protected]> (2004 - 2010)
                      Pierre-Alain Joye <[email protected]> (2005-2009)
@@ -298,7 +293,7 @@ SINCE:               7.4.0
 -------------------------------------------------------------------------------
 EXTENSION:           fileinfo
 PRIMARY MAINTAINER:  Derick Rethans <[email protected]> (2004 - 2008)
-                     Anatol Belski <[email protected]> (2012 - 2019)
+                     Anatol Belski <[email protected]> (2012 - 2020)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3