Change the timing of filtering the hostname of the proxy URL to ProxyUrl::getHost() #11

Author: iteman

src/ProxyUrl/ProxyUrl.php

@@ -52,14 +52,22 @@ class ProxyUrl implements EntityInterface, IdentifiableInterface
     private $port;
 
     /**
-     * @param int|string $id
-     * @param string     $target
-     * @param string     $path
-     * @param string     $host
-     * @param string     $scheme
-     * @param int        $port
+     * @var ProxyHostFilterInterface
+     *
+     * @since Property available since Release 1.2.0
+     */
+    private $proxyHostFilter;
+
+    /**
+     * @param int|string               $id
+     * @param string                   $target
+     * @param string                   $path
+     * @param string                   $host
+     * @param string                   $scheme
+     * @param int                      $port
+     * @param ProxyHostFilterInterface $proxyHostFilter
      */
-    public function __construct($id, $target, $path, $host, $scheme, $port)
+    public function __construct($id, $target, $path, $host, $scheme, $port, ProxyHostFilterInterface $proxyHostFilter = null)
     {
         $this->id = $id;
         $this->target = $target;
@@ -81,14 +89,20 @@ public function __construct($id, $target, $path, $host, $scheme, $port)
         } else {
             $this->port = $port;
         }
+
+        $this->proxyHostFilter = $proxyHostFilter;
     }
 
     /**
      * @return string
      */
     public function getHost()
     {
-        return $this->host;
+        if ($this->proxyHostFilter === null) {
+            return $this->host;
+        } else {
+            return $this->proxyHostFilter->filter($this->host);
+        }
     }
 
     /**

src/ProxyUrl/ProxyUrlFactory.php

@@ -28,11 +28,7 @@ public function create($proxyUrlId, $path, $proxyUrl, ProxyHostFilterInterface $
     {
         list($proxyUrlPath, $proxyUrlHost, $proxyUrlScheme, $proxyUrlPort) = static::parseUrl($proxyUrl);
 
-        if ($proxyHostFilter !== null) {
-            $proxyUrlHost = $proxyHostFilter->filter($proxyUrlHost);
-        }
-
-        return new ProxyUrl($proxyUrlId, $path, $proxyUrlPath, $proxyUrlHost, $proxyUrlScheme, $proxyUrlPort);
+        return new ProxyUrl($proxyUrlId, $path, $proxyUrlPath, $proxyUrlHost, $proxyUrlScheme, $proxyUrlPort, $proxyHostFilter);
     }
 
     /**