Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing skip keyword in tests

diff --cc ext/ldap/tests/ldap_read_variation1.phpt
index 907d9aedf030a056b946f1f95d2f22f124e6bfdd,0000000000000000000000000000000000000000..5d65814ec0dae3da43d894c7652dc12b1d3c54a9
mode 100644,000000..100644
--- 1/ext/ldap/tests/ldap_read_variation1.phpt
--- /dev/null
+++ b/ext/ldap/tests/ldap_read_variation1.phpt
@@@ -1,21 -1,0 +1,21 @@@
- if (!extension_loaded('ldap')) die('ldap extension not available');
 +--TEST--
 +ldap_read() does not modify $attributes array
 +--SKIPIF--
 +<?php
++if (!extension_loaded('ldap')) die('skip ldap extension not available');
 +?>
 +--FILE--
 +<?php
 +$array = [123, 456, 789];
 +@ldap_read(null, null, null, $array);
 +var_dump($array);
 +?>
 +--EXPECT--
 +array(3) {
 +  [0]=>
 +  int(123)
 +  [1]=>
 +  int(456)
 +  [2]=>
 +  int(789)
 +}

diff --cc ext/snmp/tests/snmp_set_enum_print.phpt
index 1efe8953ea4c7cc4b1abe69f191e846e5993c95b,cfc5c171d6c9f7ccbc86c246e54a6770075ab60f..d67f19aee35ef3a3ee499729a18e3fa967a91c9a
--- 1/ext/snmp/tests/snmp_set_enum_print.phpt
--- 2/ext/snmp/tests/snmp_set_enum_print.phpt
+++ b/ext/snmp/tests/snmp_set_enum_print.phpt
@@@ -4,8 -4,8 +4,8 @@@ Function snmp_set_enum_prin
  Olivier Doucet
  --SKIPIF--
  <?php
 -require_once(dirname(__FILE__).'/skipif.inc');
 +require_once(__DIR__.'/skipif.inc');
- if (!function_exists('snmp_set_enum_print')) die('This function is only available if using NET_SNMP');
+ if (!function_exists('snmp_set_enum_print')) die('skip This function is only available if using NET_SNMP');
  ?>
  --FILE--
  <?php

diff --cc ext/snmp/tests/snmp_set_oid_output_format.phpt
index 30778dea9f343ba50d93e49d357490f984a1c784,7aef2c4489569a64ce6d5597e74625289a1a969e..3d74fc40b9c1dc122751bcf5f44094d6a9881e77
--- 1/ext/snmp/tests/snmp_set_oid_output_format.phpt
--- 2/ext/snmp/tests/snmp_set_oid_output_format.phpt
+++ b/ext/snmp/tests/snmp_set_oid_output_format.phpt
@@@ -4,8 -4,8 +4,8 @@@ Function snmp_set_oid_output_forma
  Olivier Doucet
  --SKIPIF--
  <?php
 -require_once(dirname(__FILE__).'/skipif.inc');
 +require_once(__DIR__.'/skipif.inc');
- if (!function_exists('snmp_set_oid_output_format')) die('This function is only available if using NET_SNMP');
+ if (!function_exists('snmp_set_oid_output_format')) die('skip This function is only available if using NET_SNMP');
  ?>
  --FILE--
  <?php

diff --cc ext/standard/tests/file/windows_mb_path/recursive_it.phpt
index ab4b9ec51ae093ac0c9f41b5e9acb28ad8539f3f,d2514bdb651a0a12af422d11b574e8f0df5c2029..b42f796ee332d3d627e7485cca53a95ed425244b
--- 1/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
--- 2/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
+++ b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
@@@ -6,7 -6,7 +6,7 @@@ include __DIR__ . DIRECTORY_SEPARATOR 
  
  skip_if_not_win();
  
- if (strlen(__DIR__) > 259) die("Unsuitable starting path length");
 -if (strlen(dirname(__FILE__)) > 259) die("skip Unsuitable starting path length");
++if (strlen(__DIR__) > 259) die("skip Unsuitable starting path length");
  ?>
  --FILE--
  <?php