Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing skip keyword in tests

7 files changed, 7 insertions, 7 deletions

diff --git a/ext/gd/tests/bug77198_auto.phpt b/ext/gd/tests/bug77198_auto.phpt
index d06f2be663..b010f97483 100644
--- a/ext/gd/tests/bug77198_auto.phpt
+++ b/ext/gd/tests/bug77198_auto.phpt
@@ -3,7 +3,7 @@ Bug #77198 (auto cropping has insufficient precision)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('upstream bugfix has not been released');
+if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug77198_threshold.phpt b/ext/gd/tests/bug77198_threshold.phpt
index fd03660c84..a7135ee07e 100644
--- a/ext/gd/tests/bug77198_threshold.phpt
+++ b/ext/gd/tests/bug77198_threshold.phpt
@@ -3,7 +3,7 @@ Bug #77198 (threshold cropping has insufficient precision)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('upstream bugfix has not been released');
+if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug77200.phpt b/ext/gd/tests/bug77200.phpt
index 704b1796e7..99d8efb550 100644
--- a/ext/gd/tests/bug77200.phpt
+++ b/ext/gd/tests/bug77200.phpt
@@ -3,7 +3,7 @@ Bug #77200 (imagecropauto(…, GD_CROP_SIDES) crops left but not right)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
-if (!GD_BUNDLED) die('upstream bugfix has not been released');
+if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_read_variation1.phpt b/ext/ldap/tests/ldap_read_variation1.phpt
index 907d9aedf0..5d65814ec0 100644
--- a/ext/ldap/tests/ldap_read_variation1.phpt
+++ b/ext/ldap/tests/ldap_read_variation1.phpt
@@ -2,7 +2,7 @@
 ldap_read() does not modify $attributes array
 --SKIPIF--
 <?php
-if (!extension_loaded('ldap')) die('ldap extension not available');
+if (!extension_loaded('ldap')) die('skip ldap extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt
index 1efe8953ea..d67f19aee3 100644
--- a/ext/snmp/tests/snmp_set_enum_print.phpt
+++ b/ext/snmp/tests/snmp_set_enum_print.phpt
@@ -5,7 +5,7 @@ Olivier Doucet
 --SKIPIF--
 <?php
 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 --git a/ext/snmp/tests/snmp_set_oid_output_format.phpt b/ext/snmp/tests/snmp_set_oid_output_format.phpt
index 30778dea9f..3d74fc40b9 100644
--- a/ext/snmp/tests/snmp_set_oid_output_format.phpt
+++ b/ext/snmp/tests/snmp_set_oid_output_format.phpt
@@ -5,7 +5,7 @@ Olivier Doucet
 --SKIPIF--
 <?php
 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 --git a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
index ab4b9ec51a..b42f796ee3 100644
--- a/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 @@ include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
 skip_if_not_win();
 
-if (strlen(__DIR__) > 259) die("Unsuitable starting path length");
+if (strlen(__DIR__) > 259) die("skip Unsuitable starting path length");
 ?>
 --FILE--
 <?php