Merge branch 'PHP-7.4'

remicollet · remicollet · commit 06750d75e9e8 · 2020-02-28T10:39:43.000+01:00
* PHP-7.4:
  fix test
diff --git a/ext/zip/tests/oo_addfile.phpt b/ext/zip/tests/oo_addfile.phpt
@@ -34,7 +34,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
     ])) {
         echo "failed\n";
     } else {
-        echo "OK";
+        echo "OK\n";
     }
     $zip->close();
 } else {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {`
`34`	`34`	`])) {`
`35`	`35`	`echo "failed\n";`
`36`	`36`	`} else {`
`37`		`- echo "OK";`
	`37`	`+ echo "OK\n";`
`38`	`38`	`}`
`39`	`39`	`$zip->close();`
`40`	`40`	`} else {`