From: Chad Horohoe Date: Thu, 16 Jun 2011 02:58:00 +0000 (+0000) Subject: Followup to r89452, remove ftp test cases since Http::isValidUri() doesn't do ftp... X-Git-Tag: 1.31.0-rc.0~29503 X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=860cdbc0ff81626cdaedc924eb3a261b786b504c;p=lhc%2Fweb%2Fwiklou.git Followup to r89452, remove ftp test cases since Http::isValidUri() doesn't do ftp anymore --- diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php index d54e7f4fa7..2877d4d712 100644 --- a/tests/phpunit/includes/HttpTest.php +++ b/tests/phpunit/includes/HttpTest.php @@ -558,10 +558,9 @@ class HttpTest extends MediaWikiTestCase { return array( array( false, '¿non sens before!! http://a', 'Allow anything before URI' ), - # (ftp|http|https) - only three schemes allowed + # (http|https) - only three schemes allowed array( true, 'http://www.example.org/' ), array( true, 'https://www.example.org/' ), - array( true, 'ftp://www.example.org/' ), array( true, 'http://www.example.org', 'URI without directory' ), array( true, 'http://a', 'Short name' ), array( true, 'http://étoile', 'Allow UTF-8 in hostname' ), # 'étoile' is french for 'star' @@ -590,8 +589,6 @@ class HttpTest extends MediaWikiTestCase { array( true, 'https://example.org:80/' ), array( true, 'http://example.org:443/' ), array( true, 'https://example.org:443/' ), - array( true, 'ftp://example.org:1/', 'Minimum' ), - array( true, 'ftp://example.org:65535/', 'Maximum port number' ), # Part after the hostname is / or / with something else array( true, 'http://example/#' ),