Merge branch 'master' into PHP-7.0.0

* master: (201 commits)
  sync NEWS
  Add missing variable from birdstep_commit() which got removed in e8fcd52
  Align NEWS entries format
  Add CVE for #70140 (PHP 7.0.0 Beta 3)
  Seems master is not affected
  We should keep one refcount to resource
  Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
  Fixed test
  Partially fix bug #67167 - Wrong return value...
  move the phpdbg NEWS entry to the correct version
  add missing news entries
  Skip if ext/filter isn't loaded
  Merge branch 'PHP-5.6'
  5.5.30 next
  Use ZSTR_VAL
  fix dir separators in test
  use correct api
  fix leak
  cleanup an atavism
  add overflow check
  ...

Author: weltling

.gdbinit

@@ -152,7 +152,7 @@ define ____printzv_contents
 	set $type = $zvalue->u1.v.type
 
 	# 15 == IS_INDIRECT
-	if $type >= 5 && $type != 15
+	if $type > 5 && $type != 15
 		printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
 	end
 
@@ -181,7 +181,7 @@ define ____printzv_contents
 		printf "array: "
 		if ! $arg1
 			set $ind = $ind + 1
-			____print_ht $zvalue->value.arr
+			____print_ht $zvalue->value.arr 1
 			set $ind = $ind - 1
 			set $i = $ind
 			while $i > 0

.travis.yml

@@ -1,9 +1,5 @@
 language: c
 
-branches:
-    except:
-        - phpng
-
 notifications:
     email: 
        on_failure: change

TSRM/tsrm_win32.c

@@ -49,7 +49,7 @@ TSRMLS_CACHE_UPDATE();
 	globals->shm	 = NULL;
 	globals->process_size = 0;
 	globals->shm_size	  = 0;
-	globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
+	globals->comspec = _strdup("cmd.exe");
 
 	/* Set it to INVALID_HANDLE_VALUE
 	 * It will be initialized correctly in tsrm_win32_access or set to

UPGRADING

@@ -431,9 +431,8 @@ Standard library changes
   . call_user_method() and call_user_method_array() no longer exists.
   . ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an 
     output buffer is created in an output buffer handler.
-  . Improved zend_qsort(using hybrid sorting algo) for better performance,
-    and also renamed zend_qsort to zend_sort.
-  . Added stable sorting algo zend_insert_sort.
+  . The internal sorting algorithm has been improved, what may result in
+    different sort order of elements that compare as equal.
   . 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.
 
@@ -771,6 +770,9 @@ out, that the corresponding SDK isn't available anymore.
     it depends alone on the openssl library. If it's present at the compile time,
     ftp_ssl_connect() is enabled automatically.
 
+- imap
+  . Static building of ext/imap is disabled
+
 - odbc
   . The odbc extension is always shipped shared
 

UPGRADING.INTERNALS

@@ -19,6 +19,7 @@ PHP 7.0 INTERNALS UPGRADE NOTES
   s. Resource API changes
   t. Optimized strings concatenation.
   u. Streams changes
+  v. Sort algorithm changes
 
 2. Build system changes
   a. Unix build system changes
@@ -240,6 +241,11 @@ changes. See: https://wiki.php.net/phpng-upgrading
        using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or 
        adding STREAM_USE_BLOCKING_PIPE when opening the stream.
 
+  v. Sort algorithm changes
+     - Improved zend_qsort(using hybrid sorting algo) for better performance,
+       and also renamed zend_qsort to zend_sort.
+     - Added stable sorting algo zend_insert_sort.
+
 ========================
 2. Build system changes
 ========================

Zend/tests/anon/012.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Ensure correct unmangling of private property names for anonymous class instances
+--FILE--
+<?php
+var_dump(new class { private $foo; });
+?>
+--EXPECT--
+object(class@anonymous)#1 (1) {
+  ["foo":"class@anonymous":private]=>
+  NULL
+}

Zend/tests/bug62441.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #62441: Incorrect strong typing in namespaced child classes
+--FILE--
+<?php
+namespace {
+    interface Iface {
+        function method(stdClass $o);
+    }
+}
+namespace ns {
+    class Foo implements \Iface {
+        function method(stdClass $o) { }
+    }
+    
+    (new Foo)->method(new \stdClass);
+}
+?>
+--EXPECTF--
+Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d
+

Zend/tests/bug69761.phpt

@@ -11,5 +11,6 @@ var_dump(serialize($instance));
 --EXPECTF--
 Fatal error: Uncaught Exception: Serialization of 'class@%s' is not allowed in %sbug69761.php:%d
 Stack trace:
-#0 %sbug69761.php(%d): serialize(Object(class@%s
+#0 %sbug69761.php(%d): serialize(Object(class@anonymous))
+#1 {main}
   thrown in %sbug69761.php on line %d

Zend/tests/bug70187.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
+--FILE--
+<?php
+class A {
+	public $b;
+}
+
+$a = new A;
+var_dump($a); // force properties HT
+unset($a->b);
+var_dump(serialize($a));
+?>
+--EXPECT--
+object(A)#1 (1) {
+  ["b"]=>
+  NULL
+}
+string(12) "O:1:"A":0:{}"

Zend/tests/bug70187_2.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
+--FILE--
+<?php
+$a = 1;
+unset($a);
+unserialize(serialize($GLOBALS));
+echo "ok\n";
+?>
+--EXPECT--
+ok