Cleanup

Nyholm · Nyholm · commit 59a0545a6afa · 2020-05-28T23:13:32.000+02:00
diff --git a/src/Symfony/Component/Dsn/Configuration/Path.php b/src/Symfony/Component/Dsn/Configuration/Path.php
@@ -37,6 +37,11 @@ public function __construct(string $scheme, string $path, array $parameters = []
         parent::__construct($scheme, $parameters);
     }
 
+    public function getScheme(): string
+    {
+        return parent::getScheme();
+    }
+
     public function getPath(): string
     {
         return $this->path;
@@ -49,6 +54,10 @@ public function __toString()
     {
         $parameters = $this->getParameters();
 
-        return sprintf('%s://%s%s%s', $this->getScheme(), $this->getUserInfoString(), $this->getPath(), empty($parameters) ? '' : '?'.http_build_query($parameters));
+        return
+            $this->getScheme().'://'.
+            $this->getUserInfoString().
+            $this->getPath().
+            (empty($parameters) ? '' : '?'.http_build_query($parameters));
     }
 }
diff --git a/src/Symfony/Component/Dsn/Configuration/Url.php b/src/Symfony/Component/Dsn/Configuration/Url.php
@@ -18,6 +18,8 @@
  *
  * Example:
  * - memcached://user:password@127.0.0.1?weight=50
+ * - 127.0.0.1:80
+ * - amqp://127.0.0.1/%2f/messages
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
@@ -70,7 +72,14 @@ public function getPath(): ?string
     public function __toString()
     {
         $parameters = $this->getParameters();
+        $scheme = $this->getScheme();
 
-        return sprintf('%s://%s%s%s%s', $this->getScheme(), $this->getUserInfoString(), $this->getHost(), empty($this->port) ? '' : ':'.$this->port, empty($parameters) ? '' : '?'.http_build_query($parameters));
+        return
+            (empty($scheme) ? '' : $scheme.'://').
+            $this->getUserInfoString() .
+            $this->getHost().
+            (empty($this->port) ? '' : ':'.$this->port).
+            ($this->getPath() ?? '').
+            (empty($parameters) ? '' : '?'.http_build_query($parameters));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@ public function __construct(string $scheme, string $path, array $parameters = []`
`37`	`37`	`parent::__construct($scheme, $parameters);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public function getScheme(): string`
	`41`	`+ {`
	`42`	`+ return parent::getScheme();`
	`43`	`+ }`
	`44`	`+`
`40`	`45`	`public function getPath(): string`
`41`	`46`	`{`
`42`	`47`	`return $this->path;`
`@@ -49,6 +54,10 @@ public function __toString()`
`49`	`54`	`{`
`50`	`55`	`$parameters = $this->getParameters();`
`51`	`56`
`52`		`- return sprintf('%s://%s%s%s', $this->getScheme(), $this->getUserInfoString(), $this->getPath(), empty($parameters) ? '' : '?'.http_build_query($parameters));`
	`57`	`+ return`
	`58`	`+ $this->getScheme().'://'.`
	`59`	`+ $this->getUserInfoString().`
	`60`	`+ $this->getPath().`
	`61`	`+ (empty($parameters) ? '' : '?'.http_build_query($parameters));`
`53`	`62`	`}`
`54`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`*`
`19`	`19`	`* Example:`
`20`	`20`	`* - memcached://user:password@127.0.0.1?weight=50`
	`21`	`+ * - 127.0.0.1:80`
	`22`	`+ * - amqp://127.0.0.1/%2f/messages`
`21`	`23`	`*`
`22`	`24`	`* @author Tobias Nyholm <tobias.nyholm@gmail.com>`
`23`	`25`	`*/`
`@@ -70,7 +72,14 @@ public function getPath(): ?string`
`70`	`72`	`public function __toString()`
`71`	`73`	`{`
`72`	`74`	`$parameters = $this->getParameters();`
	`75`	`+ $scheme = $this->getScheme();`
`73`	`76`
`74`		`- return sprintf('%s://%s%s%s%s', $this->getScheme(), $this->getUserInfoString(), $this->getHost(), empty($this->port) ? '' : ':'.$this->port, empty($parameters) ? '' : '?'.http_build_query($parameters));`
	`77`	`+ return`
	`78`	`+ (empty($scheme) ? '' : $scheme.'://').`
	`79`	`+ $this->getUserInfoString() .`
	`80`	`+ $this->getHost().`
	`81`	`+ (empty($this->port) ? '' : ':'.$this->port).`
	`82`	`+ ($this->getPath() ?? '').`
	`83`	`+ (empty($parameters) ? '' : '?'.http_build_query($parameters));`
`75`	`84`	`}`
`76`	`85`	`}`