Skip to content

Commit 9187cae

Browse files
nielsdosnielsdos
committed
Fix ext/enchant test SKIPIFs
The resource check makes no sense, and the is_array() check doesn't achieve anything. Drop the former, and replace the latter with a ! check. Discovered while working on GH-18729. Closes GH-18731.
1 parent d8a17ca commit 9187cae

26 files changed

+18
-65
lines changed

‎ext/enchant/tests/broker_dict_exists.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/broker_free.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ enchant_broker_free() function
44
marcosptf - <[email protected]>
55
--EXTENSIONS--
66
enchant
7-
--SKIPIF--
8-
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
?>
117
--FILE--
128
<?php
139
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_free_01.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
marcosptf - <[email protected]>
55
--EXTENSIONS--
66
enchant
7-
--SKIPIF--
8-
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
?>
117
--FILE--
128
<?php
139
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_free_02.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if(!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if(!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/broker_free_dict.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if(!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if(!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/broker_get_error.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ enchant_broker_get_error() function
44
marcosptf - <[email protected]>
55
--EXTENSIONS--
66
enchant
7-
--SKIPIF--
8-
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
?>
117
--FILE--
128
<?php
139
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_init.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ enchant_broker_init() function
44
marcosptf - <[email protected]>
55
--EXTENSIONS--
66
enchant
7-
--SKIPIF--
8-
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
?>
117
--FILE--
128
<?php
139
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_request_dict.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/broker_request_dict_01.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/broker_request_dict_error_on_empty_tag.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
enchant_broker_request_dict() must throw ValueError on empty tag
33
--EXTENSIONS--
44
enchant
5-
--SKIPIF--
6-
<?php
7-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
8-
?>
95
--FILE--
106
<?php
117
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_request_pwl_dict.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ resource enchant_broker_request_pwl_dict(resource $broker, string $filename); fu
44
marcosptf - <[email protected]>
55
--EXTENSIONS--
66
enchant
7-
--SKIPIF--
8-
<?php
9-
if(!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
?>
117
--FILE--
128
<?php
139
$broker = enchant_broker_init();

‎ext/enchant/tests/broker_set_ordering.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/bug53070.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Bug #53070 (enchant_broker_get_path crashes if no path is set)
44
enchant
55
--SKIPIF--
66
<?php
7-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
87
if (defined("LIBENCHANT_VERSION") && version_compare(LIBENCHANT_VERSION, "2", ">")) die('skip libenchant v1 only');
98
?>
109
--FILE--

‎ext/enchant/tests/dict_add_to_personal.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_add_to_session.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_check.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_describe.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_get_error.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_is_in_session.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_quick_check.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ enchant
77
--SKIPIF--
88
<?php
99
if (getenv('SKIP_ASAN')) die('xleak Known libenchant memory leak');
10-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
11-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
10+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1211

1312
$tag = 'en_US';
1413
$r = enchant_broker_init();

‎ext/enchant/tests/dict_quick_check_01.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_store_replacement.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/dict_suggest.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ marcosptf - <[email protected]>
66
enchant
77
--SKIPIF--
88
<?php
9-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
10-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
9+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1110
?>
1211
--FILE--
1312
<?php

‎ext/enchant/tests/enchant_broker_set_dict_path.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ marcosptf - <[email protected]>
77
enchant
88
--SKIPIF--
99
<?php
10-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
11-
if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, no dictionary installed on this machine! \n");}
10+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
1211
if (defined("LIBENCHANT_VERSION") && version_compare(LIBENCHANT_VERSION, "2", ">")) die('skip libenchant v1 only');
1312
?>
1413
--FILE--

‎ext/enchant/tests/invalidobj.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
invalid object raise exception() function
33
--EXTENSIONS--
44
enchant
5-
--SKIPIF--
6-
<?php
7-
if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
8-
?>
95
--FILE--
106
<?php
117
$broker = enchant_broker_init();

‎ext/enchant/tests/null_bytes.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ null bytes
44
enchant
55
--SKIPIF--
66
<?php
7-
$broker = enchant_broker_init();
8-
if (!enchant_broker_list_dicts($broker)) die("skip No broker dicts installed");
7+
if (!enchant_broker_list_dicts(enchant_broker_init())) {die("skip no dictionary installed on this machine! \n");}
98
?>
109
--FILE--
1110
<?php

0 commit comments

Comments
 (0)