Merge branch 'master' into cs/php7

1 files changed, 21 insertions, 21 deletions

diff --git a/tests/it_url.t b/tests/it_url.t
index 711b5f1..5cb2b29 100755
--- a/tests/it_url.t
+++ b/tests/it_url.t
@@ -109,7 +109,7 @@ ok(
 );
 is(
 	$url->result,
-	200,
+	'200',
 	'$url->result = 200'
 );
 is(
@@ -131,7 +131,7 @@ handle_server(
 	is(
 		it_url::get('http://localhost:8000/'),
 		"Testserver root output",
-		'it_url::get() static call with port',
+		'it_url::get() static call with port'
 	)
 );
 
@@ -139,7 +139,7 @@ handle_server(
 	is(
 		it_url::get(array('url' => 'http://localhost:8000/', 'maxlength' => 100)),
 		"Testserver root output",
-		'it_url::get() static call with port and maxlength',
+		'it_url::get() static call with port and maxlength'
 	)
 );
 
@@ -147,7 +147,7 @@ handle_server(
 	is(
 		it_url::get(array('url' => 'http://localhost:8000/', 'maxlength' => 5)),
 		false,
-		'it_url::get() static call with port and too small maxlength',
+		'it_url::get() static call with port and too small maxlength'
 	)
 );
 
@@ -155,7 +155,7 @@ handle_server(
 	is(
 		it_url::get('http://localhost:8000/temp_redirect'),
 		"Testserver output after temporary redirect",
-		'it_url::get() follows temproary redirect',
+		'it_url::get() follows temproary redirect'
 	)
 );
 
@@ -163,7 +163,7 @@ handle_server(
 	is(
 		it_url::get('http://localhost:8000/perm_redirect'),
 		"Testserver output after permanent redirect",
-		'it_url::get() follows permanent redirect',
+		'it_url::get() follows permanent redirect'
 	)
 );
 
@@ -171,7 +171,7 @@ handle_server(
 	is(
 		it_url::get('http://localhost:8000/relative_redirect'),
 		"Testserver output after relative redirect",
-		'TODO: it_url::get() follows relative redirect correctly',
+		'TODO: it_url::get() follows relative redirect correctly'
 	)
 );
 
@@ -179,59 +179,59 @@ handle_server(
 	is(
 		it_url::get('http://localhost:8000/nohost_redirect'),
 		"Testserver output after nohost redirect",
-		'TODO: it_url::get() follows redirect without host correctly',
+		'TODO: it_url::get() follows redirect without host correctly'
 	)
 );
 
 $output = handle_server(
 	ok(
-		!it_url::get(U('http://localhost:8000/redirect_loop', 'num' => 10)),
-		'it_url::get() handles redirect loop',
+		!it_url::get(U('http://localhost:8000/redirect_loop', array('num' => 10))),
+		'it_url::get() handles redirect loop'
 	)
 );
 $last_num = it::match('num=(\d+)', end($output));
 if (!ok(
 	$last_num == 5,
-	'it_url::get() aborts redirect loop after 5 redirects',
+	'it_url::get() aborts redirect loop after 5 redirects'
 ))
 	diag($output);
 
 $output = handle_server(
 	ok(
-		!it_url::get('url' => 'http://localhost:8000/does_not_exist', 'retries' => 4),
-		'it_url::get() retries on empty response',
+		!it_url::get(array('url' => 'http://localhost:8000/does_not_exist', 'retries' => 4)),
+		'it_url::get() retries on empty response'
 	)
 );
 if (!ok(
 	count(preg_grep('/^Got Request:/', $output)) == 5,
-	'it_url::get() respects set retry count',
+	'it_url::get() respects set retry count'
 ))
 	diag($output);
 
 handle_server(
 	is(
-		it_url::get(U('http://localhost:8000/get_server_value', 'key' => 'HTTP_HOST')),
+		it_url::get(U('http://localhost:8000/get_server_value', array('key' => 'HTTP_HOST'))),
 		'localhost:8000',
-		'it_url::get() sets correct Host header',
+		'it_url::get() sets correct Host header'
 	)
 );
 
 handle_server(
 	is(
-		it_url::get(U('http://localhost:8000/get_server_value', 'key' => 'HTTP_ACCEPT_LANGUAGE')),
+		it_url::get(U('http://localhost:8000/get_server_value', array('key' => 'HTTP_ACCEPT_LANGUAGE'))),
 		T_lang(),
-		'it_url::get() sets correct Accept-Language header',
+		'it_url::get() sets correct Accept-Language header'
 	)
 );
 
 handle_server(
 	ok(
-		it::match('Mozilla', it_url::get(U('http://localhost:8000/get_server_value', 'key' => 'HTTP_USER_AGENT'))),
-		'it_url::get() sets User-Agent containing Mozilla',
+		it::match('Mozilla', it_url::get(U('http://localhost:8000/get_server_value', array('key' => 'HTTP_USER_AGENT')))),
+		'it_url::get() sets User-Agent containing Mozilla'
 	)
 );
 
-$pages = it_url::get_multi('urls' => array('a' => 'http://www.gna.ch/', 'b' => 'http://search.ch/'));
+$pages = it_url::get_multi(array('urls' => array('a' => 'http://www.gna.ch/', 'b' => 'http://search.ch/')));
 ok(strpos($pages['a'], '</html>'), 'it_url::get_multi got first url'); # UTF8SAFE
 ok(strpos($pages['b'], '</html>'), 'it_url::get_multi got second url'); # UTF8SAFE
 is(count($pages), 2, 'it_url::get_multi no additional array elements');