Merge branch 'PHP-7.2' into PHP-7.3

cmb69 · cmb69 · commit 1a98878bfe5c · 2019-05-14T10:25:02.000+02:00
* PHP-7.2:
  Fix test case
diff --git a/Zend/tests/bug55509.phpt b/Zend/tests/bug55509.phpt
@@ -46,7 +46,7 @@ elseif (PHP_OS == 'FreeBSD') {
     die('skip Not enough memory.');
   }
 } elseif (PHP_OS == "WINNT") {
-  $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nil"));
+  $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nul"));
   $freeMemory = explode('=', $s)[1]*1;
 
   if ($freeMemory < 2.1*1024*1024) {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ elseif (PHP_OS == 'FreeBSD') {`
`46`	`46`	`die('skip Not enough memory.');`
`47`	`47`	`}`
`48`	`48`	`} elseif (PHP_OS == "WINNT") {`
`49`		`- $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nil"));`
	`49`	`+ $s = trim(shell_exec("wmic OS get FreeVirtualMemory /Value 2>nul"));`
`50`	`50`	`$freeMemory = explode('=', $s)[1]*1;`
`51`	`51`
`52`	`52`	`if ($freeMemory < 2.110241024) {`