summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-02-06 17:23:57 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-02-06 17:23:57 +0000
commit145c4cbc56a91c423e5993be335d6829b931a940 (patch)
treeed32ee9e8fff69743beab27529778ca21fb9f7e6
parenta888ee434ba046660394840cc15d59875c13a79d (diff)
downloadphp-git-145c4cbc56a91c423e5993be335d6829b931a940.tar.gz
Fixed parse_url() tests to account for port validation
Diffstat
-rw-r--r--ext/standard/tests/url/parse_url_basic_001.phpt9
-rw-r--r--ext/standard/tests/url/parse_url_basic_002.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_003.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_004.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_005.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_006.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_007.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_008.phpt2
-rw-r--r--ext/standard/tests/url/parse_url_basic_009.phpt2
9 files changed, 9 insertions, 16 deletions
diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt
index 7b9d51399a..1edc32eaba 100644
--- a/ext/standard/tests/url/parse_url_basic_001.phpt
+++ b/ext/standard/tests/url/parse_url_basic_001.phpt
@@ -734,14 +734,7 @@ echo "Done";
string(9) "/blah.com"
}
---> x://::abc/?: array(3) {
- ["scheme"]=>
- string(1) "x"
- ["host"]=>
- string(1) ":"
- ["path"]=>
- string(1) "/"
-}
+--> x://::abc/?: bool(false)
--> http://::?: array(2) {
["scheme"]=>
diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt
index f3ac770f0a..464e977ffc 100644
--- a/ext/standard/tests/url/parse_url_basic_002.phpt
+++ b/ext/standard/tests/url/parse_url_basic_002.phpt
@@ -94,7 +94,7 @@ echo "Done";
--> http://x:? : string(4) "http"
--> x:blah.com : string(1) "x"
--> x:/blah.com : string(1) "x"
---> x://::abc/? : string(1) "x"
+--> x://::abc/? : bool(false)
--> http://::? : string(4) "http"
--> x://::6.5 : string(1) "x"
--> http://?:/ : string(4) "http"
diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt
index dbd92088ae..57f182bfa3 100644
--- a/ext/standard/tests/url/parse_url_basic_003.phpt
+++ b/ext/standard/tests/url/parse_url_basic_003.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : string(1) "x"
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : string(1) ":"
+--> x://::abc/? : bool(false)
--> http://::? : string(1) ":"
--> x://::6.5 : string(1) ":"
--> http://?:/ : string(1) "?"
diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt
index 387907f0ee..6abf4ed453 100644
--- a/ext/standard/tests/url/parse_url_basic_004.phpt
+++ b/ext/standard/tests/url/parse_url_basic_004.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : NULL
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : int(6)
--> http://?:/ : NULL
diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt
index d44dcfef39..3bcc89106d 100644
--- a/ext/standard/tests/url/parse_url_basic_005.phpt
+++ b/ext/standard/tests/url/parse_url_basic_005.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : NULL
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : NULL
--> http://?:/ : NULL
diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt
index bd6d03efde..741a424a61 100644
--- a/ext/standard/tests/url/parse_url_basic_006.phpt
+++ b/ext/standard/tests/url/parse_url_basic_006.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : NULL
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : NULL
--> http://?:/ : NULL
diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt
index aa9f88ba54..bf8f98042e 100644
--- a/ext/standard/tests/url/parse_url_basic_007.phpt
+++ b/ext/standard/tests/url/parse_url_basic_007.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : string(8) "blah.com"
--> x:/blah.com : string(9) "/blah.com"
---> x://::abc/? : string(1) "/"
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : NULL
--> http://?:/ : string(1) "/"
diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt
index 7b166127f8..a61fd06943 100644
--- a/ext/standard/tests/url/parse_url_basic_008.phpt
+++ b/ext/standard/tests/url/parse_url_basic_008.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : NULL
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : NULL
--> http://?:/ : NULL
diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt
index a814546c52..5302388f6f 100644
--- a/ext/standard/tests/url/parse_url_basic_009.phpt
+++ b/ext/standard/tests/url/parse_url_basic_009.phpt
@@ -93,7 +93,7 @@ echo "Done";
--> http://x:? : NULL
--> x:blah.com : NULL
--> x:/blah.com : NULL
---> x://::abc/? : NULL
+--> x://::abc/? : bool(false)
--> http://::? : NULL
--> x://::6.5 : NULL
--> http://?:/ : NULL
View Lorry Controller Status