aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthur <arthur@hoa.ro>2016-05-05 13:31:13 +0200
committerArthur <arthur@hoa.ro>2016-05-05 13:31:13 +0200
commit501939622af1fd99d77c7bd87d88f27cc4139b21 (patch)
tree7fcd56578f8e570a7517648c82abe29af4ec8593
parent86deafe0ff5a22a37255546cf82325e89bf272b1 (diff)
parentcaa69b585381cc1c22df3dbb9c943855b8f13a70 (diff)
downloadShaarli-501939622af1fd99d77c7bd87d88f27cc4139b21.tar.gz
Shaarli-501939622af1fd99d77c7bd87d88f27cc4139b21.tar.zst
Shaarli-501939622af1fd99d77c7bd87d88f27cc4139b21.zip
Merge pull request #553 from ArthurHoaro/typo
typo
-rw-r--r--application/HttpUtils.php4
-rw-r--r--application/Url.php2
-rw-r--r--tests/Url/UrlTest.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/application/HttpUtils.php b/application/HttpUtils.php
index 0e1ce879..c84ba6f0 100644
--- a/application/HttpUtils.php
+++ b/application/HttpUtils.php
@@ -27,7 +27,7 @@
27function get_http_response($url, $timeout = 30, $maxBytes = 4194304) 27function get_http_response($url, $timeout = 30, $maxBytes = 4194304)
28{ 28{
29 $urlObj = new Url($url); 29 $urlObj = new Url($url);
30 $cleanUrl = $urlObj->indToAscii(); 30 $cleanUrl = $urlObj->idnToAscii();
31 31
32 if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { 32 if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) {
33 return array(array(0 => 'Invalid HTTP Url'), false); 33 return array(array(0 => 'Invalid HTTP Url'), false);
@@ -70,7 +70,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304)
70 * Retrieve HTTP headers, following n redirections (temporary and permanent ones). 70 * Retrieve HTTP headers, following n redirections (temporary and permanent ones).
71 * 71 *
72 * @param string $url initial URL to reach. 72 * @param string $url initial URL to reach.
73 * @param int $redirectionLimit max redirection follow.. 73 * @param int $redirectionLimit max redirection follow.
74 * 74 *
75 * @return array HTTP headers, or false if it failed. 75 * @return array HTTP headers, or false if it failed.
76 */ 76 */
diff --git a/application/Url.php b/application/Url.php
index 61a30a78..77447c8d 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -240,7 +240,7 @@ class Url
240 * 240 *
241 * @return string converted cleaned up URL. 241 * @return string converted cleaned up URL.
242 */ 242 */
243 public function indToAscii() 243 public function idnToAscii()
244 { 244 {
245 $out = $this->cleanup(); 245 $out = $this->cleanup();
246 if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { 246 if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) {
diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index 5fdc8617..ce82265e 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -190,10 +190,10 @@ class UrlTest extends PHPUnit_Framework_TestCase
190 $ind = 'http://www.académie-française.fr/'; 190 $ind = 'http://www.académie-française.fr/';
191 $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/'; 191 $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/';
192 $url = new Url($ind); 192 $url = new Url($ind);
193 $this->assertEquals($expected, $url->indToAscii()); 193 $this->assertEquals($expected, $url->idnToAscii());
194 194
195 $notInd = 'http://www.academie-francaise.fr/'; 195 $notInd = 'http://www.academie-francaise.fr/';
196 $url = new Url($notInd); 196 $url = new Url($notInd);
197 $this->assertEquals($notInd, $url->indToAscii()); 197 $this->assertEquals($notInd, $url->idnToAscii());
198 } 198 }
199} 199}