Skip to content

Commit 1052c7c

Browse files
committed
php/php-src f47cdd1: Remove invalid SKIPIF sections and make more tests run
Apply php/php-src commit f47cdd1
1 parent 8eccf17 commit 1052c7c

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

ext/intl/tests/locale_get_keywords2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--TEST--
22
locale_get_keywords() icu >= 4.8
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
66
--FILE--
77
<?php
88

ext/phar/tests/cache_list/frontcontroller11.phpt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Phar front controller mime type extension is not a string [cache_list]
44
default_charset=UTF-8
55
phar.cache_list={PWD}/frontcontroller11.php
66
--SKIPIF--
7-
<?php if (!extension_loaded("phar")) die("skip"); ?>
8-
<?php die("skip"); ?>
7+
<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
98
--ENV--
109
SCRIPT_NAME=/frontcontroller11.php
1110
REQUEST_URI=/frontcontroller11.php/a.php
@@ -14,9 +13,5 @@ PATH_INFO=/a.php
1413
files/frontcontroller5.phar
1514
--EXPECTHEADERS--
1615
Content-type: text/html; charset=UTF-8
17-
--EXPECTF--
18-
Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2
19-
Stack trace:
20-
#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
21-
#1 {main}
22-
thrown in %sfrontcontroller11.php on line 2
16+
--EXPECT--
17+
hio

0 commit comments

Comments
 (0)