Skip to content

Commit 76179cd

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Add missing skip keyword in tests Update NEWS for 7.4.0RC4 Update NEWS for PHP 7.4.0RC3
2 parents 21e4f48 + 73f29a5 commit 76179cd

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

ext/gd/tests/bug77198_auto.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #77198 (auto cropping has insufficient precision)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('gd')) die('skip gd extension not available');
6-
if (!GD_BUNDLED) die('upstream bugfix has not been released');
6+
if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
77
?>
88
--FILE--
99
<?php

ext/gd/tests/bug77198_threshold.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #77198 (threshold cropping has insufficient precision)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('gd')) die('skip gd extension not available');
6-
if (!GD_BUNDLED) die('upstream bugfix has not been released');
6+
if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
77
?>
88
--FILE--
99
<?php

ext/gd/tests/bug77200.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #77200 (imagecropauto(…, GD_CROP_SIDES) crops left but not right)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('gd')) die('skip gd extension not available');
6-
if (!GD_BUNDLED) die('upstream bugfix has not been released');
6+
if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
77
?>
88
--FILE--
99
<?php

ext/ldap/tests/ldap_read_variation1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ldap_read() does not modify $attributes array
33
--SKIPIF--
44
<?php
5-
if (!extension_loaded('ldap')) die('ldap extension not available');
5+
if (!extension_loaded('ldap')) die('skip ldap extension not available');
66
?>
77
--FILE--
88
<?php

ext/snmp/tests/snmp_set_enum_print.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Olivier Doucet
55
--SKIPIF--
66
<?php
77
require_once(__DIR__.'/skipif.inc');
8-
if (!function_exists('snmp_set_enum_print')) die('This function is only available if using NET_SNMP');
8+
if (!function_exists('snmp_set_enum_print')) die('skip This function is only available if using NET_SNMP');
99
?>
1010
--FILE--
1111
<?php

ext/snmp/tests/snmp_set_oid_output_format.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Olivier Doucet
55
--SKIPIF--
66
<?php
77
require_once(__DIR__.'/skipif.inc');
8-
if (!function_exists('snmp_set_oid_output_format')) die('This function is only available if using NET_SNMP');
8+
if (!function_exists('snmp_set_oid_output_format')) die('skip This function is only available if using NET_SNMP');
99
?>
1010
--FILE--
1111
<?php

ext/standard/tests/file/windows_mb_path/recursive_it.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
66

77
skip_if_not_win();
88

9-
if (strlen(__DIR__) > 259) die("Unsuitable starting path length");
9+
if (strlen(__DIR__) > 259) die("skip Unsuitable starting path length");
1010
?>
1111
--FILE--
1212
<?php

0 commit comments

Comments
 (0)