🚿 extract uriIsDefaultPort()

Author: codemasher

src/Psr7/Uri.php

@@ -20,20 +20,6 @@
 
 class Uri implements UriInterface{
 
-	protected const DEFAULT_PORTS = [
-		'http'   => 80,
-		'https'  => 443,
-		'ftp'    => 21,
-		'gopher' => 70,
-		'nntp'   => 119,
-		'news'   => 119,
-		'telnet' => 23,
-		'tn3270' => 23,
-		'imap'   => 143,
-		'pop'    => 110,
-		'ldap'   => 389,
-	];
-
 	protected string $scheme = '';
 
 	protected string $user = '';
@@ -498,7 +484,7 @@ function(array $match):string{
 	 */
 	protected function removeDefaultPort():void{
 
-		if($this->port !== null && (isset($this::DEFAULT_PORTS[$this->scheme]) && $this->port === $this::DEFAULT_PORTS[$this->scheme])){
+		if(uriIsDefaultPort($this)){
 			$this->port = null;
 		}
 

src/Psr7/message_helpers.php

@@ -500,6 +500,27 @@ function decompress_content(MessageInterface $message):string{
 
 }
 
+const URI_DEFAULT_PORTS = [
+	'http'   => 80,
+	'https'  => 443,
+	'ftp'    => 21,
+	'gopher' => 70,
+	'nntp'   => 119,
+	'news'   => 119,
+	'telnet' => 23,
+	'tn3270' => 23,
+	'imap'   => 143,
+	'pop'    => 110,
+	'ldap'   => 389,
+];
+
+function uriIsDefaultPort(UriInterface $uri):bool{
+	$port   = $uri->getPort();
+	$scheme = $uri->getScheme();
+
+	return $port === null || (isset(URI_DEFAULT_PORTS[$scheme]) && $port === URI_DEFAULT_PORTS[$scheme]);
+}
+
 /**
  * Whether the URI is absolute, i.e. it has a scheme.
  *