summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-11-06 17:48:16 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-11-06 17:48:52 +0100
commitf494a366183cc5ee8f66f27522ae8d7c30157bb1 (patch)
tree9aff5bf167e52bf95b94475eb13eb9231321f74b
parenta3e454aacc80521ae18aa597ff510b9f94bbd6ea (diff)
downloadphp-git-f494a366183cc5ee8f66f27522ae8d7c30157bb1.tar.gz
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--.
-rw-r--r--ext/standard/tests/misc/bug65550.phpt4
-rw-r--r--ext/standard/tests/misc/get_browser_basic.phpt10
-rw-r--r--ext/standard/tests/misc/get_browser_error.phpt10
-rw-r--r--ext/standard/tests/misc/get_browser_variation1.phpt10
-rw-r--r--ext/standard/tests/misc/get_browser_variation2.phpt10
5 files changed, 0 insertions, 44 deletions
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