Merge branch 'PHP-7.4'

Author: nikic

Zend/zend_execute.c

@@ -711,6 +711,7 @@ static zend_never_inline ZEND_COLD zval* ZEND_FASTCALL make_real_object(zval *ob
 				zend_error(E_WARNING, "Attempt to increment/decrement property '%s' of non-object", ZSTR_VAL(property_name));
 			} else if (opline->opcode == ZEND_FETCH_OBJ_W
 					|| opline->opcode == ZEND_FETCH_OBJ_RW
+					|| opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG
 					|| opline->opcode == ZEND_ASSIGN_OBJ_REF) {
 				zend_error(E_WARNING, "Attempt to modify property '%s' of non-object", ZSTR_VAL(property_name));
 			} else {

ext/openssl/tests/ServerClientTestCase.inc

@@ -9,9 +9,9 @@ function phpt_notify($worker = WORKER_DEFAULT_NAME)
     ServerClientTestCase::getInstance()->notify($worker);
 }
 
-function phpt_wait($worker = WORKER_DEFAULT_NAME)
+function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
 {
-    ServerClientTestCase::getInstance()->wait($worker);
+    ServerClientTestCase::getInstance()->wait($worker, $timeout);
 }
 
 /**
@@ -121,9 +121,24 @@ class ServerClientTestCase
         }
     }
 
-    public function wait($worker)
+    public function wait($worker, $timeout = null)
     {
-        fgets($this->isWorker ? STDIN : $this->workerStdOut[$worker]);
+        $handle = $this->isWorker ? STDIN : $this->workerStdOut[$worker];
+        if ($timeout === null) {
+            fgets($handle);
+            return true;
+        }
+
+        stream_set_blocking($handle, false);
+        $read = [$handle];
+        $result = stream_select($read, $write, $except, $timeout);
+        if (!$result) {
+            return false;
+        }
+
+        fgets($handle);
+        stream_set_blocking($handle, true);
+        return true;
     }
 
     public function notify($worker)

ext/openssl/tests/bug77390.phpt

@@ -23,16 +23,21 @@ $clientCode = <<<'CODE'
 
 	$read = [$fp];
 	$buf = '';
-	$printed = false;
+	$warmedUp = false;
 	while (stream_select($read, $write, $except, 1000)) {
 		$chunk = stream_get_contents($fp, 4096);
-		if ($chunk !== "") {
-		    var_dump($chunk);
-		    $buf .= $chunk;
-		} elseif (!$printed) {
-		    $printed = true;
-		    var_dump($chunk);
+		$buf .= $chunk;
+		phpt_notify('proxy');
+		if (!$warmedUp) {
+			if ($buf !== 'warmup') {
+				continue;
+			}
+			$warmedUp = true;
+			$buf = '';
+			phpt_notify('server');
+			continue;
 		}
+		var_dump($chunk);
 		if ($buf === 'hello, world') {
 			break;
 		}
@@ -51,6 +56,8 @@ $serverCode = <<<'CODE'
 	phpt_notify();
 	
 	$conn = stream_socket_accept($fp);
+	fwrite($conn, 'warmup');
+	phpt_wait();
 	fwrite($conn, 'hello, world');
 	
 	phpt_wait();
@@ -82,7 +89,7 @@ $proxyCode = <<<'CODE'
 					$parts = str_split($data, (int) ceil(strlen($data) / 3));
 					foreach ($parts as $part) {
 						fwrite($conn, $part);
-						usleep(1000);
+						phpt_wait(null, 1);
 					}
 				} else {
 					fwrite($conn, $data);
@@ -116,4 +123,5 @@ ServerClientTestCase::getInstance()->run($clientCode, [
 ?>
 --EXPECT--
 string(0) ""
+string(0) ""
 string(12) "hello, world"

ext/zip/tests/oo_addpattern.phpt

@@ -10,11 +10,13 @@ if(!extension_loaded('zip')) die('skip');
 ?>
 --FILE--
 <?php
-$dirname = dirname(__FILE__) . '/';
-include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_addpattern.zip';
+include __DIR__ . '/utils.inc';
 
-copy($dirname . 'test.zip', $file);
+$dirname = __DIR__ . '/oo_addpattern_dir/';
+$file = $dirname . 'tmp.zip';
+
+@mkdir($dirname);
+copy(__DIR__ . '/test.zip', $file);
 touch($dirname . 'foo.txt');
 touch($dirname . 'bar.txt');
 
@@ -36,10 +38,11 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
 ?>
 --CLEAN--
 <?php
-$dirname = dirname(__FILE__) . '/';
-unlink($dirname . '__tmp_oo_addpattern.zip');
+$dirname = dirname(__FILE__) . '/oo_addpattern_dir/';
+unlink($dirname . 'tmp.zip');
 unlink($dirname . 'foo.txt');
 unlink($dirname . 'bar.txt');
+rmdir($dirname);
 ?>
 --EXPECT--
 0 bar