Extend BehindProxy to also accept separate arguments

Author: thekid

ChangeLog.md

@@ -5,6 +5,9 @@ Web change log
 
 ## 5.0.0 / ????-??-??
 
+* Extended `web.filters.BehindProxy` to also accept separate arguments
+  for remote URL and local path
+  (@thekid)
 * Merged PR #126: Verify websocket origin, which is an effective measure
   against Cross Site WebSocket Hijacking
   (@thekid)

src/main/php/web/filters/BehindProxy.class.php

@@ -13,22 +13,37 @@ class BehindProxy implements Filter {
   private $remote, $replace;
 
   /**
-   * Creates a new instance given a map of the front-facing URL to the local path
+   * Creates a new instance given a map of the front-facing URL to the local path:
    *
-   * @param  [:string] $mapping e.g. `["http://remote.url/" => "/local.path"]`
+   * ```php
+   * // Using a map
+   * new BehindProxy(['http://remote.url/' => '/local.path']);
+   *
+   * // Specifying remote URL and local path as separate arguments
+   * new BehindProxy('http://remote.url/', '/local.path');
+   * ```
+   *
+   * @param  [:string]|string $mapping
+   * @param  ?string $target
    * @throws lang.IllegalArgumentException
    */
-  public function __construct($mapping) {
-    if (1 !== sizeof($mapping)) {
-      throw new IllegalArgumentException('Expected a map in the form ["http://remote.url/" => "/local.path"]');
+  public function __construct($mapping, $target= null) {
+    if (is_array($mapping)) {
+      if (1 !== sizeof($mapping)) {
+        throw new IllegalArgumentException('Expected a map in the form ["http://remote.url/" => "/local.path"]');
+      }
+
+      $this->remote= new URI(key($mapping));
+      $target= current($mapping);
+    } else {
+      $this->remote= new URI($mapping);
     }
 
-    $this->remote= new URI(key($mapping));
     if ($this->remote->isRelative()) {
       throw new IllegalArgumentException('Remote URL must be absolute');
     }
 
-    $this->replace= '#^'.rtrim(preg_quote(current($mapping), '#'), '/').'/#';
+    $this->replace= '#^'.rtrim(preg_quote($target, '#'), '/').'/#';
   }
 
   /**

src/test/php/web/unittest/filters/BehindProxyTest.class.php

@@ -9,10 +9,23 @@
 class BehindProxyTest {
 
   #[Test]
-  public function can_create() {
+  public function can_create_with_mapping() {
     new BehindProxy(['http://remote' => '/']);
   }
 
+  #[Test]
+  public function can_create_with_remote_and_local() {
+    new BehindProxy('http://remote', '/');
+  }
+
+  #[Test]
+  public function mapping_and_remote_and_local_equal() {
+    Assert::equals(
+      new BehindProxy(['http://remote' => '/']),
+      new BehindProxy('http://remote', '/')
+    );
+  }
+
   #[Test, Expect(IllegalArgumentException::class), Values([[[]], [[1]], [[1, 2, 3]]])]
   public function raises_exception_for_invalid($arg) {
     new BehindProxy($arg);