From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 1 Oct 2019 09:17:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0RC4~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73f29a5c5e7768d6ea6776be404e9795a716bbd0;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing skip keyword in tests
---

73f29a5c5e7768d6ea6776be404e9795a716bbd0
diff --cc ext/ldap/tests/ldap_read_variation1.phpt
index 907d9aedf0,0000000000..5d65814ec0
mode 100644,000000..100644
--- a/ext/ldap/tests/ldap_read_variation1.phpt
+++ b/ext/ldap/tests/ldap_read_variation1.phpt
@@@ -1,21 -1,0 +1,21 @@@
 +--TEST--
 +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
 +$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 1efe8953ea,cfc5c171d6..d67f19aee3
--- a/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 30778dea9f,7aef2c4489..3d74fc40b9
--- a/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 ab4b9ec51a,d2514bdb65..b42f796ee3
--- 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 +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