Fix extending

Author: Jleagle

src/Html/Uri.php

@@ -86,7 +86,10 @@ public function __construct($uri)
     $this->setFragment(Arrays::value($parts, 'fragment', ''));
   }
 
-  public function __toString(): string
+  /**
+   * @return string
+   */
+  public function __toString()
   {
     $prefix = null;
     if($this->protocol || $this->domain || $this->port)
@@ -140,7 +143,10 @@ public function __toString(): string
     return $prefix . $this->getPath() . $query . $fragment;
   }
 
-  public function getFragment(): string
+  /**
+   * @return string
+   */
+  public function getFragment()
   {
     return $this->fragment;
   }
@@ -154,7 +160,10 @@ public function setFragment($fragment)
     return $this;
   }
 
-  public function getPath(): string
+  /**
+   * @return string
+   */
+  public function getPath()
   {
     return $this->path;
   }
@@ -197,12 +206,18 @@ public function setQueryParams(array $params)
     return $this;
   }
 
-  public function getQueryParams(): array
+  /**
+   * @return array
+   */
+  public function getQueryParams()
   {
     return $this->query;
   }
 
-  public function getProtocol(): string
+  /**
+   * @return string
+   */
+  public function getProtocol()
   {
     return $this->protocol;
   }
@@ -216,7 +231,10 @@ public function setProtocol($protocol)
     return $this;
   }
 
-  public function getDomain(): string
+  /**
+   * @return string
+   */
+  public function getDomain()
   {
     return $this->domain;
   }
@@ -230,7 +248,10 @@ public function setDomain($domain)
     return $this;
   }
 
-  public function getPort(): string
+  /**
+   * @return string
+   */
+  public function getPort()
   {
     return $this->port;
   }
@@ -269,7 +290,10 @@ public function appendPath(string $path)
     return $this;
   }
 
-  public function getUser(): string
+  /**
+   * @return string
+   */
+  public function getUser()
   {
     return $this->user;
   }
@@ -283,7 +307,10 @@ public function setUser(string $user)
     return $this;
   }
 
-  public function getPass(): string
+  /**
+   * @return string
+   */
+  public function getPass()
   {
     return $this->pass;
   }

tests/Html/HtmlElementTest.php

@@ -4,6 +4,7 @@
 use Packaged\SafeHtml\SafeHtml;
 use Packaged\Ui\Html\Uri;
 use Packaged\Ui\Tests\Supporting\Html\TestExtendingHtmlElement;
+use Packaged\Ui\Tests\Supporting\Html\TestExtendingUri;
 use Packaged\Ui\Tests\Supporting\Html\TestHtmlElement;
 use PHPUnit\Framework\TestCase;
 
@@ -269,5 +270,8 @@ public function testExtending()
   {
     $ele = new TestExtendingHtmlElement();
     self::assertInstanceOf(TestExtendingHtmlElement::class, $ele);
+
+    $ele = new TestExtendingUri('test');
+    self::assertInstanceOf(TestExtendingUri::class, $ele);
   }
 }

tests/Supporting/Html/TestExtendingUri.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace Packaged\Ui\Tests\Supporting\Html;
+
+use Packaged\Ui\Html\Uri;
+
+class TestExtendingUri extends Uri
+{
+  public function __construct($uri) { parent::__construct($uri); }
+
+  public function __toString()
+  {
+    return parent::__toString();
+  }
+
+  public function getFragment()
+  {
+    return parent::getFragment();
+  }
+
+  public function setFragment($fragment)
+  {
+    return parent::setFragment($fragment);
+  }
+
+  public function getPath()
+  {
+    return parent::getPath();
+  }
+
+  public function setPath($path)
+  {
+    return parent::setPath($path);
+  }
+
+  public function setQueryParam($key, $value)
+  {
+    return parent::setQueryParam($key, $value);
+  }
+
+  public function setQueryParams(array $params)
+  {
+    return parent::setQueryParams($params);
+  }
+
+  public function getQueryParams()
+  {
+    return parent::getQueryParams();
+  }
+
+  public function getProtocol()
+  {
+    return parent::getProtocol();
+  }
+
+  public function setProtocol($protocol)
+  {
+    return parent::setProtocol($protocol);
+  }
+
+  public function getDomain()
+  {
+    return parent::getDomain();
+  }
+
+  public function setDomain($domain)
+  {
+    return parent::setDomain($domain);
+  }
+
+  public function getPort()
+  {
+    return parent::getPort();
+  }
+
+  public function setPort($port)
+  {
+    return parent::setPort($port);
+  }
+
+  public function appendPath($path)
+  {
+    return parent::appendPath($path);
+  }
+
+  public function getUser()
+  {
+    return parent::getUser();
+  }
+
+  public function setUser($user)
+  {
+    return parent::setUser($user);
+  }
+
+  public function getPass()
+  {
+    return parent::getPass();
+  }
+
+  public function setPass($pass)
+  {
+    return parent::setPass($pass);
+  }
+}