Merge branch 'PHP-7.2'

dstogov · dstogov · commit 781e78f21013 · 2017-09-04T20:12:38.000+03:00
* PHP-7.2:
  Fixed tests
diff --git a/ext/opcache/tests/jmp_elim_001.phpt b/ext/opcache/tests/jmp_elim_001.phpt
@@ -8,11 +8,9 @@ Edge-cases in constant conditional jump elimination
 $webserver = "Apache";
 $cpuArc = "x86_64";
 $archName = (strstr($cpuArc, "64") || PHP_INT_SIZE === 8) ? "64" : "32";
-$info = array('os' => PHP_OS,
-              'phpversion' => phpversion(),
-              'arch' => $archName,
+$info = array('arch' => $archName,
               'webserver' =>$webserver);
 header('Content-Type: application/json');
 echo json_encode($info) . "\n";
 --EXPECT--
-{"os":"Linux","phpversion":"7.2.0-dev","arch":"64","webserver":"Apache"}
+{"arch":"64","webserver":"Apache"}
