From d2f13e93cadf2543224afbed7e85230706a9451f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=AD=A3=E8=B6=85?= Date: Fri, 16 Aug 2019 11:20:56 +0800 Subject: [PATCH] Apply fixes from StyleCI (#29) --- src/QiniuAdapter.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/QiniuAdapter.php b/src/QiniuAdapter.php index e0bd479..a91a309 100644 --- a/src/QiniuAdapter.php +++ b/src/QiniuAdapter.php @@ -565,11 +565,11 @@ protected function normalizeHost($domain) } /** - * Does a UTF-8 safe version of PHP parse_url function + * Does a UTF-8 safe version of PHP parse_url function. * - * @param string $url URL to parse + * @param string $url URL to parse * - * @return mixed Associative array or false if badly formed URL. + * @return mixed associative array or false if badly formed URL * * @see http://us3.php.net/manual/en/function.parse-url.php * @since 11.1 @@ -580,7 +580,7 @@ protected static function parse_url($url) // Build arrays of values we need to decode before parsing $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%24', '%2C', '%2F', '%3F', '%23', '%5B', '%5D'); - $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "$", ",", "/", "?", "#", "[", "]"); + $replacements = array('!', '*', "'", '(', ')', ';', ':', '@', '&', '=', '$', ',', '/', '?', '#', '[', ']'); // Create encoded URL with special URL characters decoded so it can be parsed // All other characters will be encoded @@ -590,13 +590,12 @@ protected static function parse_url($url) $encodedParts = parse_url($encodedURL); // Now, decode each value of the resulting array - if ($encodedParts) - { - foreach ($encodedParts as $key => $value) - { + if ($encodedParts) { + foreach ($encodedParts as $key => $value) { $result[$key] = urldecode(str_replace($replacements, $entities, $value)); } } + return $result; } }