From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 6 Nov 2019 16:48:16 +0000 (+0100)
Subject: Remove bogus skipifs in get_browser tests
X-Git-Tag: php-7.4.7RC1~521
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f494a366183cc5ee8f66f27522ae8d7c30157bb1;p=php

Remove bogus skipifs in get_browser tests

We provide this file, it should be readable.

These checks no longer work, since --INI-- values are no longer
passed to --SKIPIF--.
---

diff --git a/ext/standard/tests/misc/bug65550.phpt b/ext/standard/tests/misc/bug65550.phpt
index 41967426fa..5ac0389d33 100644
--- a/ext/standard/tests/misc/bug65550.phpt
+++ b/ext/standard/tests/misc/bug65550.phpt
@@ -2,10 +2,6 @@
 Bug #65550 (get_browser() incorrectly parses entries with "+" sign)
 --INI--
 browscap={PWD}/browscap.ini
---SKIPIF--
-<?php
-if (!is_readable(ini_get('browscap'))) die('skip browscap.ini file ' . ini_get('browscap') . ' not readable');
-?>
 --FILE--
 <?php
 $user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ (KHTML, like Gecko, Safari/522) OmniWeb/v613';
diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt
index fdc2a7868c..7daf668c50 100644
--- a/ext/standard/tests/misc/get_browser_basic.phpt
+++ b/ext/standard/tests/misc/get_browser_basic.phpt
@@ -2,16 +2,6 @@
 Test get_browser() function : basic functionality
 --INI--
 browscap={PWD}/browscap.ini
---SKIPIF--
-<?php
-	/**
-	 * Basic test, it would be pretty much coincidence if there's
-	 * a browscap.ini on another place that isn't valid.
-	 */
-	if(! is_readable( ini_get( 'browscap' ) ) ) {
-		die( 'skip: browscap.ini file ' . ini_get('browscap') . " not readable" );
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
diff --git a/ext/standard/tests/misc/get_browser_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt
index c8689d8370..16e07f9f7d 100644
--- a/ext/standard/tests/misc/get_browser_error.phpt
+++ b/ext/standard/tests/misc/get_browser_error.phpt
@@ -2,16 +2,6 @@
 Test get_browser() function : error functionality
 --INI--
 browscap={PWD}/browscap.ini
---SKIPIF--
-<?php
-	/**
-	 * Basic test, it would be pretty much coincidence if there's
-	 * a browscap.ini on another place that isn't valid.
-	 */
-	if(! is_readable( ini_get( 'browscap' ) ) ) {
-		die( 'skip: browscap.ini file ' . ini_get('browscap') . " not readable" );
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt
index 2cd2c4e5a0..dacfdfc8d9 100644
--- a/ext/standard/tests/misc/get_browser_variation1.phpt
+++ b/ext/standard/tests/misc/get_browser_variation1.phpt
@@ -2,16 +2,6 @@
 Test get_browser() function : variation functionality: extra browser names
 --INI--
 browscap={PWD}/browscap.ini
---SKIPIF--
-<?php
-	/**
-	 * Basic test, it would be pretty much coincidence if there's
-	 * a browscap.ini on another place that isn't valid.
-	 */
-	if(! is_readable( ini_get( 'browscap' ) ) ) {
-		die( 'skip: browscap.ini file ' . ini_get('browscap') . " not readable" );
-	}
-?>
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
diff --git a/ext/standard/tests/misc/get_browser_variation2.phpt b/ext/standard/tests/misc/get_browser_variation2.phpt
index 5c4d2ecd6e..be487d8701 100644
--- a/ext/standard/tests/misc/get_browser_variation2.phpt
+++ b/ext/standard/tests/misc/get_browser_variation2.phpt
@@ -2,16 +2,6 @@
 Test get_browser() function variation : Return data as object
 --INI--
 browscap={PWD}/browscap.ini
---SKIPIF--
-<?php
-	/**
-	 * Basic test, it would be pretty much coincidence if there's
-	 * a browscap.ini on another place that isn't valid.
-	 */
-	if(! is_readable( ini_get( 'browscap' ) ) ) {
-		die( 'skip: browscap.ini file ' . ini_get('browscap') . " not readable" );
-	}
-?>
 --FILE--
 <?php