Merge branch 'PHP-7.2'

diff --cc ext/openssl/tests/bug36732.phpt
index 83aa302100a756536868a87317b38a90190e6a13,5c1b70724d3b8af0fda58579a91eeedbe15becb2..72ca6904a9296c93dad58e70e94b3d5b83a84f99
--- 1/ext/openssl/tests/bug36732.phpt
--- 2/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@@ -33,9 -32,9 +32,9 @@@ if (strpos($str, 'Requested Extensions:
  }
  openssl_x509_export($crt, $str, false);
  if (strpos($str, 'X509v3 extensions:')) {
-       echo "Ok\n";
+     echo "Ok\n";
  }
  ?>
 ---EXPECTF--
 +--EXPECT--
  Ok
  Ok

diff --cc ext/openssl/tests/bug37820.phpt
Simple merge

diff --cc ext/openssl/tests/bug39217.phpt
index 8bafedbab41cfc7b245404a999831f40a26f63ab,ad64058a56b34e9b30d5bf12b574bfdbc2de5b3e..47f234d76999954c09dd0b67de5e9a113dff1f94
--- 1/ext/openssl/tests/bug39217.phpt
--- 2/ext/openssl/tests/bug39217.phpt
+++ b/ext/openssl/tests/bug39217.phpt
@@@ -9,11 -9,11 +9,11 @@@ if (!extension_loaded("openssl")) die("
  $dir = dirname(__FILE__);
  $certs = array('bug39217cert2.txt', 'bug39217cert1.txt');
  foreach($certs as $cert) {
-       $res = openssl_x509_parse(file_get_contents($dir . '/' . $cert));
-       print_r($res['serialNumber']);
-       echo "\n";
+     $res = openssl_x509_parse(file_get_contents($dir . '/' . $cert));
+     print_r($res['serialNumber']);
+     echo "\n";
  }
  ?>
 ---EXPECTF--
 +--EXPECT--
  163040343498260435477161879008842183802
  15

diff --cc ext/openssl/tests/bug48182.phpt
index e528b43cadac9609cd295f27fea60500d907ab2e,d11cddf27345f66246da563c149b5ea50fab684e..dcadaaa6b994b5b42581d399acf537d41d943e9a
--- 1/ext/openssl/tests/bug48182.phpt
--- 2/ext/openssl/tests/bug48182.phpt
+++ b/ext/openssl/tests/bug48182.phpt
@@@ -44,7 -44,8 +44,8 @@@ echo "Running bug48182\n"
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  Running bug48182
  Sending bug48182
  Sending data over to SSL server in async mode with contents like Hello World

diff --cc ext/openssl/tests/bug65538_003.phpt
index 80280d1e15c67784b17c76a724ddd0f44ca51b2d,042e7d08bcba3422a60399b9bf8be4bab55c2854..0597ceaef9371eb61e11a73548444f84d5667bc0
--- 1/ext/openssl/tests/bug65538_003.phpt
--- 2/ext/openssl/tests/bug65538_003.phpt
+++ b/ext/openssl/tests/bug65538_003.phpt
@@@ -49,5 -50,6 +50,6 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  string(12) "Hello World!"

diff --cc ext/openssl/tests/bug66501.phpt
index daf7cb6aa0f1a7f1150ac0df3c20cdca3fc6bde4,3994ebdc3c01d42295570d2f196caa761acb7abf..34dac6d44aeb0b576cfe906b7db6f159a43a042a
--- 1/ext/openssl/tests/bug66501.phpt
--- 2/ext/openssl/tests/bug66501.phpt
+++ b/ext/openssl/tests/bug66501.phpt
@@@ -18,5 -19,6 +19,6 @@@ sqOTOnMoezkbSmVVMuwz9flvnqHGmQvmug=
  $key = openssl_pkey_get_private($pkey);
  $res = openssl_sign($data ='alpha', $sign, $key, 'SHA1');
  var_dump($res);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  bool(true)

diff --cc ext/openssl/tests/bug67403.phpt
index 19701af381153ccac9f11050ac48ef0ad91acf1f,76c5c8613cf89c96395a10035f97fa91fbfa6d67..add6c09d7202b267404978994163bb5e2ac0d3a0
--- 1/ext/openssl/tests/bug67403.phpt
--- 2/ext/openssl/tests/bug67403.phpt
+++ b/ext/openssl/tests/bug67403.phpt
@@@ -14,7 -13,8 +13,8 @@@ $r = openssl_x509_parse(file_get_conten
  var_dump($r['signatureTypeSN']);
  var_dump($r['signatureTypeLN']);
  var_dump($r['signatureTypeNID']);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  string(8) "RSA-SHA1"
  string(21) "sha1WithRSAEncryption"
  int(65)

diff --cc ext/openssl/tests/bug74022_2.phpt
Simple merge

diff --cc ext/openssl/tests/bug74159.phpt
Simple merge

diff --cc ext/openssl/tests/bug74402.phpt
Simple merge

diff --cc ext/openssl/tests/bug74720_1.phpt
Simple merge

diff --cc ext/openssl/tests/bug74798.phpt
Simple merge

diff --cc ext/openssl/tests/cve2013_4073.phpt
index a626e21f9571ca56d7ffb060e101013451a25e18,d1ba849ba6c89a08a3df3e74f3ba59114da85da9..c88021b0ae0a4c165bd927bc92a783de61f2909e
--- 1/ext/openssl/tests/cve2013_4073.phpt
--- 2/ext/openssl/tests/cve2013_4073.phpt
+++ b/ext/openssl/tests/cve2013_4073.phpt
@@@ -8,8 -7,8 +7,9 @@@ CVE 2013-4073: Null-byte certificate ha
  $cert = file_get_contents(__DIR__ . '/cve2013_4073.pem');
  $info = openssl_x509_parse($cert);
  var_export($info['extensions']);
 ---EXPECTF--
 +
+ ?>
 +--EXPECT--
  array (
    'basicConstraints' => 'CA:FALSE',
    'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C',

diff --cc ext/openssl/tests/ecc.phpt
Simple merge

diff --cc ext/openssl/tests/openssl_csr_get_subject_basic.phpt
Simple merge

diff --cc ext/openssl/tests/openssl_csr_sign_basic.phpt
Simple merge

diff --cc ext/openssl/tests/openssl_error_string_basic.phpt
Simple merge

diff --cc ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
Simple merge

diff --cc ext/openssl/tests/session_meta_capture.phpt
index 76182e17d5a34c75995bc7d015ecc43fe159088d,caa3a87075eaa59da66836e80b85c431b649ac18..733bde82aed942c226686970aaaa2d0186bf89b3
--- 1/ext/openssl/tests/session_meta_capture.phpt
--- 2/ext/openssl/tests/session_meta_capture.phpt
+++ b/ext/openssl/tests/session_meta_capture.phpt
@@@ -53,7 -53,8 +53,8 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  string(5) "TLSv1"
  string(7) "TLSv1.1"
  string(7) "TLSv1.2"

diff --cc ext/openssl/tests/streams_crypto_method.phpt
index 15d0598e0fbd8bfe8dd6d34db17ba878e8792c58,19d08f38a3ec4cc48c52a3f9a2edabf05b41f926..3816aa119551d39bcab956e7b6f38cb0670b4e1f
--- 1/ext/openssl/tests/streams_crypto_method.phpt
--- 2/ext/openssl/tests/streams_crypto_method.phpt
+++ b/ext/openssl/tests/streams_crypto_method.phpt
@@@ -49,5 -49,6 +49,6 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ---EXPECTF--
+ ?>
 +--EXPECT--
  Hello World!