aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2018-12-03 00:34:53 +0100
committerVirtualTam <virtualtam@flibidi.net>2019-01-12 22:47:48 +0100
commit51753e403fa69c0ce124ede27d300477e3e799ca (patch)
tree0afe2a84598648b49cc53bb3e8640569ac370240 /application
parentfb1b182fbf0ee5afed586f77eec84d7a906831ef (diff)
downloadShaarli-51753e403fa69c0ce124ede27d300477e3e799ca.tar.gz
Shaarli-51753e403fa69c0ce124ede27d300477e3e799ca.tar.zst
Shaarli-51753e403fa69c0ce124ede27d300477e3e799ca.zip
namespacing: move HTTP utilities along \Shaarli\Http\ classes
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'application')
-rw-r--r--application/http/HttpUtils.php (renamed from application/HttpUtils.php)2
-rw-r--r--application/http/Url.php2
-rw-r--r--application/http/UrlUtils.php (renamed from application/Url.php)4
3 files changed, 4 insertions, 4 deletions
diff --git a/application/HttpUtils.php b/application/http/HttpUtils.php
index 51af5d0d..2ea9195d 100644
--- a/application/HttpUtils.php
+++ b/application/http/HttpUtils.php
@@ -41,7 +41,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304, $curlWriteF
41 $cleanUrl = $urlObj->idnToAscii(); 41 $cleanUrl = $urlObj->idnToAscii();
42 42
43 if (!filter_var($cleanUrl, FILTER_VALIDATE_URL) || !$urlObj->isHttp()) { 43 if (!filter_var($cleanUrl, FILTER_VALIDATE_URL) || !$urlObj->isHttp()) {
44 return array(array(0 => 'Invalid HTTP Url'), false); 44 return array(array(0 => 'Invalid HTTP UrlUtils'), false);
45 } 45 }
46 46
47 $userAgent = 47 $userAgent =
diff --git a/application/http/Url.php b/application/http/Url.php
index 260231c6..90444a2f 100644
--- a/application/http/Url.php
+++ b/application/http/Url.php
@@ -206,7 +206,7 @@ class Url
206 } 206 }
207 207
208 /** 208 /**
209 * Test if the Url is an HTTP one. 209 * Test if the UrlUtils is an HTTP one.
210 * 210 *
211 * @return true is HTTP, false otherwise. 211 * @return true is HTTP, false otherwise.
212 */ 212 */
diff --git a/application/Url.php b/application/http/UrlUtils.php
index 81f72fb0..4bc84b82 100644
--- a/application/Url.php
+++ b/application/http/UrlUtils.php
@@ -28,7 +28,7 @@ function unparse_url($parsedUrl)
28/** 28/**
29 * Removes undesired query parameters and fragments 29 * Removes undesired query parameters and fragments
30 * 30 *
31 * @param string url Url to be cleaned 31 * @param string url UrlUtils to be cleaned
32 * 32 *
33 * @return string the string representation of this URL after cleanup 33 * @return string the string representation of this URL after cleanup
34 */ 34 */
@@ -41,7 +41,7 @@ function cleanup_url($url)
41/** 41/**
42 * Get URL scheme. 42 * Get URL scheme.
43 * 43 *
44 * @param string url Url for which the scheme is requested 44 * @param string url UrlUtils for which the scheme is requested
45 * 45 *
46 * @return mixed the URL scheme or false if none is provided. 46 * @return mixed the URL scheme or false if none is provided.
47 */ 47 */