From f47cdd1ee0246b1d594de9ec29ce12c5279bc421 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Tue, 7 Aug 2018 21:23:21 -0300
Subject: [PATCH] Remove invalid SKIPIF sections and make more tests run

---
 ext/intl/tests/locale_get_keywords2.phpt         |  4 ++--
 ext/phar/tests/cache_list/frontcontroller11.phpt | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ext/intl/tests/locale_get_keywords2.phpt b/ext/intl/tests/locale_get_keywords2.phpt
index 7bcaca1897..47efb7f9f0 100644
--- a/ext/intl/tests/locale_get_keywords2.phpt
+++ b/ext/intl/tests/locale_get_keywords2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_get_keywords() icu >= 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt
index f5e4e2269f..255f16abfa 100644
--- a/ext/phar/tests/cache_list/frontcontroller11.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller11.phpt
@@ -4,8 +4,7 @@ Phar front controller mime type extension is not a string [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller11.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.php
 REQUEST_URI=/frontcontroller11.php/a.php
@@ -14,9 +13,5 @@ PATH_INFO=/a.php
 files/frontcontroller5.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
---EXPECTF--
-Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2
-Stack trace:
-#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
-#1 {main}
-  thrown in %sfrontcontroller11.php on line 2
\ No newline at end of file
+--EXPECT--
+hio
\ No newline at end of file
-- 
2.50.1