Removing unnecessary SKIPIF sections

Zoe Slattery · Zoe Slattery · commit d09ab2ab42ca · 2009-07-18T13:46:08.000Z
diff --git a/Zend/tests/unset_cv07.phpt b/Zend/tests/unset_cv07.phpt
@@ -1,7 +1,5 @@
 --TEST--
 unset() CV 7 (indirect unset() of global variable in import_request_variables())
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --GET--
 x=2
 --FILE--
diff --git a/ext/standard/tests/file/is_uploaded_file_basic.phpt b/ext/standard/tests/file/is_uploaded_file_basic.phpt
@@ -2,8 +2,6 @@
 is_uploaded_file() function
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-type: multipart/form-data, boundary=AaB03x
 
diff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt
@@ -2,8 +2,6 @@
 move_uploaded_file() function
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-type: multipart/form-data, boundary=AaB03x
 
diff --git a/ext/standard/tests/general_functions/phpcredits2.phpt b/ext/standard/tests/general_functions/phpcredits2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 phpcredits() CGI
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 dummy=x
 --FILE--
diff --git a/ext/standard/tests/general_functions/phpinfo2.phpt b/ext/standard/tests/general_functions/phpinfo2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 phpinfo() CGI
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 dummy=x
 --FILE--
diff --git a/tests/basic/002.phpt b/tests/basic/002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Simple POST Method test
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=Hello+World
 --FILE--
diff --git a/tests/basic/003.phpt b/tests/basic/003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 GET and POST Method combined
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=Hello+World
 --GET--
diff --git a/tests/basic/004.phpt b/tests/basic/004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Two variables in POST data
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=Hello+World&b=Hello+Again+World
 --FILE--
diff --git a/tests/basic/005.phpt b/tests/basic/005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Three variables in POST data
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=Hello+World&b=Hello+Again+World&c=1
 --FILE--
diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Testing $argc and $argv handling (GET)
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --INI--
 register_argc_argv=1
 --GET--
diff --git a/tests/basic/013.phpt b/tests/basic/013.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[]=1
 --FILE--
diff --git a/tests/basic/014.phpt b/tests/basic/014.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 2
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[]=1&a[]=1
 --FILE--
diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 3 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[]=1&a[0]=5
 --FILE--
diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 4 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[a]=1&a[b]=3
 --FILE--
diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 5 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[]=1&a[a]=1&a[b]=3
 --FILE--
diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 6 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[][]=1&a[][]=3&b[a][b][c]=1&b[a][b][d]=1
 --FILE--
diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 7 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[]=1&a[]]=3&a[[]=4
 --FILE--
diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt
@@ -1,7 +1,5 @@
 --TEST--
 POST Method test and arrays - 8 
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a[a[]]=1&a[b[]]=3
 --FILE--
diff --git a/tests/basic/021.phpt b/tests/basic/021.phpt
@@ -2,8 +2,6 @@
 Bug #37276 (problems witch $_POST array)
 --INI--
 file_upload=1
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/024.phpt b/tests/basic/024.phpt
@@ -3,8 +3,6 @@ Test HTTP_RAW_POST_DATA creation
 --INI--
 magic_quotes_gpc=0
 always_populate_raw_post_data=1
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3
 --FILE--
diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt
@@ -4,8 +4,6 @@ Test HTTP_RAW_POST_DATA with excessive post length
 magic_quotes_gpc=0
 always_populate_raw_post_data=1
 post_max_size=1K
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 --FILE--
diff --git a/tests/basic/026.phpt b/tests/basic/026.phpt
@@ -3,8 +3,6 @@ Registration of HTTP_RAW_POST_DATA due to unknown content-type
 --INI--
 magic_quotes_gpc=0
 always_populate_raw_post_data=0
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST_RAW--
 Content-Type: unknown/type
 a=1&b=ZYX
@@ -15,4 +13,4 @@ var_dump($_POST, $HTTP_RAW_POST_DATA);
 --EXPECT--
 array(0) {
 }
-string(9) "a=1&b=ZYX"
+string(9) "a=1&b=ZYX"
diff --git a/tests/basic/027.phpt b/tests/basic/027.phpt
@@ -7,8 +7,6 @@ display_errors=0
 max_input_nesting_level=10
 track_errors=1
 log_errors=0
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 a=1&b=ZYX&c[][][][][][][][][][][][][][][][][][][][][][]=123&d=123&e[][]][]=3
 --FILE--
diff --git a/tests/basic/bug46759.phpt b/tests/basic/bug46759.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Testing magic_quotes_gpc
---SKIPIF--
-<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
 --INI--
 magic_quotes_gpc=1
 --GET--
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt
@@ -4,8 +4,6 @@ rfc1867 boundary 1
 post_max_size=1024
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary="------------------------------------foobar"
 --------------------------------------foobar
diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt
@@ -4,8 +4,6 @@ rfc1867 boundary 2
 post_max_size=1024
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=------------------------------------foo, bar
 --------------------------------------foo
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt
@@ -4,8 +4,6 @@ rfc1867 file_upload disabled
 file_uploads=0
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_garbled_mime_headers.phpt b/tests/basic/rfc1867_garbled_mime_headers.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_invalid_boundary.phpt b/tests/basic/rfc1867_invalid_boundary.phpt
@@ -4,8 +4,6 @@ rfc1867 invalid boundary
 post_max_size=1024
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary="foobar
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_missing_boundary.phpt b/tests/basic/rfc1867_missing_boundary.phpt
@@ -4,8 +4,6 @@ rfc1867 missing boundary
 post_max_size=1024
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
@@ -5,8 +5,6 @@ file_uploads=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/basic/rfc1867_post_max_size.phpt b/tests/basic/rfc1867_post_max_size.phpt
@@ -4,8 +4,6 @@ rfc1867 post_max_size
 post_max_size=1
 error_reporting=E_ALL&~E_NOTICE
 comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
diff --git a/tests/lang/bug25145.phpt b/tests/lang/bug25145.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #25145 (SEGV on recpt of form input with name like "123[]")
---SKIPIF--
-<?php if (php_sapi_name() == 'cli') echo 'skip'; ?>
 --GET--
 123[]=SEGV
 --FILE--
