Page MenuHomeDevCentral
Files F26077623

D4077.diff
No OneTemporary
Actions

D4077.diff
View Options

diff --git a/omnitools/src/HTTP/URL.php b/omnitools/src/HTTP/URL.php
--- a/omnitools/src/HTTP/URL.php
+++ b/omnitools/src/HTTP/URL.php
@@ -5,6 +5,8 @@
use Keruald\OmniTools\Strings\Multibyte\OmniString;
+use Exception;
+
/**
* Represent a URL
*/
@@ -173,22 +175,19 @@
* @see URL::beautifyQuery() for the inverse operation (decode)
*/
public function normalizeQuery (string $query) : string {
- switch ($this->queryEncoding) {
- case self::ENCODE_RFC3986_SLASH_EXCEPTED:
- return (new OmniString($query))
- ->explode("/")
- ->map("rawurlencode")
- ->implode("/")
- ->__toString();
-
- case self::ENCODE_AS_IS:
- return $query;
-
- case self::ENCODE_RFC3986_PURE:
- return rawurlencode($query);
- }
+ return match ($this->queryEncoding) {
+ self::ENCODE_AS_IS => $query,
+
+ self::ENCODE_RFC3986_PURE => rawurlencode($query),
+
+ self::ENCODE_RFC3986_SLASH_EXCEPTED => (new OmniString($query))
+ ->explode("/")
+ ->map("rawurlencode")
+ ->implode("/")
+ ->__toString(),
- throw new \Exception('Unexpected encoding value');
+ default => throw new Exception('Unexpected encoding value'),
+ };
}
/**
@@ -200,22 +199,19 @@
* @see URL::normalizeQuery() for the inverse operation (encode)
*/
public function beautifyQuery (string $query) : string {
- switch ($this->queryEncoding) {
- case self::ENCODE_RFC3986_SLASH_EXCEPTED:
- return (new OmniString($query))
- ->explode("/")
- ->map("rawurldecode")
- ->implode("/")
- ->__toString();
-
- case self::ENCODE_AS_IS:
- return $query;
-
- case self::ENCODE_RFC3986_PURE:
- return rawurldecode($query);
- }
+ return match ($this->queryEncoding) {
+ self::ENCODE_AS_IS => $query,
+
+ self::ENCODE_RFC3986_PURE => rawurldecode($query),
+
+ self::ENCODE_RFC3986_SLASH_EXCEPTED => (new OmniString($query))
+ ->explode("/")
+ ->map("rawurldecode")
+ ->implode("/")
+ ->__toString(),
- throw new \Exception('Unexpected encoding value');
+ default => throw new Exception('Unexpected value'),
+ };
}
/**

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 00:39 (22 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3644767
Default Alt Text
D4077.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator