Merge remote-tracking branch 'remotes/upstream/master' into array_values

Author: rjhdby

.editorconfig

@@ -1,17 +1,19 @@
-# http://editorconfig.org/
+# https://editorconfig.org/
 
 root = true
 
-[*.{c,h,awk,w32,bat,mk,frag}]
+[*]
+tab_width                = 4
+
+[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
 charset                  = utf-8
 end_of_line              = lf
 indent_size              = 4
 indent_style             = tab
-tab_width                = 4
 trim_trailing_whitespace = true
 insert_final_newline     = true
 
-[*.{php,phpt}]
+[*.{php,phpt,inc}]
 charset                  = utf-8
 end_of_line              = lf
 indent_size              = 4
@@ -31,5 +33,15 @@ insert_final_newline     = true
 charset                  = utf-8
 end_of_line              = lf
 indent_style             = space
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
+insert_final_newline     = true
+max_line_length          = 80
+
+[COMMIT_EDITMSG]
+charset                  = utf-8
+end_of_line              = lf
+indent_size              = 4
+indent_style             = space
+trim_trailing_whitespace = true
 insert_final_newline     = true
+max_line_length          = 80

EXTENSIONS

@@ -171,7 +171,7 @@ COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less hav
 -------------------------------------------------------------------------------
 EXTENSION:           sqlite3
 PRIMARY MAINTAINER:  Scott MacVicar <[email protected]> (2008 - 2011)
-                     Christoph M. Becker <[email protected]> (2016 - 2018)
+                     Christoph M. Becker <[email protected]> (2016 - 2019)
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -327,7 +327,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gd
 PRIMARY MAINTAINER:  Pierre-Alain Joye <[email protected]> (2002 - 2016)
-                     Christoph M. Becker <[email protected]> (2015 - 2018)
+                     Christoph M. Becker <[email protected]> (2015 - 2019)
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -337,7 +337,7 @@ MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           gmp
-PRIMARY MAINTAINER:  Stanislav Malyshev <[email protected]> (2000 - 2018)
+PRIMARY MAINTAINER:  Stanislav Malyshev <[email protected]> (2000 - 2019)
                      Antony Dovgal <[email protected]> (2005 - 2010)
 MAINTENANCE:         Maintained
 STATUS:              Working
@@ -357,7 +357,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           intl
-PRIMARY MAINTAINER:  Stanislav Malyshev <[email protected]> (2008 - 2018)
+PRIMARY MAINTAINER:  Stanislav Malyshev <[email protected]> (2008 - 2019)
                      Anatol Belski <[email protected]> (2017 - 2018)
 MAINTENANCE:         Maintained
 STATUS:              Working

INSTALL

@@ -1,46 +1,111 @@
-The PHP Interpreter
-===================
+<div align="center">
+    <a href="https://php.net">
+        <img
+            alt="PHP"
+            src="https://static.php.net/www.php.net/images/logos/new-php-logo.svg"
+            width="150">
+    </a>
+</div>
 
-This is the github mirror of the official PHP repository located at
-https://git.php.net.
+# The PHP Interpreter
 
-[![Build Status](https://secure.travis-ci.org/php/php-src.svg?branch=master)](http://travis-ci.org/php/php-src)
+PHP is a popular general-purpose scripting language that is especially suited to
+web development. Fast, flexible and pragmatic, PHP powers everything from your
+blog to the most popular websites in the world. PHP is distributed under the PHP
+License v3.01.
+
+[![Build status](https://travis-ci.org/php/php-src.svg?branch=master)](https://travis-ci.org/php/php-src)
 [![Build status](https://ci.appveyor.com/api/projects/status/meyur6fviaxgdwdy?svg=true)](https://ci.appveyor.com/project/php/php-src)
 
-Pull Requests
-=============
-PHP accepts pull requests via github. Discussions are done on github, but
-depending on the topic can also be relayed to the official PHP developer
-mailing list [email protected].
+## Documentation
+
+The PHP manual is available at [php.net/docs](https://php.net/docs).
+
+## Installation
+
+### Prebuilt packages and binaries
+
+Prebuilt packages and binaries can be used to get up and running fast with PHP.
+
+For Windows, the PHP binaries can be obtained from
+[windows.php.net](https://windows.php.net). After extracting the archive the
+`*.exe` files are ready to use.
+
+For other systems, see the [installation chapter](https://php.net/install).
+
+### Building PHP from source
+
+On \*nix systems:
+
+    ./buildconf
+    ./configure
+    make
+    make test
+    sudo make install
 
-New features require an RFC and must be accepted by the developers.
-See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
-information on the process.
+See `./configure -h` and `make -h` for configuration options. For example, the
+`-j` option allows parallel execution of the build recipes where `N` is the
+number of available processor cores:
 
-Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
+    make -j N
+
+For Windows, see
+[Build your own PHP on Windows](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2).
+
+## PHP extensions
+
+Extensions provide additional functionality on top of PHP. PHP consists of many
+essential bundled extensions. Additional extensions can be found in the PHP
+Extension Community Library - [PECL](https://pecl.php.net).
+
+## Contributing
+
+The PHP source code is located in the Git repository at
+[git.php.net](https://git.php.net). Contributions are most welcome by forking
+the [GitHub mirror repository](https://github.com/php/php-src) and sending a
+pull request.
+
+Discussions are done on GitHub, but depending on the topic can also be relayed
+to the official PHP developer mailing list [email protected].
+
+New features require an RFC and must be accepted by the developers. See
+[Request for comments - RFC](https://wiki.php.net/rfc) and
+[Voting on PHP features](https://wiki.php.net/rfc/voting) for more information
+on the process.
+
+Bug fixes **do not** require an RFC but require a bug tracker ticket. Open a
+ticket at [bugs.php.net](https://bugs.php.net) and reference the bug id using
+`#NNNNNN`.
 
     Fix #55371: get_magic_quotes_gpc() throws deprecation warning
 
-    After removing magic quotes, the get_magic_quotes_gpc function caused
-    a deprecate warning. get_magic_quotes_gpc can be used to detected
-    the magic_quotes behavior and therefore should not raise a warning at any
-    time. The patch removes this warning
+    After removing magic quotes, the get_magic_quotes_gpc function caused a
+    deprecated warning. get_magic_quotes_gpc can be used to detect the
+    magic_quotes behavior and therefore should not raise a warning at any time.
+    The patch removes this warning.
 
-We do not merge pull requests directly on github. All PRs will be
-pulled and pushed through https://git.php.net.
+Pull requests are not merged directly on GitHub. All PRs will be pulled and
+pushed through [git.php.net](https://git.php.net). See
+[Git workflow](https://wiki.php.net/vcs/gitworkflow) for more details.
 
+### Guidelines for contributors
 
-Guidelines for contributors
-===========================
-- [CODING_STANDARDS](/CODING_STANDARDS)
-- [README.GIT-RULES](/README.GIT-RULES)
-- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
-- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
+See further documents in the repository for more information on how to
+contribute:
+
+- [Contributing to PHP](/CONTRIBUTING.md)
+- [PHP coding standards](/CODING_STANDARDS)
+- [Git rules](/README.GIT-RULES)
+- [Mailinglist rules](/README.MAILINGLIST_RULES)
+- [PHP release process](/README.RELEASE_PROCESS)
 
 ## Testing
 
-To run tests the `make test` is used after successful compilation of the sources.
+To run tests the `make test` is used after a successful compilation of the
+sources. The `-j` option provides faster parallel execution based on the number
+of cores (`N`):
+
+    make -j N test
 
-See [Creating new test files](https://qa.php.net/write-test.php) chapter for more
-information about testing.
+The [qa.php.net](https://qa.php.net) site provides more detailed info about
+testing and quality assurance.

README.WIN32-BUILD-SYSTEM

@@ -39,10 +39,6 @@ _LT_AC_TRY_DLOPEN_SELF([
 ], [])
 ])
 
-dnl This is required for QNX and may be some BSD derived systems
-AC_CHECK_TYPE( uint, unsigned int )
-AC_CHECK_TYPE( ulong, unsigned long )
-
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(strdup getpid kill strtod strtol finite fpclass sigsetjmp)

README.md

@@ -587,12 +587,12 @@ static zend_always_inline int zend_mm_bitset_is_set(zend_mm_bitset *bitset, int
 
 static zend_always_inline void zend_mm_bitset_set_bit(zend_mm_bitset *bitset, int bit)
 {
-	bitset[bit / ZEND_MM_BITSET_LEN] |= (Z_L(1) << (bit & (ZEND_MM_BITSET_LEN-1)));
+	bitset[bit / ZEND_MM_BITSET_LEN] |= (Z_UL(1) << (bit & (ZEND_MM_BITSET_LEN-1)));
 }
 
 static zend_always_inline void zend_mm_bitset_reset_bit(zend_mm_bitset *bitset, int bit)
 {
-	bitset[bit / ZEND_MM_BITSET_LEN] &= ~(Z_L(1) << (bit & (ZEND_MM_BITSET_LEN-1)));
+	bitset[bit / ZEND_MM_BITSET_LEN] &= ~(Z_UL(1) << (bit & (ZEND_MM_BITSET_LEN-1)));
 }
 
 static zend_always_inline void zend_mm_bitset_set_range(zend_mm_bitset *bitset, int start, int len)