Merge branch 'master' into merge-fastcgi

Author: laruence

CONTRIBUTING.md

@@ -0,0 +1,73 @@
+# Contributing to PHP
+
+Anybody who programs in PHP can be a contributing member of the community that
+develops and deploys it; the task of deploying PHP, documentation and
+associated websites is a never ending one. With every release, or release
+candidate comes a wave of work, which takes a lot of organization and
+co-ordination.
+
+## Pull requests
+
+PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to
+implement RFCs. Please be sure to include tests as appropriate!
+
+If you are fixing a bug, then please submit your PR against the lowest branch
+of PHP that the bug affects, or the oldest fully supported version (the first
+green branch on
+[the supported version page](http://php.net/supported-versions.php). For
+example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds
+to the `PHP-5.5` branch in Git. Please also make sure you add a link to the PR
+in the bug on [the bug tracker](https://bugs.php.net/).
+
+Pull requests to implement RFCs should be submitted against `master`.
+
+## Filing bugs
+
+Bugs can be filed on the [PHP bug tracker](https://bugs.php.net/). If this is
+the first time you've filed a bug, we suggest reading the
+[guide to reporting a bug](https://bugs.php.net/how-to-report.php).
+
+Where possible, please include a self-contained reproduction case!
+
+## Feature requests
+
+Feature requests are generally submitted in the form of
+[Requests for Comment](https://wiki.php.net/rfc/howto), ideally accompanied by
+[pull requests](#pull-requests). You can find the extremely large list of RFCs
+that have been previously considered on the
+[PHP Uncyclo](https://wiki.php.net/rfc).
+
+You may want to read
+[The Mysterious PHP RFC Process](https://blogs.oracle.com/opal/entry/the_mysterious_php_rfc_process)
+for additional notes on the best way to approach submitting an RFC.
+
+## Writing tests
+
+We love getting new tests! PHP is a huge project and improving code coverage is
+a huge win for every PHP user.
+
+[Our QA site includes a page detailing how to write test cases.](http://qa.php.net/write-test.php)
+Please note that the section on submitting pull requests is outdated: in
+addition to the process listed there, you can also
+[submit pull requests](#pull-requests).
+
+## Writing documentation
+
+There are two ways to contribute to the PHP manual. You can edit the manual and
+send patches anonymously via [the online editor](https://edit.php.net/), or you
+can check the XML source out from Subversion and edit that and build it
+[per the instructions on the documentation site](http://doc.php.net/tutorial/).
+Patches created that way should be sent to the
+[documentation mailing list](mailto:[email protected]).
+
+## Getting help
+
+If you are having trouble contributing to PHP, or just want to talk to a human
+about what you're working on, you can contact us via the
+[internals mailing list](mailto:[email protected]), or the
+[documentation mailing list](mailto:[email protected]) for documentation
+issues.
+
+Although not a formal channel, you can also find a number of core developers on
+the #php.pecl channel on [EFnet](http://www.efnet.org/). Similarly, many
+documentation writers can be found on #php.doc.

INSTALL

@@ -464,7 +464,7 @@ LoadModule php7_module modules/libphp7.so
        Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php7,
        and  .phtml files to be executed as PHP, but nothing else, we'd use
        this:
-<FilesMatch "\.ph(p[2-6]?|tml)$">
+<FilesMatch "\.ph(p[2-7]?|tml)$">
     SetHandler application/x-httpd-php
 </FilesMatch>
        And  to  allow  .phps files to be handled by the php source filter,

NEWS

@@ -6,8 +6,11 @@
   . Refactor MIME type handling to use a hash table instead of linear search.
     (Adam)
   . Update the MIME type list from the one shipped by Apache HTTPD. (Adam)
+  . Added support for SEARCH WebDav method. (Mats Lindh)
 
 - Core:
+  . Fixed bug #68475 (Add support for $callable() sytnax with 'Class::method').
+    (Julien, Aaron Piotrowski)
   . Fixed bug #69485 (Double free on zend_list_dtor). (Laruence)
   . Fixed bug #69427 (Segfault on magic method __call of private method in 
     superclass). (Laruence)
@@ -23,10 +26,6 @@
     (Laruence)
   . Fixed bug #68933 (Invalid read of size 8 in zend_std_read_property).
     (Laruence, arjen at react dot com)
-  . Fixed bug #68868 (Segfault in clean_non_persistent_constants() in SugarCRM
-    6.5.20). (Laruence)
-  . Fixed bug #68104 (Segfault while pre-evaluating a disabled function).
-    (Laruence)
   . Fixed bug #68252 (segfault in Zend/zend_hash.c in function
     _zend_hash_del_el). (Laruence)
   . Fixed bug #65598 (Closure executed via static autoload incorrectly marked as
@@ -36,24 +35,17 @@
   . Fixed bug #69568 (call a private function in closure failed). (Nikita)
   . Added PHP_INT_MIN constant. (Andrea)
   . Added Closure::call() method. (Andrea)
-  . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
   . Fixed bug #67959 (Segfault when calling phpversion('spl')). (Florian)
   . Implemented the RFC `Catchable "Call to a member function bar() on a
     non-object"`. (Timm)
   . Added options parameter for unserialize allowing to specify acceptable
     classes (https://wiki.php.net/rfc/secure_unserialize). (Stas)
-  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly
-    triggered). (Julien)
-  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
-  . Fixed bug #65576 (Constructor from trait conflicts with inherited
-    constructor). (dunglas at gmail dot com)
   . Fixed bug #63734 (Garbage collector can free zvals that are still
     referenced). (Dmitry)
   . Removed ZEND_ACC_FINAL_CLASS, promoting ZEND_ACC_FINAL as final class 
     modifier. (Guilherme Blanco)
   . is_long() & is_integer() is now an alias of is_int(). (Kalle)
   . Implemented FR #55467 (phpinfo: PHP Variables with $ and single quotes). (Kalle)
-  . Fixed bug #55415 (php_info produces invalid anchor names). (Kalle, Johannes)
   . Added ?? operator. (Andrea)
   . Added <=> operator. (Andrea)
   . Added \u{xxxxx} Unicode Codepoint Escape Syntax. (Andrea)
@@ -86,6 +78,8 @@
   . Implemented the RFC `Fix "foreach" behavior`. (Dmitry)
   . Implemented the RFC `Generator Delegation`. (Bob)
   . Implemented the RFC ` Anonymous Class Support`. (Joe, Nikita, Dmitry)
+  . Fixed bug #69511 (Off-by-one buffer overflow in php_sys_readlink).
+    (Jan Starke, Anatol)
 
 - Curl:
   . Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
@@ -102,7 +96,7 @@
   . Implemented FR #69089: Added DateTime::RFC3339_EXTENDED to output in 
     RFC3339 Extended format which includes fraction of seconds (Mariano 
     Iglesias)
-	
+
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
   . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
@@ -125,7 +119,7 @@
   . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
 
 - FTP:
-  . Fixed bug #69082 FTPS support on Windows
+  . Fixed bug #69082 (FTPS support on Windows). (Anatol) 
 
 - Intl:
   . Removed deprecated aliases datefmt_set_timezone_id() and
@@ -137,6 +131,9 @@
   . Fixed bug #68938 (json_decode() decodes empty string without error).
     (jeremy at bat-country dot us)
 
+- LDAP
+  . Fixed bug #47222 (Implement LDAP_OPT_DIAGNOSTIC_MESSAGE). (Andreas Heigl)
+
 - LiteSpeed:
   . Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)
 
@@ -146,6 +143,8 @@
   . Removed mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb(), mcrypt_ofb(). (Nikita)
 
 - Opcache:
+  . Fixed bug #69688 (segfault with eval and opcache fast shutdown).
+    (Laruence)
   . Added experimental (disabled by default) file based opcode cache.
     (Dmitry, Laruence, Anatol)
   . Fixed bug with try blocks being removed when extended_info opcode
@@ -165,6 +164,8 @@
   . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
     when setting SIG_DFL). (Julien)
   . Added wifcontinued and wcontinued. (xilon-jul)
+  . Added rusage support to pcntl_wait() and pcntl_waitpid(). (Anton Stepanenko,
+    Tony)
 
 - PCRE:
   . Removed support for the /e (PREG_REPLACE_EVAL) modifier. (Nikita)
@@ -183,6 +184,7 @@
 
 - Reflection
   . Fixed inheritance chain of Reflector interface. (Tjerk)
+  . Added ReflectionGenerator class. (Bob)
 
 - Session:
   . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk)
@@ -200,13 +202,13 @@
     nor curruption state). (Julien)
   . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
     breaks the RecursiveIterator). (Paul Garvin)
-  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
 
 - Sqlite3:
   . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong
     required_num_args). (Julien)
 
 - Standard:
+  . Fixed bug #69523 (Cookie name cannot be empty). (Christoph M. Becker)
   . Fixed bug #69325 (php_copy_file_ex does not pass the argument).
     (imbolk at gmail dot com)
   . Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7).
@@ -221,7 +223,10 @@
   . Fixed bug #65272 (flock() out parameter not set correctly in windows).
     (Daniel Lowrey)
   . Added preg_replace_callback_array function. (Wei Dai)
-  . Deprecated salt option to password_hash. (Anthony) 
+  . Deprecated salt option to password_hash. (Anthony)
+  . Fixed bug #69686 (password_verify reports back error on PHP7 will null
+    string). (Anthony)
+  . Added Windows support for getrusage(). (Kalle)
 
 - Streams:
   . Fixed bug #68532 (convert.base64-encode omits padding bytes).
@@ -242,5 +247,7 @@
   . Added ZipArchive::setCompressionName and ZipArchive::setCompressionIndex
     methods (Remi, Cedric Delmas)
   . Update bundled libzip to 1.0.1 (Remi, Anatol)
+  . Fixed bug #67161. (ZipArchive::getStream() returns NULL for certain file)
+    (Christoph M. Becker)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -435,6 +435,7 @@ Standard library changes
     and also renamed zend_qsort to zend_sort.
   . Added stable sorting algo zend_insert_sort.
   . Removed dl() function on fpm-fcgi.
+  . setcookie() with an empty cookie name now issues a WARNING and doesn't send an empty set-cookie header line anymore.
 
 Other
 =====
@@ -521,7 +522,7 @@ Other
   . Added null coalesce operator (??).
     (RFC: https://wiki.php.net/rfc/isset_ternary)
   . Support for strings with length >= 2^31 bytes in 64 bit builds.
-  . Closure::call() method added.
+  . Closure::call() method added (works only with userland classes).
   . Added \u{xxxxxx} Unicode Codepoint Escape Syntax for double-quoted strings
     and heredocs.
   . define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did.
@@ -536,6 +537,9 @@ Other
     built against OpenSSL 1.0.2 or newer. Negotiated protocol information is
     accessible through stream_get_meta_data() output.
 
+- Reflection
+  . Added a ReflectionGenerator class (yield from Traces, current file/line etc.)
+
 ========================================
 3. Changes in SAPI modules
 ========================================

Zend/Zend.m4

@@ -462,4 +462,4 @@ if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
 else
   HAVE_GCC_GLOBAL_REGS=no
 fi
-AC_MSG_RESULT(ZEND_GCC_GLOBAL_REGS)
+AC_MSG_RESULT($ZEND_GCC_GLOBAL_REGS)

Zend/configure.in

@@ -90,10 +90,10 @@ int zend_sprintf(char *buffer, const char *format, ...);
 #define zend_isinf(a) 0
 #endif
 
-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#if defined(HAVE_ISFINITE) || defined(isfinite)
 #define zend_finite(a) isfinite(a)
+#elif defined(HAVE_FINITE)
+#define zend_finite(a) finite(a)
 #elif defined(fpclassify)
 #define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
 #else

Zend/tests/028.phpt

@@ -20,4 +20,7 @@ bool(true)
 
 Notice: Undefined offset: 2 in %s on line %d
 
-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught EngineException: Function name must be a string in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/037.phpt

@@ -16,4 +16,7 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)
 
-Fatal error: Access to undeclared static property: Closure::$x in %s on line %d
+Fatal error: Uncaught EngineException: Access to undeclared static property: Closure::$x in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/access_modifiers_010.phpt

@@ -28,4 +28,9 @@ new c;
 
 ?>
 --EXPECTF--
-Fatal error: Call to private method d::test2() from context 'a' in %s on line %d
+Fatal error: Uncaught EngineException: Call to private method d::test2() from context 'a' in %s:%d
+Stack trace:
+#0 %s(%d): a->test()
+#1 %s(%d): c->__construct()
+#2 {main}
+  thrown in %s on line %d

Zend/tests/add_002.phpt

@@ -26,4 +26,7 @@ Exception: Unsupported operand types
 
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/add_003.phpt

@@ -26,4 +26,7 @@ Exception: Unsupported operand types
 
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/add_004.phpt

@@ -19,4 +19,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/add_007.phpt

@@ -21,4 +21,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/tests/array_type_hint_001.phpt

@@ -12,4 +12,8 @@ foo(123);
 --EXPECTF--
 3
 
-Fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Fatal error: Uncaught TypeException: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
+Stack trace:
+#0 %s(%d): foo(123)
+#1 {main}
+  thrown in %sarray_type_hint_001.php on line 2

Zend/tests/assert/expect_002.phpt

@@ -9,7 +9,7 @@ assert(false);
 var_dump(true);
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_002.php:%d
+Fatal error: Uncaught AssertionException: assert(false) in %sexpect_002.php:%d
 Stack trace:
 #0 %sexpect_002.php(%d): assert(false, 'assert(false)')
 #1 {main}

Zend/tests/assert/expect_007.phpt

@@ -16,7 +16,7 @@ class HeaderMalfunctionException extends AssertionException {}
 assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionException("malformed key found at {$next} \"{$data["key"]}\""));
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'HeaderMalfunctionException' with message 'malformed key found at 1 "X-HTTP "' in %sexpect_007.php:10
+Fatal error: Uncaught HeaderMalfunctionException: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10
 Stack trace:
 #0 {main}
   thrown in %sexpect_007.php on line 10

Zend/tests/assert/expect_009.phpt

@@ -17,7 +17,7 @@ class Two extends One {
 new Two();
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_009.php:%d
+Fatal error: Uncaught AssertionException: assert(false) in %sexpect_009.php:%d
 Stack trace:
 #0 %sexpect_009.php(%d): assert(false, 'assert(false)')
 #1 %sexpect_009.php(%d): Two->__construct()

Zend/tests/assert/expect_010.phpt

@@ -15,7 +15,7 @@ class Two extends One {}
 new Two();
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_010.php:%d
+Fatal error: Uncaught AssertionException: assert(false) in %sexpect_010.php:%d
 Stack trace:
 #0 %sexpect_010.php(%d): assert(false, 'assert(false)')
 #1 %sexpect_010.php(%d): One->__construct()

Zend/tests/assert/expect_011.phpt

@@ -22,7 +22,7 @@ class Two extends One {}
 new Two();
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'AssertionException' with message '[Message]: MyExpectations' in %sexpect_011.php:%d
+Fatal error: Uncaught AssertionException: [Message]: MyExpectations in %sexpect_011.php:%d
 Stack trace:
 #0 %sexpect_011.php(%d): assert(false, '[Message]: MyEx...')
 #1 %sexpect_011.php(%d): One->__construct()