From 33885d4e8faabe0d9fdec788a9ca5040a17e9df8 Mon Sep 17 00:00:00 2001
From: Brad Kent <bkfake-github@yahoo.com>
Date: Wed, 17 Jan 2024 14:45:45 -0600
Subject: [PATCH] GuzzleMiddleware issue with
 `Guzzle\Promise\Create::rejectionFor()` Additional file-size & complexity
 reduction HttpMessage/Utility/Uri::parseUrl now accepts a UriInterface (why
 not) Teams - can now pass a UriInterface as $url param

---
 phpcs.xml.dist                           |   2 +
 src/Debug/Collector/GuzzleMiddleware.php |   6 +-
 src/Debug/Framework/Yii1_1/UserInfo.php  |   7 +-
 src/Debug/Route/AbstractErrorRoute.php   | 122 ++++++++++
 src/Debug/Route/Discord.php              |  62 ++---
 src/Debug/Route/ErrorThrottleTrait.php   |  60 -----
 src/Debug/Route/Html.php                 |  45 ++--
 src/Debug/Route/Slack.php                |  60 +----
 src/Debug/Route/Teams.php                |  73 ++----
 src/Debug/Utility/Html.php               | 287 ++---------------------
 src/Debug/Utility/HtmlBuild.php          | 185 +++++++++++++++
 src/Debug/Utility/HtmlParse.php          | 120 ++++++++++
 src/Debug/Utility/PhpDoc/Parsers.php     | 165 ++++++++-----
 src/HttpMessage/Utility/Uri.php          |  20 +-
 src/Slack/AbstractBlockFactory.php       |   4 +-
 src/Slack/BlockElementsFactory.php       |  53 +++--
 src/Teams/Actions/AbstractAction.php     |   5 +-
 src/Teams/Actions/OpenUrl.php            |   9 +-
 src/Teams/CardUtilityTrait.php           |  71 ++----
 src/Teams/Cards/AdaptiveCard.php         |   5 +-
 src/Teams/Cards/HeroCard.php             |   5 +-
 src/Teams/Cards/MessageCard.php          |  15 +-
 src/Teams/Elements/CommonTrait.php       |   6 +-
 src/Teams/Elements/Image.php             |   9 +-
 src/Teams/Elements/Media.php             |   5 +-
 src/Teams/Elements/MediaSource.php       |  11 +-
 src/Teams/Section.php                    |  19 +-
 tests/Debug/Plugin/Method/TableTest.php  |   1 +
 tests/Debug/Route/DiscordTest.php        |   1 +
 tests/Debug/Route/SlackTest.php          |   1 +
 tests/Debug/Route/TeamsTest.php          |   1 +
 tests/Debug/Utility/HtmlTest.php         |   2 +
 tests/HttpMessage/Utility/UriTest.php    |  20 ++
 33 files changed, 789 insertions(+), 668 deletions(-)
 create mode 100644 src/Debug/Route/AbstractErrorRoute.php
 delete mode 100644 src/Debug/Route/ErrorThrottleTrait.php
 create mode 100644 src/Debug/Utility/HtmlBuild.php
 create mode 100644 src/Debug/Utility/HtmlParse.php

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index d7d2f675..5878484c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -52,6 +52,7 @@
         <exclude name="Generic.Commenting.DocComment.LongNotCapital" />
         <exclude name="Generic.Commenting.DocComment.MissingShort" />
         <exclude name="Generic.Commenting.DocComment.ShortNotCapital" />
+        <exclude name="Generic.Commenting.DocComment.SpacingAfterTagGroup" />
         <exclude name="Generic.Files.EndFileNewline.NotFound" /> <!-- handled by PSR-12 -->
         <exclude name="Generic.Files.EndFileNoNewline.Found" />
         <exclude name="Generic.Files.InlineHTML.Found" />
@@ -139,6 +140,7 @@
         <!-- VariableComment -->
         <exclude name="Squiz.Commenting.VariableComment.IncorrectVarType" />
         <exclude name="Squiz.Commenting.VariableComment.Missing" />
+        <exclude name="Squiz.Commenting.VariableComment.TagNotAllowed" />
         <exclude name="Squiz.Commenting.VariableComment.WrongStyle" />
     </rule>
     <rule ref="Squiz.Commenting.FileComment.Missing">
diff --git a/src/Debug/Collector/GuzzleMiddleware.php b/src/Debug/Collector/GuzzleMiddleware.php
index e8e9f7d3..c12273d0 100644
--- a/src/Debug/Collector/GuzzleMiddleware.php
+++ b/src/Debug/Collector/GuzzleMiddleware.php
@@ -6,7 +6,7 @@
  * @package   PHPDebugConsole
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2022 Brad Kent
+ * @copyright 2014-2024 Brad Kent
  * @version   v3.0
  */
 
@@ -96,7 +96,9 @@ public function onRejected(GuzzleException $reason, array $requestInfo)
         }
         $this->logResponse($response, $requestInfo, $reason);
         $this->debug->groupEnd($meta);
-        return Promise\Create::rejectionFor($reason);
+        return \class_exists('GuzzleHttp\\Promise\\Create')
+            ? Promise\Create::rejectionFor($reason)
+            : Promise\rejection_for($reason);
     }
 
     /**
diff --git a/src/Debug/Framework/Yii1_1/UserInfo.php b/src/Debug/Framework/Yii1_1/UserInfo.php
index d3c6c30f..7caa14f4 100644
--- a/src/Debug/Framework/Yii1_1/UserInfo.php
+++ b/src/Debug/Framework/Yii1_1/UserInfo.php
@@ -18,7 +18,6 @@
 use CModel;
 use CWebApplication;
 use Exception;
-use IWebUser;
 use Yii;
 
 /**
@@ -69,12 +68,12 @@ public function log()
     /**
      * Log user attributes
      *
-     * @param IWebUser $user  User instance
-     * @param Debug    $debug Debug instance
+     * @param CApplicationComponent $user  User instance (web or console)
+     * @param Debug                 $debug Debug instance
      *
      * @return void
      */
-    private function logIdentityData(IWebUser $user, Debug $debug)
+    private function logIdentityData(CApplicationComponent $user, Debug $debug)
     {
         $identityData = $user->model->attributes;
         if ($user->model instanceof CModel) {
diff --git a/src/Debug/Route/AbstractErrorRoute.php b/src/Debug/Route/AbstractErrorRoute.php
new file mode 100644
index 00000000..fdb4139b
--- /dev/null
+++ b/src/Debug/Route/AbstractErrorRoute.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * This file is part of PHPDebugConsole
+ *
+ * @package   PHPDebugConsole
+ * @author    Brad Kent <bkfake-github@yahoo.com>
+ * @license   http://opensource.org/licenses/MIT MIT
+ * @copyright 2014-2024 Brad Kent
+ * @version   v3.3
+ */
+
+namespace bdk\Debug\Route;
+
+use bdk\Debug;
+use bdk\ErrorHandler;
+use bdk\ErrorHandler\Error;
+
+/**
+ * common "shouldSend" method
+ */
+abstract class AbstractErrorRoute extends AbstractRoute
+{
+    protected $statsKey = '';
+
+    /**
+     * Constructor
+     *
+     * @param Debug $debug debug instance
+     */
+    public function __construct(Debug $debug)
+    {
+        parent::__construct($debug);
+        $this->cfg = \array_merge($this->cfg, array(
+            'errorMask' => E_ERROR | E_PARSE | E_COMPILE_ERROR | E_WARNING | E_USER_ERROR,
+        ));
+        $debug->errorHandler->setCfg('enableStats', true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubscriptions()
+    {
+        return array(
+            ErrorHandler::EVENT_ERROR => array('onError', -1),
+        );
+    }
+
+    /**
+     * ErrorHandler::EVENT_ERROR event subscriber
+     *
+     * @param Error $error error/event object
+     *
+     * @return void
+     */
+    public function onError(Error $error)
+    {
+        if ($this->shouldSend($error, $this->statsKey) === false) {
+            return;
+        }
+        $messages = $this->buildMessages($error);
+        $this->sendMessages($messages);
+    }
+
+    /**
+     * Build messages to send to client
+     *
+     * @param Error $error Error instance
+     *
+     * @return array
+     */
+    abstract protected function buildMessages(Error $error);
+
+    /**
+     * Send messages to client (ie Discord, Slack, or Teams)
+     *
+     * @param array $messages array of message(s) to send to client
+     *
+     * @return void
+     */
+    abstract protected function sendMessages(array $messages);
+
+    /**
+     * Should we send a notification for this error?
+     *
+     * @param Error  $error    Error instance
+     * @param string $statsKey name under which we store stats
+     *
+     * @return bool
+     */
+    private function shouldSend(Error $error, $statsKey)
+    {
+        if ($error['throw']) {
+            // subscriber that set throw *should have* stopped error propagation
+            return false;
+        }
+        if (($error['type'] & $this->cfg['errorMask']) !== $error['type']) {
+            return false;
+        }
+        if ($error['isFirstOccur'] === false) {
+            return false;
+        }
+        if ($error['inConsole']) {
+            return false;
+        }
+        $error['stats'] = \array_merge(array(
+            $statsKey => array(
+                'countSince' => 0,
+                'timestamp'  => null,
+            ),
+        ), $error['stats'] ?: array());
+        $tsCutoff = \time() - $this->cfg['throttleMin'] * 60;
+        if ($error['stats'][$statsKey]['timestamp'] > $tsCutoff) {
+            // This error was recently sent
+            $error['stats'][$statsKey]['countSince']++;
+            return false;
+        }
+        $error['stats'][$statsKey]['timestamp'] = \time();
+        return true;
+    }
+}
diff --git a/src/Debug/Route/Discord.php b/src/Debug/Route/Discord.php
index 290399a2..97635b64 100644
--- a/src/Debug/Route/Discord.php
+++ b/src/Debug/Route/Discord.php
@@ -14,7 +14,6 @@
 
 use bdk\CurlHttpMessage\Client as CurlHttpMessageClient;
 use bdk\Debug;
-use bdk\ErrorHandler;
 use bdk\ErrorHandler\Error;
 use RuntimeException;
 
@@ -25,10 +24,8 @@
  *
  * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
  */
-class Discord extends AbstractRoute
+class Discord extends AbstractErrorRoute
 {
-    use ErrorThrottleTrait;
-
     protected $cfg = array(
         'errorMask' => 0,
         'onClientInit' => null,
@@ -39,45 +36,17 @@ class Discord extends AbstractRoute
     /** @var CurlHttpMessageClient */
     protected $client;
 
+    protected $statsKey = 'discord';
+
     /**
-     * Constructor
-     *
-     * @param Debug $debug debug instance
+     * {@inheritDoc}
      */
     public function __construct(Debug $debug)
     {
         parent::__construct($debug);
         $this->cfg = \array_merge($this->cfg, array(
-            'errorMask' => E_ERROR | E_PARSE | E_COMPILE_ERROR | E_WARNING | E_USER_ERROR,
             'webhookUrl' => \getenv('DISCORD_WEBHOOK_URL'),
         ));
-        $debug->errorHandler->setCfg('enableStats', true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getSubscriptions()
-    {
-        return array(
-            ErrorHandler::EVENT_ERROR => array('onError', -1),
-        );
-    }
-
-    /**
-     * ErrorHandler::EVENT_ERROR event subscriber
-     *
-     * @param Error $error error/event object
-     *
-     * @return void
-     */
-    public function onError(Error $error)
-    {
-        if ($this->shouldSend($error, 'discord') === false) {
-            return;
-        }
-        $message = $this->buildMessage($error);
-        $this->sendMessage($message);
     }
 
     /**
@@ -101,23 +70,20 @@ private function assertCfg()
     }
 
     /**
-     * Build Discord error message(s)
-     *
-     * @param Error $error Error instance
-     *
-     * @return array
+     * {@inheritDoc}
      */
-    private function buildMessage(Error $error)
+    protected function buildMessages(Error $error)
     {
         $emoji = $error->isFatal()
             ? ':no_entry:'
             : ':warning:';
-        return array(
+        $message = array(
             'content' => $emoji . ' **' . $error['typeStr'] . '**' . "\n"
                 . $this->getRequestMethodUri() . "\n"
                 . $error->getMessageText() . "\n"
                 . $error['fileAndLine'],
         );
+        return array($message);
     }
 
     /**
@@ -139,7 +105,17 @@ protected function getClient()
     }
 
     /**
-     * Send message to Discord
+     * {@inheritDoc}
+     */
+    protected function sendMessages(array $messages)
+    {
+        foreach ($messages as $message) {
+            $this->sendMessage($message);
+        }
+    }
+
+    /**
+     * Send message
      *
      * @param array $message Discord message
      *
diff --git a/src/Debug/Route/ErrorThrottleTrait.php b/src/Debug/Route/ErrorThrottleTrait.php
deleted file mode 100644
index f1f104f9..00000000
--- a/src/Debug/Route/ErrorThrottleTrait.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * This file is part of PHPDebugConsole
- *
- * @package   PHPDebugConsole
- * @author    Brad Kent <bkfake-github@yahoo.com>
- * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2023 Brad Kent
- * @version   v3.1
- */
-
-namespace bdk\Debug\Route;
-
-use bdk\ErrorHandler\Error;
-
-/**
- * common "shouldSend" method
- */
-trait ErrorThrottleTrait
-{
-    /**
-     * Should we send a notification for this error?
-     *
-     * @param Error  $error    Error instance
-     * @param string $statsKey name under which we store stats
-     *
-     * @return bool
-     */
-    private function shouldSend(Error $error, $statsKey)
-    {
-        if ($error['throw']) {
-            // subscriber that set throw *should have* stopped error propagation
-            return false;
-        }
-        if (($error['type'] & $this->cfg['errorMask']) !== $error['type']) {
-            return false;
-        }
-        if ($error['isFirstOccur'] === false) {
-            return false;
-        }
-        if ($error['inConsole']) {
-            return false;
-        }
-        $error['stats'] = \array_merge(array(
-            $statsKey => array(
-                'countSince' => 0,
-                'timestamp'  => null,
-            ),
-        ), $error['stats'] ?: array());
-        $tsCutoff = \time() - $this->cfg['throttleMin'] * 60;
-        if ($error['stats'][$statsKey]['timestamp'] > $tsCutoff) {
-            // This error was recently sent
-            $error['stats'][$statsKey]['countSince']++;
-            return false;
-        }
-        $error['stats'][$statsKey]['timestamp'] = \time();
-        return true;
-    }
-}
diff --git a/src/Debug/Route/Html.php b/src/Debug/Route/Html.php
index 84955b59..dcd94584 100644
--- a/src/Debug/Route/Html.php
+++ b/src/Debug/Route/Html.php
@@ -235,15 +235,14 @@ private function buildOutput()
                 'linkFilesTemplateDefault' => $lftDefault ?: null,
                 'tooltip' => $this->cfg['tooltip'],
             ),
-        )) . ">\n";
-        $str .= $this->buildStyleTag();
-        $str .= $this->buildScriptTag();
-        $str .= $this->buildHeader();
-        if ($this->cfg['outputScript']) {
-            $str .= '<div class="loading">Loading <i class="fa fa-spinner fa-pulse fa-2x fa-fw" aria-hidden="true"></i></div>' . "\n";
-        }
-        $str .= $this->tabs->buildTabPanes();
-        $str .= '</div>' . "\n"; // close .debug
+        )) . ">\n"
+            . $this->buildStyleTag()
+            . $this->buildScriptTag()
+            . $this->buildHeader()
+            . $this->buildLoading()
+            . $this->tabs->buildTabPanes()
+            . '</div>' . "\n"; // close .debug
+
         $str = \preg_replace('#(<ul[^>]*>)\s+</ul>#', '$1</ul>', $str); // ugly, but want to be able to use :empty
         $str = \strtr($str, array(
             '{{channels}}' => \htmlspecialchars(\json_encode($this->buildChannelTree(), JSON_FORCE_OBJECT)),
@@ -262,17 +261,17 @@ protected function buildChannelTree()
         $channelRoot = \reset($channels)->rootInstance;
         \ksort($channels, SORT_NATURAL | SORT_FLAG_CASE);
         $tree = array();
-        foreach ($channels as $name => $channel) {
+        \array_walk($channels, static function (Debug $channel, $name) use ($channels, $channelRoot, &$tree) {
             $ref = &$tree;
             $path = \explode('.', $name);
             foreach ($path as $i => $k) {
+                // output may have only output general.foo
+                //   we still need general
+                $pathFq = \implode('.', \array_slice($path, 0, $i + 1));
+                $channel = isset($channels[$pathFq])
+                    ? $channels[$pathFq]
+                    : $channelRoot->getChannel($pathFq);
                 if (!isset($ref[$k])) {
-                    // output may have only output general.foo
-                    //   we still need general
-                    $pathFq = \implode('.', \array_slice($path, 0, $i + 1));
-                    $channel = isset($channels[$pathFq])
-                        ? $channels[$pathFq]
-                        : $channelRoot->getChannel($pathFq);
                     $ref[$k] = array(
                         'channels' => array(),
                         'options' => array(
@@ -283,7 +282,7 @@ protected function buildChannelTree()
                 }
                 $ref = &$ref[$k]['channels'];
             }
-        }
+        });
         return $tree;
     }
 
@@ -302,6 +301,18 @@ private function buildHeader()
             . '</header>' . "\n";
     }
 
+    /**
+     * Build "loading" spinner
+     *
+     * @return string
+     */
+    private function buildLoading()
+    {
+        return $this->cfg['outputScript']
+            ? '<div class="loading">Loading <i class="fa fa-spinner fa-pulse fa-2x fa-fw" aria-hidden="true"></i></div>' . "\n"
+            : '';
+    }
+
     /**
      * Build <script> tag
      *
diff --git a/src/Debug/Route/Slack.php b/src/Debug/Route/Slack.php
index 8bd5c66d..3089184a 100644
--- a/src/Debug/Route/Slack.php
+++ b/src/Debug/Route/Slack.php
@@ -13,7 +13,6 @@
 namespace bdk\Debug\Route;
 
 use bdk\Debug;
-use bdk\ErrorHandler;
 use bdk\ErrorHandler\Error;
 use bdk\Slack\SlackApi;
 use bdk\Slack\SlackMessage;
@@ -25,10 +24,8 @@
  *
  * Not so much a route as a plugin (we only listen for errors)
  */
-class Slack extends AbstractRoute
+class Slack extends AbstractErrorRoute
 {
-    use ErrorThrottleTrait;
-
     protected $cfg = array(
         'channel' => null, // default pulled from SLACK_CHANNEL env var
         'errorMask' => 0,
@@ -42,47 +39,19 @@ class Slack extends AbstractRoute
     /** @var SlackApi|SlackWebhook */
     protected $slackClient;
 
+    protected $statsKey = 'slack';
+
     /**
-     * Constructor
-     *
-     * @param Debug $debug debug instance
+     * {@inheritDoc}
      */
     public function __construct(Debug $debug)
     {
         parent::__construct($debug);
         $this->cfg = \array_merge($this->cfg, array(
             'channel' => \getenv('SLACK_CHANNEL'),
-            'errorMask' => E_ERROR | E_PARSE | E_COMPILE_ERROR | E_WARNING | E_USER_ERROR,
             'token' => \getenv('SLACK_TOKEN'),
             'webhookUrl' => \getenv('SLACK_WEBHOOK_URL'),
         ));
-        $debug->errorHandler->setCfg('enableStats', true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getSubscriptions()
-    {
-        return array(
-            ErrorHandler::EVENT_ERROR => array('onError', -1),
-        );
-    }
-
-    /**
-     * ErrorHandler::EVENT_ERROR event subscriber
-     *
-     * @param Error $error error/event object
-     *
-     * @return void
-     */
-    public function onError(Error $error)
-    {
-        if ($this->shouldSend($error, 'slack') === false) {
-            return;
-        }
-        $messages = $this->buildMessages($error);
-        $this->sendMessages($messages);
     }
 
     /**
@@ -126,12 +95,7 @@ protected function getClient()
         }
         $this->assertCfg();
         $use = $this->cfg['use'];
-        if ($use === 'auto') {
-            $use = $this->cfg['token'] && $this->cfg['channel']
-                ? 'api'
-                : 'webhook';
-        }
-        $this->slackClient = $use === 'api'
+        $this->slackClient = $use === 'api' || ($use === 'auto' && $this->cfg['token'] && $this->cfg['channel'])
             ? new SlackApi($this->cfg['token'])
             : new SlackWebhook($this->cfg['webhookUrl']);
         if (\is_callable($this->cfg['onClientInit'])) {
@@ -141,13 +105,9 @@ protected function getClient()
     }
 
     /**
-     * Build Slack error message(s)
-     *
-     * @param Error $error Error instance
-     *
-     * @return SlackMessage[]
+     * {@inheritDoc}
      */
-    private function buildMessages(Error $error)
+    protected function buildMessages(Error $error)
     {
         $messages = array();
         $icon = $error->isFatal()
@@ -199,11 +159,7 @@ private function buildMessageBacktrace(Error $error)
     }
 
     /**
-     * Send message(s) to Slack
-     *
-     * @param SlackMessage[] $messages Slack messages
-     *
-     * @return void
+     * {@inheritDoc}
      */
     protected function sendMessages(array $messages)
     {
diff --git a/src/Debug/Route/Teams.php b/src/Debug/Route/Teams.php
index 4bf3bcd0..471ede58 100644
--- a/src/Debug/Route/Teams.php
+++ b/src/Debug/Route/Teams.php
@@ -13,7 +13,6 @@
 namespace bdk\Debug\Route;
 
 use bdk\Debug;
-use bdk\ErrorHandler;
 use bdk\ErrorHandler\Error;
 use bdk\Teams\Cards\AdaptiveCard;
 use bdk\Teams\Cards\CardInterface;
@@ -30,10 +29,8 @@
  *
  * Not so much a route as a plugin (we only listen for errors)
  */
-class Teams extends AbstractRoute
+class Teams extends AbstractErrorRoute
 {
-    use ErrorThrottleTrait;
-
     protected $cfg = array(
         'errorMask' => 0,
         'onClientInit' => null,
@@ -44,45 +41,17 @@ class Teams extends AbstractRoute
     /** @var TeamsWebhook */
     protected $teamsClient;
 
+    protected $statsKey = 'teams';
+
     /**
-     * Constructor
-     *
-     * @param Debug $debug debug instance
+     * {@inheritDoc}
      */
     public function __construct(Debug $debug)
     {
         parent::__construct($debug);
         $this->cfg = \array_merge($this->cfg, array(
-            'errorMask' => E_ERROR | E_PARSE | E_COMPILE_ERROR | E_WARNING | E_USER_ERROR,
             'webhookUrl' => \getenv('TEAMS_WEBHOOK_URL'),
         ));
-        $debug->errorHandler->setCfg('enableStats', true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getSubscriptions()
-    {
-        return array(
-            ErrorHandler::EVENT_ERROR => array('onError', -1),
-        );
-    }
-
-    /**
-     * ErrorHandler::EVENT_ERROR event subscriber
-     *
-     * @param Error $error error/event object
-     *
-     * @return void
-     */
-    public function onError(Error $error)
-    {
-        if ($this->shouldSend($error, 'teams') === false) {
-            return;
-        }
-        $card = $this->buildMessage($error);
-        $this->sendMessage($card);
     }
 
     /**
@@ -137,30 +106,22 @@ private function buildBacktraceTable(Error $error)
     }
 
     /**
-     * Build Teams error message
-     *
-     * @param Error $error Error instance
-     *
-     * @return CardInterface
+     * {@inheritDoc}
      */
-    private function buildMessage(Error $error)
+    protected function buildMessages(Error $error)
     {
         $icon = $error->isFatal()
             ? '🚫'
             : '⚠';
         $card = (new AdaptiveCard())
             ->withAddedElement(
-                (new TeamsTextBlock($icon . ' ' . $error['typeStr']))
-                    ->withStyle(Enums::TEXTBLOCK_STYLE_HEADING)
+                (new TeamsTextBlock($icon . ' ' . $error['typeStr']))->withStyle(Enums::TEXTBLOCK_STYLE_HEADING)
             )
             ->withAddedElement(
-                (new TeamsTextBlock(
-                    $this->getRequestMethodUri()
-                ))->withIsSubtle()
+                (new TeamsTextBlock($this->getRequestMethodUri()))->withIsSubtle()
             )
             ->withAddedElement(
-                (new TeamsTextBlock($error->getMessageText()))
-                    ->withWrap()
+                (new TeamsTextBlock($error->getMessageText()))->withWrap()
             )
             ->withAddedElement(
                 new FactSet(array(
@@ -169,11 +130,9 @@ private function buildMessage(Error $error)
                 ))
             );
         if ($error->isFatal() && $error['backtrace']) {
-            $card = $card->withAddedElement(
-                $this->buildBacktraceTable($error)
-            );
+            $card = $card->withAddedElement($this->buildBacktraceTable($error));
         }
-        return $card;
+        return array($card);
     }
 
     /**
@@ -194,6 +153,16 @@ protected function getClient()
         return $this->teamsClient;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected function sendMessages(array $messages)
+    {
+        foreach ($messages as $message) {
+            $this->sendMessage($message);
+        }
+    }
+
     /**
      * Send message to Teams
      *
diff --git a/src/Debug/Utility/Html.php b/src/Debug/Utility/Html.php
index a1f9b9a3..20be6483 100644
--- a/src/Debug/Utility/Html.php
+++ b/src/Debug/Utility/Html.php
@@ -6,7 +6,7 @@
  * @package   PHPDebugConsole
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2022 Brad Kent
+ * @copyright 2014-2024 Brad Kent
  * @version   v3.0
  */
 
@@ -31,12 +31,17 @@ class Html
      *
      * @var array
      */
-    public static $htmlEmptyTags = array('area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr');
+    public static $htmlEmptyTags = array(
+        'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr',
+    );
 
     /**
-     * Used by parseAttribString
+     * The presence of these attributes = true / abscence = false
+     * value not necessary, but may be written as key="key"  (ie autofocus="autofocus" )
      *
      * @var array
+     *
+     * @link https://developer.mozilla.org/en-US/docs/Glossary/Boolean/HTML
      */
     public static $htmlBoolAttr = array(
         // GLOBAL
@@ -76,9 +81,11 @@ class Html
      * @var array
      */
     public static $htmlBoolAttrEnum = array(
-        'autocapitalize', // on|off  (along with other values)
-        'autocomplete', // on|off
+        'autocapitalize', // on|off (other values also accepted)
+        'autocomplete', // on|off (other values also accepted)
         'translate', // yes|no
+
+        // "true"/"false" :
         'aria-checked', 'aria-expanded', 'aria-grabbed', 'aria-hidden', 'aria-pressed', 'aria-selected',
         'contenteditable', 'draggable', 'spellcheck',
     );
@@ -106,7 +113,7 @@ public static function buildAttribString($attribs)
         $attribPairs = array();
         foreach ($attribs as $name => $value) {
             // buildAttribNameValue updates $name by reference
-            $nameVal = static::buildAttribNameValue($name, $value);
+            $nameVal = HtmlBuild::buildAttribNameValue($name, $value);
             $attribPairs[$name] = $nameVal;
         }
         $attribPairs = \array_filter($attribPairs, 'strlen');
@@ -160,7 +167,7 @@ public static function parseAttribString($str, $options = null)
         $names = \array_map('strtolower', $matches[1]);
         $values = \array_replace($matches[3], \array_filter($matches[4], 'strlen'));
         foreach ($names as $i => $name) {
-            $attribs[$name] = self::parseAttribValue($name, $values[$i], $options);
+            $attribs[$name] = HtmlParse::parseAttribValue($name, $values[$i], $options);
         }
         \ksort($attribs);
         return $attribs;
@@ -222,270 +229,4 @@ public static function sanitizeId($id)
         $id = \preg_replace('/_+/', '_', $id);
         return $id;
     }
-
-    /**
-     * Buile name="value"
-     *
-     * @param string $name  Attribute name
-     * @param mixed  $value Attribute value
-     *
-     * @return string
-     */
-    private static function buildAttribNameValue(&$name, $value)
-    {
-        // buildAttribVal updates $name by reference
-        $value = self::buildAttribVal($name, $value);
-        if ($value === null) {
-            return '';
-        }
-        if ($value === '' && \in_array($name, array('class', 'style'), true)) {
-            return '';
-        }
-        return $name . '="' . \htmlspecialchars($value) . '"';
-    }
-
-    /**
-     * Converts attribute value to string
-     *
-     * @param string $key key
-     * @param mixed  $val value
-     *
-     * @return string|null
-     */
-    private static function buildAttribVal(&$key, $val)
-    {
-        if (\is_int($key)) {
-            $key = $val;
-            $val = true;
-        }
-        $key = \strtolower($key);
-        if ($key === 'id') {
-            return static::sanitizeId($val);
-        }
-        switch (static::buildAttribValType($key, $val)) {
-            case 'class':
-                return static::buildAttribValClass($val);
-            case 'data':
-                return \is_string($val)
-                    ? $val
-                    : \json_encode($val);
-            case 'valArray':
-                return static::buildAttribValArray($key, $val);
-            case 'valBool':
-                return static::buildAttribValBool($key, $val);
-            case 'valNull':
-                return null;
-            default:
-                return \trim($val);
-        }
-    }
-
-    /**
-     * Determine the type of attribute being updated
-     *
-     * @param string $name Attribute name
-     * @param mixed  $val  Attribute value
-     *
-     * @return string 'class', data', 'valArray', valBool', or 'valNull'
-     */
-    private static function buildAttribValType($name, $val)
-    {
-        if (\substr($name, 0, 5) === 'data-') {
-            return 'data';
-        }
-        if ($val === null) {
-            return 'valNull';
-        }
-        if (\is_bool($val)) {
-            return 'valBool';
-        }
-        if ($name === 'class') {
-            return 'class';
-        }
-        if (\is_array($val)) {
-            return 'valArray';
-        }
-        return 'string';
-    }
-
-    /**
-     * Convert array attribute value to string
-     *
-     * This function is not meant for data attributs
-     *
-     * @param string $key    attribute name ("style")
-     * @param array  $values key/value for style
-     *
-     * @return string|null
-     */
-    private static function buildAttribValArray($key, $values = array())
-    {
-        if ($key === 'style') {
-            $keyValues = array();
-            foreach ($values as $key => $val) {
-                $keyValues[] = $key . ':' . $val . ';';
-            }
-            \sort($keyValues);
-            return \implode('', $keyValues);
-        }
-        return null;
-    }
-
-    /**
-     * Convert boolean attribute value to string
-     *
-     * @param string $key   attribute name
-     * @param bool   $value true|false
-     *
-     * @return string|null
-     */
-    private static function buildAttribValBool($key, $value = true)
-    {
-        $enumValues = array(
-            'autocapitalize' => array('on','off'), // also takes other values (sentences, words, characters)
-            'autocomplete' => array('on','off'), // autocomplete also takes other values...
-            'translate' => array('yes','no'),
-        );
-        if (isset($enumValues[$key])) {
-            return $value
-                ? $enumValues[$key][0]
-                : $enumValues[$key][1];
-        }
-        if (\in_array($key, self::$htmlBoolAttrEnum, true)) {
-            // "true" or "false"
-            return \json_encode($value);
-        }
-        return $value
-            ? $key // even if not a recognized boolean attribute
-            : null;
-    }
-
-    /**
-     * Build class attribute value
-     * May pass
-     *   string:  'foo bar'
-     *   array:  [
-     *      'foo',
-     *      'bar' => true,
-     *      'notIncl' => false,
-     *      'key' => 'classValue',
-     *   ]
-     *
-     * @param string|array $values Class values.  May be array or space-separated string
-     *
-     * @return string
-     */
-    private static function buildAttribValClass($values)
-    {
-        if (\is_array($values) === false) {
-            $values = \explode(' ', $values);
-        }
-        $values = \array_map(static function ($key, $val) {
-            return \is_bool($val)
-                ? ($val ?  $key : null)
-                : $val;
-        }, \array_keys($values), $values);
-        // only interested in unique, non-empty values
-        $values = \array_filter(\array_unique($values));
-        \sort($values);
-        return \implode(' ', $values);
-    }
-
-    /**
-     * Parse attribute value
-     *
-     * @param string $name    attribute name
-     * @param string $val     value (assumed to be htmlspecialchar'd)
-     * @param int    $options bitmask of self::PARSE_ATTRIB_x FLAGS
-     *
-     * @return mixed
-     */
-    private static function parseAttribValue($name, $val, $options)
-    {
-        $val = \htmlspecialchars_decode($val);
-        if ($name === 'class') {
-            return self::parseAttribClass($val, $options & self::PARSE_ATTRIB_CLASS);
-        }
-        if (\substr($name, 0, 5) === 'data-') {
-            return self::parseAttribData($val, $options & self::PARSE_ATTRIB_DATA);
-        }
-        if (\in_array($name, self::$htmlBoolAttr, true)) {
-            return true;
-        }
-        if (\in_array($name, self::$htmlBoolAttrEnum, true)) {
-            return self::parseAttribBoolEnum($val);
-        }
-        if (\is_numeric($val)) {
-            return self::parseAttribNumeric($val, $options & self::PARSE_ATTRIB_NUMERIC);
-        }
-        return $val;
-    }
-
-    /**
-     * Convert bool enum attribute value to bool
-     *
-     * @param string $val enum attribute value
-     *
-     * @return bool
-     */
-    private static function parseAttribBoolEnum($val)
-    {
-        $parsed = \filter_var(\strtolower($val), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
-        return $parsed !== null
-            ? $parsed
-            : $val;
-    }
-
-    /**
-     * Convert class attribute value to array of classes
-     *
-     * @param string $val    attribute value to decode
-     * @param bool   $decode whether to decode
-     *
-     * @return array|string
-     */
-    private static function parseAttribClass($val, $decode)
-    {
-        if (!$decode) {
-            return $val;
-        }
-        $classes = \explode(' ', $val);
-        \sort($classes);
-        return \array_unique($classes);
-    }
-
-    /**
-     * Json decode data-xxx attribute
-     *
-     * @param string $val    attribute value to decode
-     * @param bool   $decode whether to decode
-     *
-     * @return mixed
-     */
-    private static function parseAttribData($val, $decode)
-    {
-        if (!$decode) {
-            return $val;
-        }
-        $decoded = \json_decode((string) $val, true);
-        if ($decoded === null && $val !== 'null') {
-            $decoded = \json_decode('"' . $val . '"', true);
-        }
-        return $decoded;
-    }
-
-    /**
-     * Convert numeric attribute value to float/int
-     *
-     * @param string $val    enum attribute value
-     * @param bool   $decode whether to decode
-     *
-     * @return string|float|int
-     */
-    private static function parseAttribNumeric($val, $decode)
-    {
-        return $decode
-            ? \json_decode($val)
-            : $val;
-    }
 }
diff --git a/src/Debug/Utility/HtmlBuild.php b/src/Debug/Utility/HtmlBuild.php
new file mode 100644
index 00000000..d31f51ec
--- /dev/null
+++ b/src/Debug/Utility/HtmlBuild.php
@@ -0,0 +1,185 @@
+<?php
+
+/**
+ * This file is part of PHPDebugConsole
+ *
+ * @package   PHPDebugConsole
+ * @author    Brad Kent <bkfake-github@yahoo.com>
+ * @license   http://opensource.org/licenses/MIT MIT
+ * @copyright 2014-2024 Brad Kent
+ * @version   v3.3
+ */
+
+namespace bdk\Debug\Utility;
+
+/**
+ * Html utilities
+ */
+class HtmlBuild
+{
+    /**
+     * Build name="value"
+     *
+     * @param string $name  Attribute name
+     * @param mixed  $value Attribute value
+     *
+     * @return string
+     */
+    public static function buildAttribNameValue(&$name, $value)
+    {
+        if (\is_int($name)) {
+            $name = $value;
+            $value = true;
+        }
+        $name = \strtolower($name);
+        $value = self::buildAttribVal($name, $value);
+        if ($value === null) {
+            return '';
+        }
+        if ($value === '' && \in_array($name, array('class', 'style'), true)) {
+            return '';
+        }
+        return $name . '="' . \htmlspecialchars($value) . '"';
+    }
+
+    /**
+     * Converts attribute value to string
+     *
+     * @param string $name Attribute name
+     * @param mixed  $val  Attribute value
+     *
+     * @return string|null
+     */
+    private static function buildAttribVal($name, $val)
+    {
+        switch (static::getType($name, $val)) {
+            case 'array':
+                return static::buildAttribValArray($name, $val);
+            case 'bool':
+                return static::buildAttribValBool($name, $val);
+            case 'class':
+                return static::buildAttribValClass($val);
+            case 'data':
+                return \is_string($val)
+                    ? $val
+                    : \json_encode($val);
+            case 'id':
+				return Html::sanitizeId($val);
+            case 'null':
+                return null;
+            default:
+                return \trim($val);
+        }
+    }
+
+    /**
+     * Convert array attribute value to string
+     *
+     * This function is not meant for data attributs
+     *
+     * @param string $name   attribute name ("style")
+     * @param array  $values key/value for style
+     *
+     * @return string|null
+     */
+    private static function buildAttribValArray($name, $values = array())
+    {
+        if ($name === 'style') {
+            $keyValues = array();
+            foreach ($values as $key => $val) {
+                $keyValues[] = $key . ':' . $val . ';';
+            }
+            \sort($keyValues);
+            return \implode('', $keyValues);
+        }
+        return null;
+    }
+
+    /**
+     * Convert boolean attribute value to string
+     *
+     * @param string $name  Attribute name
+     * @param bool   $value true|false
+     *
+     * @return string|null
+     */
+    private static function buildAttribValBool($name, $value = true)
+    {
+        $enumValues = array(
+            'autocapitalize' => array('on','off'), // also takes other values (sentences, words, characters)
+            'autocomplete' => array('on','off'), // other values also accepted
+            'translate' => array('yes','no'),
+        );
+        if (isset($enumValues[$name])) {
+            return $value
+                ? $enumValues[$name][0]
+                : $enumValues[$name][1];
+        }
+        if (\in_array($name, Html::$htmlBoolAttrEnum, true)) {
+            // "true" or "false"
+            return \json_encode($value);
+        }
+        return $value
+            ? $name // even if not a recognized boolean attribute
+            : null; // null = attribute won't be output
+    }
+
+    /**
+     * Build class attribute value
+     * May pass
+     *   string:  'foo bar'
+     *   array:  [
+     *      'foo',
+     *      'bar' => true,
+     *      'notIncl' => false,
+     *      'key' => 'classValue',
+     *   ]
+     *
+     * @param string|array $values Class values.  May be array or space-separated string
+     *
+     * @return string
+     */
+    private static function buildAttribValClass($values)
+    {
+        if (\is_array($values) === false) {
+            $values = \explode(' ', $values);
+        }
+        $values = \array_map(static function ($key, $val) {
+            return \is_bool($val)
+                ? ($val ?  $key : null)
+                : $val;
+        }, \array_keys($values), $values);
+        // only interested in unique, non-empty values
+        $values = \array_filter(\array_unique($values));
+        \sort($values);
+        return \implode(' ', $values);
+    }
+
+    /**
+     * Determine the type of attribute being updated
+     *
+     * @param string $name Attribute name
+     * @param mixed  $val  Attribute value
+     *
+     * @return string 'class', data', 'array', 'bool', 'string', or 'null'
+     */
+    private static function getType($name, $val)
+    {
+        if (\substr($name, 0, 5) === 'data-') {
+            return 'data';
+        }
+        if ($val === null) {
+            return 'null';
+        }
+        if (\in_array($name, array('class', 'id'), true)) {
+            return $name;
+        }
+        if (\is_bool($val)) {
+            return 'bool';
+        }
+        if (\is_array($val)) {
+            return 'array';
+        }
+        return 'string';
+    }
+}
diff --git a/src/Debug/Utility/HtmlParse.php b/src/Debug/Utility/HtmlParse.php
new file mode 100644
index 00000000..70258b01
--- /dev/null
+++ b/src/Debug/Utility/HtmlParse.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of PHPDebugConsole
+ *
+ * @package   PHPDebugConsole
+ * @author    Brad Kent <bkfake-github@yahoo.com>
+ * @license   http://opensource.org/licenses/MIT MIT
+ * @copyright 2014-2024 Brad Kent
+ * @version   v3.3
+ */
+
+namespace bdk\Debug\Utility;
+
+/**
+ * Html utilities
+ */
+class HtmlParse
+{
+    /**
+     * Parse attribute value
+     *
+     * @param string $name    attribute name
+     * @param string $val     value (assumed to be htmlspecialchar'd)
+     * @param int    $options bitmask of Html::PARSE_ATTRIB_x FLAGS
+     *
+     * @return mixed
+     */
+    public static function parseAttribValue($name, $val, $options)
+    {
+        $val = \htmlspecialchars_decode($val);
+        if ($name === 'class') {
+        	$decode = (bool) ($options & Html::PARSE_ATTRIB_CLASS);
+            return self::parseAttribClass($val, $decode);
+        }
+        if (\substr($name, 0, 5) === 'data-') {
+        	$decode = (bool) ($options & Html::PARSE_ATTRIB_DATA);
+            return self::parseAttribData($val, $decode);
+        }
+        if (\in_array($name, Html::$htmlBoolAttr, true)) {
+            return true;
+        }
+        if (\in_array($name, Html::$htmlBoolAttrEnum, true)) {
+            return self::parseAttribBoolEnum($val);
+        }
+        if (\is_numeric($val)) {
+        	$decode = (bool) ($options & Html::PARSE_ATTRIB_NUMERIC);
+            return self::parseAttribNumeric($val, $decode);
+        }
+        return $val;
+    }
+
+    /**
+     * Convert bool enum attribute value to bool
+     *
+     * @param string $val enum attribute value
+     *
+     * @return bool
+     */
+    private static function parseAttribBoolEnum($val)
+    {
+        $parsed = \filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+        return $parsed !== null
+            ? $parsed
+            : $val;
+    }
+
+    /**
+     * Convert class attribute value to array of classes
+     *
+     * @param string $val     attribute value to decode
+     * @param bool   $asArray whether to return array
+     *
+     * @return array|string
+     */
+    private static function parseAttribClass($val, $asArray)
+    {
+        if (!$asArray) {
+            return $val;
+        }
+        $classes = \explode(' ', $val);
+        \sort($classes);
+        return \array_unique($classes);
+    }
+
+    /**
+     * Json decode data-xxx attribute
+     *
+     * @param string $val    attribute value to decode
+     * @param bool   $decode whether to decode
+     *
+     * @return mixed
+     */
+    private static function parseAttribData($val, $decode)
+    {
+        if (!$decode) {
+            return $val;
+        }
+        $decoded = \json_decode((string) $val, true);
+        if ($decoded === null && $val !== 'null') {
+            $decoded = \json_decode('"' . $val . '"', true);
+        }
+        return $decoded;
+    }
+
+    /**
+     * Convert numeric attribute value to float/int
+     *
+     * @param string $val    enum attribute value
+     * @param bool   $decode whether to decode (convert to int/float)
+     *
+     * @return string|float|int
+     */
+    private static function parseAttribNumeric($val, $decode)
+    {
+        return $decode
+            ? \json_decode($val)
+            : $val;
+    }
+}
diff --git a/src/Debug/Utility/PhpDoc/Parsers.php b/src/Debug/Utility/PhpDoc/Parsers.php
index 9016359b..fac7e949 100644
--- a/src/Debug/Utility/PhpDoc/Parsers.php
+++ b/src/Debug/Utility/PhpDoc/Parsers.php
@@ -74,61 +74,120 @@ protected function setParsers() // phpcs:ignore SlevomatCodingStandard.Functions
                 'parts' => array('type', 'name', 'desc'),
                 'tags' => array('param', 'property', 'property-read', 'property-write', 'var'),
             ),
-            array(
-                'callable' => array(
-                    $this->parseMethod,
-                ),
-                'parts' => array('static', 'type', 'name', 'param', 'desc'),
-                'regex' => '/'
-                    . '(?:(?P<static>static)\s+)?'
-                    . '(?:(?P<type>.*?)\s+)?'
-                    . '(?P<name>\S+)'
-                    . '\((?P<param>((?>[^()]+)|(?R))*)\)'  // see http://php.net/manual/en/regexp.reference.recursive.php
-                    . '(?:\s+(?P<desc>.*))?'
-                    . '/s',
-                'tags' => array('method'),
-            ),
-            array(
-                'callable' => array(
-                    array($this->helper, 'extractTypeFromBody'),
-                    static function (array $parsed, array $info) {
-                        $parsed['type'] = $info['phpDoc']->type->normalize($parsed['type'], $info['className'], $info['fullyQualifyType']);
-                        return $parsed;
-                    },
-                ),
-                'parts' => array('type', 'desc'),
-                'regex' => '/^(?P<type>.*?)'
-                    . '(?:\s+(?P<desc>.*))?$/s',
-                'tags' => array('return', 'throws'),
-            ),
-            array(
-                'parts' => array('name', 'email', 'desc'),
-                'regex' => '/^(?P<name>[^<]+)'
-                    . '(?:\s+<(?P<email>\S*)>)?'
-                    . '(?:\s+(?P<desc>.*))?' // desc isn't part of the standard
-                    . '$/s',
-                'tags' => array('author'),
-            ),
-            array(
-                'parts' => array('uri', 'desc'),
-                'regex' => '/^(?P<uri>\S+)'
-                    . '(?:\s+(?P<desc>.*))?$/s',
-                'tags' => array('link'),
-            ),
-            array(
-                'parts' => array('uri', 'fqsen', 'desc'),
-                'regex' => '/^(?:'
-                    . '(?P<uri>https?:\/\/\S+)|(?P<fqsen>\S+)'
-                    . ')'
-                    . '(?:\s+(?P<desc>.*))?$/s',
-                'tags' => array('see'),
+            $this->parserReturnThrows(),
+            $this->parserMethod(),
+            $this->parserAuthor(),
+            $this->parserLink(),
+            $this->parserSee(),
+            $this->parserDefault(),
+        );
+    }
+
+    /**
+     * Parser "definition" for @author tag
+     *
+     * @return array
+     */
+    private function parserAuthor()
+    {
+        return array(
+            'parts' => array('name', 'email', 'desc'),
+            'regex' => '/^(?P<name>[^<]+)'
+                . '(?:\s+<(?P<email>\S*)>)?'
+                . '(?:\s+(?P<desc>.*))?' // desc isn't part of the standard
+                . '$/s',
+            'tags' => array('author'),
+        );
+    }
+
+    /**
+     * Default parser "definition"
+     *
+     * @return array
+     */
+    private function parserDefault()
+    {
+        return array(
+            'parts' => array('desc'),
+            'regex' => '/^(?P<desc>.*?)$/s',
+            'tags' => array(),
+        );
+    }
+
+    /**
+     * Parser "definition" for @link tag
+     *
+     * @return array
+     */
+    private function parserLink()
+    {
+        return array(
+            'parts' => array('uri', 'desc'),
+            'regex' => '/^(?P<uri>\S+)'
+                . '(?:\s+(?P<desc>.*))?$/s',
+            'tags' => array('link'),
+        );
+    }
+
+    /**
+     * Parser "definition" for @method tag
+     *
+     * @return array
+     */
+    private function parserMethod()
+    {
+        return array(
+            'callable' => array(
+                $this->parseMethod,
             ),
-            array(
-                // default
-                'parts' => array('desc'),
-                'regex' => '/^(?P<desc>.*?)$/s',
-                'tags' => array(),
+            'parts' => array('static', 'type', 'name', 'param', 'desc'),
+            'regex' => '/'
+                . '(?:(?P<static>static)\s+)?'
+                . '(?:(?P<type>.*?)\s+)?'
+                . '(?P<name>\S+)'
+                . '\((?P<param>((?>[^()]+)|(?R))*)\)'  // see http://php.net/manual/en/regexp.reference.recursive.php
+                . '(?:\s+(?P<desc>.*))?'
+                . '/s',
+            'tags' => array('method'),
+        );
+    }
+
+    /**
+     * Parser "definition" for @return & @throws tags
+     *
+     * @return array
+     */
+    private function parserReturnThrows()
+    {
+        return array(
+            'callable' => array(
+                array($this->helper, 'extractTypeFromBody'),
+                static function (array $parsed, array $info) {
+                    $parsed['type'] = $info['phpDoc']->type->normalize($parsed['type'], $info['className'], $info['fullyQualifyType']);
+                    return $parsed;
+                },
             ),
+            'parts' => array('type', 'desc'),
+            'regex' => '/^(?P<type>.*?)'
+                . '(?:\s+(?P<desc>.*))?$/s',
+            'tags' => array('return', 'throws'),
+        );
+    }
+
+    /**
+     * Parser "definition" for @see tag
+     *
+     * @return array
+     */
+    private function parserSee()
+    {
+        return array(
+            'parts' => array('uri', 'fqsen', 'desc'),
+            'regex' => '/^(?:'
+                . '(?P<uri>https?:\/\/\S+)|(?P<fqsen>\S+)'
+                . ')'
+                . '(?:\s+(?P<desc>.*))?$/s',
+            'tags' => array('see'),
         );
     }
 }
diff --git a/src/HttpMessage/Utility/Uri.php b/src/HttpMessage/Utility/Uri.php
index d8182af9..c47d4482 100644
--- a/src/HttpMessage/Utility/Uri.php
+++ b/src/HttpMessage/Utility/Uri.php
@@ -76,12 +76,28 @@ public static function resolve(UriInterface $base, UriInterface $rel)
     /**
      * Parse URL (multi-byte safe)
      *
-     * @param string $url The URL to parse.
+     * @param string|UriInterface $url The URL to parse.
      *
      * @return array|false
      */
     public static function parseUrl($url)
     {
+        if ($url instanceof UriInterface) {
+            $userInfo = \array_replace(array(null, null), \explode(':', $url->getUserInfo(), 2));
+            // @phpcs:ignore SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
+            return \array_filter(array(
+                'scheme' => $url->getScheme(),
+                'host' => $url->getHost(),
+                'port' => $url->getPort(),
+                'user' => $userInfo[0],
+                'pass' => $userInfo[1],
+                'path' => $url->getPath(),
+                'query' => $url->getQuery(),
+                'fragment' => $url->getFragment(),
+            ), static function ($val) {
+                return !empty($val);
+            });
+        }
         // reserved chars
         $chars = '!*\'();:@&=$,/?#[]';
         $entities = \str_split(\urlencode($chars), 3);
@@ -146,7 +162,7 @@ private static function parseUrlPatched($url)
      *
      * @return array
      */
-    private static function parseUrlAddEmpty($parts, $url)
+    private static function parseUrlAddEmpty(array $parts, $url)
     {
         // @phpcs:ignore SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
         $default = array(
diff --git a/src/Slack/AbstractBlockFactory.php b/src/Slack/AbstractBlockFactory.php
index 2ccd6d99..af14a0b1 100644
--- a/src/Slack/AbstractBlockFactory.php
+++ b/src/Slack/AbstractBlockFactory.php
@@ -168,8 +168,10 @@ protected static function removeNull(array $values)
         if (isset($values['focus_on_load']) && $values['focus_on_load'] === false) {
             unset($values['focus_on_load']);
         }
-        return \array_filter($values, static function ($value) {
+        $values = \array_filter($values, static function ($value) {
             return $value !== null;
         });
+        \ksort($values);
+        return $values;
     }
 }
diff --git a/src/Slack/BlockElementsFactory.php b/src/Slack/BlockElementsFactory.php
index e8b2d1ab..c0963060 100644
--- a/src/Slack/BlockElementsFactory.php
+++ b/src/Slack/BlockElementsFactory.php
@@ -70,16 +70,7 @@ public static function button($actionId, $label, $value = null, $values = array(
      */
     public static function checkboxes($actionId, $options, $values = array())
     {
-        $block = \array_merge(array(
-            'action_id' => (string) $actionId,
-            'confirm' => null,
-            'focus_on_load' => false,
-            'initial_options' => null,
-            'options' => self::normalizeOptions($options, 10, 'checkboxes'),
-            'type' => 'checkboxes',
-        ), $values);
-        $block = self::renameDefault($block, 'initial_options');
-        return self::removeNull($block);
+        return self::checkboxesRadio($actionId, $options, $values, 'checkboxes');
     }
 
     /**
@@ -209,16 +200,7 @@ public static function overflow($actionId, array $options, $values = array())
      */
     public static function radio($actionId, $options, $values = array())
     {
-        $block = \array_merge(array(
-            'action_id' => (string) $actionId,
-            'confirm' => null,
-            'focus_on_load' => false,
-            'initial_option' => null,
-            'options' => self::normalizeOptions($options, 10, 'radio_buttons'),
-            'type' => 'radio_buttons',
-        ), $values);
-        $block = self::renameDefault($block, 'initial_option');
-        return self::removeNull($block);
+        return self::checkboxesRadio($actionId, $options, $values, 'radio_buttons');
     }
 
     /**
@@ -333,6 +315,33 @@ public static function url($actionId, $values = array())
         return self::removeNull($block);
     }
 
+    /**
+     * Create a checkbox or radio  group
+     *
+     * @param string $actionId ActionId
+     * @param string $options  Selectable options
+     * @param array  $values   Attributes
+     * @param string $what     "checkboxes" or "radio_buttons"
+     *
+     * @return array<string,mixed>
+     */
+    private static function checkboxesRadio($actionId, $options, $values, $what)
+    {
+        $initialOptionKey = $what === 'checkboxes'
+            ? 'initial_options'
+            : 'initial_option';
+        $block = \array_merge(array(
+            $initialOptionKey => null,
+            'action_id' => (string) $actionId,
+            'confirm' => null,
+            'focus_on_load' => false,
+            'options' => self::normalizeOptions($options, 10, $what),
+            'type' => $what,
+        ), $values);
+        $block = self::renameDefault($block);
+        return self::removeNull($block);
+    }
+
     /**
      * Normalize checkbox, radio, or select options
      *
@@ -400,9 +409,9 @@ private static function normalizeOption($option, $key = null)
      */
     private static function renameDefault($block, $renameTo = 'initial_value')
     {
-        if ($block['type'] === 'multi_static_select') {
+        if (\in_array($block['type'], array('checkboxes', 'multi_static_select'), true)) {
             $renameTo = 'initial_options';
-        } elseif ($block['type'] === 'static_select') {
+        } elseif (\in_array($block['type'], array('radio_buttons', 'static_select'), true)) {
             $renameTo = 'initial_option';
         }
         if (isset($block['default'])) {
diff --git a/src/Teams/Actions/AbstractAction.php b/src/Teams/Actions/AbstractAction.php
index 70ce3ba6..b7ba37d3 100644
--- a/src/Teams/Actions/AbstractAction.php
+++ b/src/Teams/Actions/AbstractAction.php
@@ -4,6 +4,7 @@
 
 use bdk\Teams\AbstractExtendableItem;
 use bdk\Teams\Enums;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Common action attributes
@@ -76,7 +77,7 @@ public function withFallback($fallback)
      * Optional icon to be shown on the action in conjunction with the title.
      * Supports data URI in version 1.2+
      *
-     * @param string $iconUrl Url
+     * @param string|UriInterface $iconUrl Url
      *
      * @return static
      */
@@ -85,7 +86,7 @@ public function withIconUrl($iconUrl)
         if ($iconUrl !== null) {
             self::assertUrl($iconUrl, true);
         }
-        return $this->with('iconUrl', $iconUrl);
+        return $this->with('iconUrl', $iconUrl ? (string) $iconUrl : null);
     }
 
     /**
diff --git a/src/Teams/Actions/OpenUrl.php b/src/Teams/Actions/OpenUrl.php
index 1b2d871e..0565b992 100644
--- a/src/Teams/Actions/OpenUrl.php
+++ b/src/Teams/Actions/OpenUrl.php
@@ -2,6 +2,7 @@
 
 namespace bdk\Teams\Actions;
 
+use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
 /**
@@ -14,7 +15,7 @@ class OpenUrl extends AbstractAction
     /**
      * Constructor
      *
-     * @param string $url The url to open
+     * @param string|UriInterface $url The url to open
      */
     public function __construct($url = null)
     {
@@ -24,7 +25,7 @@ public function __construct($url = null)
         parent::__construct();
         $this->type = 'Action.OpenUrl';
         $this->fields = \array_merge($this->fields, array(
-            'url' => $url,
+            'url' => $url ? (string) $url : null,
         ));
     }
 
@@ -50,13 +51,13 @@ public function getContent($version)
     /**
      * Sets url
      *
-     * @param string $url The url to open
+     * @param string|UriInterface $url The url to open
      *
      * @return OpenUrl
      */
     public function withUrl($url)
     {
         self::assertUrl($url);
-        return $this->with('url', $url);
+        return $this->with('url', (string) $url);
     }
 }
diff --git a/src/Teams/CardUtilityTrait.php b/src/Teams/CardUtilityTrait.php
index 209984f9..7a862d4b 100644
--- a/src/Teams/CardUtilityTrait.php
+++ b/src/Teams/CardUtilityTrait.php
@@ -2,8 +2,10 @@
 
 namespace bdk\Teams;
 
+use bdk\HttpMessage\Utility\Uri as UriUtility;
 use bdk\Teams\ItemInterface;
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 use ReflectionClass;
 
 /**
@@ -170,10 +172,7 @@ protected static function assertPx($val, $method = null, $paramName = null)
      */
     protected static function asString($val, $allowNull, $method, $paramName = null)
     {
-        if (\is_string($val) || \is_numeric($val)) {
-            return (string) $val;
-        }
-        if (\is_object($val) && \method_exists($val, '__toString')) {
+        if (self::isStringable($val)) {
             return (string) $val;
         }
         if ($val === null && $allowNull) {
@@ -192,6 +191,22 @@ protected static function asString($val, $allowNull, $method, $paramName = null)
         ));
     }
 
+    /**
+     * Can value be coerced to string?
+     * (string, numeric, or Stringable)
+     *
+     * @param mixed $val Value to test
+     *
+     * @return bool
+     */
+    private static function isStringable($val)
+    {
+        if (\is_string($val) || \is_numeric($val)) {
+            return true;
+        }
+        return \is_object($val) && \method_exists($val, '__toString');
+    }
+
     /**
      * Assert that value is a URL
      *
@@ -204,15 +219,15 @@ protected static function asString($val, $allowNull, $method, $paramName = null)
      */
     protected static function assertUrl($val, $allowDataUrl = false)
     {
-        if (\is_string($val) === false) {
+        if (\is_string($val) === false && !($val instanceof UriInterface)) {
             throw new InvalidArgumentException(\sprintf(
-                'Url should be a string. %s provided.',
+                'Url should be a string or UriInterface. %s provided.',
                 self::getDebugType($val)
             ));
         }
         if (
             $allowDataUrl
-            && \preg_match('#^data:\w+/\w+;base64,(.*)$#', $val, $matches)
+            && \preg_match('#^data:\w+/\w+;base64,(.*)$#', (string) $val, $matches)
             && self::isBase64RegexTest($matches[1])
         ) {
             return;
@@ -220,7 +235,7 @@ protected static function assertUrl($val, $allowDataUrl = false)
         $message = $allowDataUrl
             ? 'Invalid url (or data url)'
             : 'Invalid url';
-        $urlParts = self::parseUrl($val);
+        $urlParts = UriUtility::parseUrl($val);
         if ($urlParts === false || isset($urlParts['scheme']) === false) {
             throw new InvalidArgumentException($message);
         }
@@ -311,44 +326,4 @@ private static function isBase64RegexTest($val)
             . '$#';
         return \preg_match($regex, $val) === 1;
     }
-
-    /**
-     * Parse URL (multi-byte safe)
-     *
-     * @param string $url The URL to parse.
-     *
-     * @return array|false
-     */
-    protected static function parseUrl($url)
-    {
-        // reserved chars
-        $chars = '!*\'();:@&=$,/?#[]';
-        $entities = \str_split(\urlencode($chars), 3);
-        $chars = \str_split($chars);
-        $urlEnc = \str_replace($entities, $chars, \urlencode($url));
-        $parts = self::parseUrlPatched($urlEnc);
-        return $parts
-            ? \array_map('urldecode', $parts)
-            : $parts;
-    }
-
-    /**
-     * Parse URL that may or may not contain schema
-     *
-     * @param string $url The URL to parse.
-     *
-     * @return array|false
-     */
-    private static function parseUrlPatched($url)
-    {
-        if (PHP_VERSION_ID >= 50500 || \strpos($url, '//') !== 0) {
-            return \parse_url($url);
-        }
-        // php 5.4 chokes without the scheme
-        $parts = \parse_url('http:' . $url);
-        if ($parts) {
-            unset($parts['scheme']);
-        }
-        return $parts;
-    }
 }
diff --git a/src/Teams/Cards/AdaptiveCard.php b/src/Teams/Cards/AdaptiveCard.php
index ed0c602d..6a30fb1c 100644
--- a/src/Teams/Cards/AdaptiveCard.php
+++ b/src/Teams/Cards/AdaptiveCard.php
@@ -6,6 +6,7 @@
 use bdk\Teams\Elements\ElementInterface;
 use bdk\Teams\Enums;
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Custom adaptive card
@@ -176,7 +177,7 @@ public function withBody(array $body)
     /**
      * Return new instance with given backgroundImage
      *
-     * @param string                        $url                 Image url
+     * @param string|UriInterface           $url                 Image url
      * @param Enums::FILLMODE_x             $fillmode            fill mode
      * @param Enums::HORIZONTAL_ALIGNMENT_x $horizontalAlignment horizontal alignment
      * @param Enums::VERTICAL_ALIGNMENT_x   $verticalAlignment   Vertical alignment
@@ -196,7 +197,7 @@ public function withBackgroundImage($url, $fillmode = null, $horizontalAlignment
         $backgroundImage = self::normalizeContent(array(
             'fillmode' => $fillmode,
             'horizontalAlignment' => $horizontalAlignment,
-            'url' => $url,
+            'url' => $url ? (string) $url : null,
             'verticalContentAlignment' => $verticalAlignment,
         ));
         if (\count($backgroundImage) > 1 && $this->fields['version'] < 1.2) {
diff --git a/src/Teams/Cards/HeroCard.php b/src/Teams/Cards/HeroCard.php
index 2030e7df..5aa116b8 100644
--- a/src/Teams/Cards/HeroCard.php
+++ b/src/Teams/Cards/HeroCard.php
@@ -3,6 +3,7 @@
 namespace bdk\Teams\Cards;
 
 use bdk\Teams\Actions\ActionInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Hero card
@@ -72,7 +73,7 @@ public function withAddedButton($type, $title, $value)
      * Image(s) displayed at top of card. Aspect ratio 16:9.
      * Currently only the first image of the array will be shown in teams
      *
-     * @param string $url Image url
+     * @param string|UriInterface $url Image url
      *
      * @return static
      */
@@ -80,7 +81,7 @@ public function withAddedImage($url)
     {
         self::assertUrl($url);
         return $this->withAdded('images', array(
-            'url' => $url,
+            'url' => (string) $url,
         ));
     }
 
diff --git a/src/Teams/Cards/MessageCard.php b/src/Teams/Cards/MessageCard.php
index ff788b71..c219c88e 100644
--- a/src/Teams/Cards/MessageCard.php
+++ b/src/Teams/Cards/MessageCard.php
@@ -3,6 +3,7 @@
 namespace bdk\Teams\Cards;
 
 use bdk\Teams\Section;
+use Psr\Http\Message\UriInterface;
 
 /**
  * MessageCard
@@ -65,8 +66,8 @@ public function withAddedSection(Section $section)
      * "HttpPOST"
      * "ActionCard"
      *
-     * @param string $name Action name
-     * @param string $url  Action Url
+     * @param string              $name Action name
+     * @param string|UriInterface $url  Action Url
      *
      * @return static
      *
@@ -80,7 +81,7 @@ public function withAction($name, $url)
             '@context' => 'http://schema.org',
             '@type' => 'ViewAction',
             'name' => $name,
-            'target' => [$url],
+            'target' => [(string) $url],
         ));
     }
 
@@ -117,9 +118,9 @@ public function withColor($color)
     /**
      * Add a new section consisting of a hero image
      *
-     * @param string $url   Image url
-     * @param string $title A short description of the image
-     *                          (typically displayed as a tooltip)
+     * @param string|UriInterface $url   Image url
+     * @param string              $title A short description of the image
+     *                                     (typically displayed as a tooltip)
      *
      * @return static
      */
@@ -128,7 +129,7 @@ public function withHeroImage($url, $title = null)
         self::assertUrl($url);
         return $this->withAdded('sections', array(
             'heroImage' => array(
-                'image' => $url,
+                'image' => (string) $url,
                 'title' => $title,
             ),
         ));
diff --git a/src/Teams/Elements/CommonTrait.php b/src/Teams/Elements/CommonTrait.php
index f6f3d98a..d6119af5 100644
--- a/src/Teams/Elements/CommonTrait.php
+++ b/src/Teams/Elements/CommonTrait.php
@@ -2,6 +2,8 @@
 
 namespace bdk\Teams\Elements;
 
+use Psr\Http\Message\UriInterface;
+
 /**
  * Common element methods
  */
@@ -10,7 +12,7 @@ trait CommonTrait
     /**
      * Return new instance with given backgroundImage
      *
-     * @param string                        $url                 Image url
+     * @param string|UriInterface           $url                 Image url
      * @param Enums::FILLMODE_x             $fillmode            fill mode
      * @param Enums::HORIZONTAL_ALIGNMENT_x $horizontalAlignment horizontal alignment
      * @param Enums::VERTICAL_ALIGNMENT_x   $verticalAlignment   Vertical alignment
@@ -30,7 +32,7 @@ public function withBackgroundImage($url, $fillmode = null, $horizontalAlignment
         $backgroundImage = self::normalizeContent(array(
             'fillmode' => $fillmode,
             'horizontalAlignment' => $horizontalAlignment,
-            'url' => $url,
+            'url' => $url ? (string) $url : null,
             'verticalContentAlignment' => $verticalAlignment,
         ));
         return \count($backgroundImage) > 1
diff --git a/src/Teams/Elements/Image.php b/src/Teams/Elements/Image.php
index 352c3117..7da77389 100644
--- a/src/Teams/Elements/Image.php
+++ b/src/Teams/Elements/Image.php
@@ -5,6 +5,7 @@
 use bdk\Teams\Actions\ActionInterface;
 use bdk\Teams\Enums;
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
 /**
@@ -17,7 +18,7 @@ class Image extends AbstractElement
     /**
      * Constructor
      *
-     * @param string $url Image url
+     * @param string|UriInterface $url Image url
      */
     public function __construct($url = null)
     {
@@ -34,7 +35,7 @@ public function __construct($url = null)
             'selectAction' => null,
             'size' => null,
             'style' => null,
-            'url' => $url,
+            'url' => $url ? (string) $url : null,
             'width' => null,
         ));
     }
@@ -80,14 +81,14 @@ public function getContent($version)
      * Sets Url
      * The URL to the image. Supports data URI in version 1.2+
      *
-     * @param string $url Url
+     * @param string|UriInterface $url Url
      *
      * @return static
      */
     public function withUrl($url)
     {
         self::assertUrl($url, true);
-        return $this->with('url', $url);
+        return $this->with('url', (string) $url);
     }
 
     /**
diff --git a/src/Teams/Elements/Media.php b/src/Teams/Elements/Media.php
index cec8ac3c..328c4ccb 100644
--- a/src/Teams/Elements/Media.php
+++ b/src/Teams/Elements/Media.php
@@ -3,6 +3,7 @@
 namespace bdk\Teams\Elements;
 
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
 /**
@@ -101,7 +102,7 @@ public function withAltText($altText)
      * URL of an image to display before playing.
      * Supports data URI in version 1.2+
      *
-     * @param string $url URL of an image to display before playing.
+     * @param string|UriInterface $url URL of an image to display before playing.
      *
      * @return static
      */
@@ -110,7 +111,7 @@ public function withPoster($url)
         if ($url !== null) {
             self::assertUrl($url, true);
         }
-        return $this->with('poster', $url);
+        return $this->with('poster', $url ? (string) $url : null);
     }
 
     /**
diff --git a/src/Teams/Elements/MediaSource.php b/src/Teams/Elements/MediaSource.php
index b67599b7..b05dc7ed 100644
--- a/src/Teams/Elements/MediaSource.php
+++ b/src/Teams/Elements/MediaSource.php
@@ -3,6 +3,7 @@
 namespace bdk\Teams\Elements;
 
 use bdk\Teams\AbstractItem;
+use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
 /**
@@ -17,8 +18,8 @@ class MediaSource extends AbstractItem
     /**
      * Constructor
      *
-     * @param string $url      URL
-     * @param string $mimeType Mime type
+     * @param string|UriInterface $url      URL
+     * @param string              $mimeType Mime type
      */
     public function __construct($url = null, $mimeType = null)
     {
@@ -28,7 +29,7 @@ public function __construct($url = null, $mimeType = null)
         $this->type = 'MediaSource';
         $this->fields = array(
             'mimeType' => $mimeType,
-            'url' => $url,
+            'url' => $url ? (string) $url : null,
         );
     }
 
@@ -74,13 +75,13 @@ public function withMimeType($mimeType)
      * URL to media.
      * Supports data URI in version 1.2+
      *
-     * @param string $url Url
+     * @param string|UriInterface $url Url
      *
      * @return static
      */
     public function withUrl($url)
     {
         self::assertUrl($url, true);
-        return $this->with('url', $url);
+        return $this->with('url', (string) $url);
     }
 }
diff --git a/src/Teams/Section.php b/src/Teams/Section.php
index 170e7588..ce279273 100644
--- a/src/Teams/Section.php
+++ b/src/Teams/Section.php
@@ -6,6 +6,7 @@
 use bdk\Teams\Actions\ActionInterface;
 use InvalidArgumentException;
 use OutOfBoundsException;
+use Psr\Http\Message\UriInterface;
 
 /**
  * MessageCard Section
@@ -39,10 +40,10 @@ public function getContent($version = null)
     /**
      * Return a new intance with specified activity values
      *
-     * @param string $title    Title
-     * @param string $subtitle Subtitle
-     * @param string $text     Text
-     * @param string $image    Image url
+     * @param string              $title    Title
+     * @param string              $subtitle Subtitle
+     * @param string              $text     Text
+     * @param string|UriInterface $image    Image url
      *
      * @return static
      */
@@ -55,7 +56,7 @@ public function withActivity($title = null, $subtitle = null, $text = null, $ima
             self::assertUrl($image);
         }
         $new = clone $this;
-        $new->fields['activityImage'] = $image;
+        $new->fields['activityImage'] = $image ? (string) $image : null;
         $new->fields['activitySubtitle'] = $subtitle;
         $new->fields['activityText'] = $text;
         $new->fields['activityTitle'] = $title;
@@ -87,9 +88,9 @@ public function withFacts(array $facts = array())
     /**
      * Return new instance with the specified hero image
      *
-     * @param string $url   Iaage url
-     * @param string $title A short description of the image
-     *                         (typically displayed as a tooltip)
+     * @param string|UriInterface $url   Iaage url
+     * @param string              $title A short description of the image
+     *                                     (typically displayed as a tooltip)
      *
      * @return static
      */
@@ -100,7 +101,7 @@ public function withHeroImage($url, $title = null)
         }
         self::assertUrl($url);
         return $this->with('heroImage', array(
-            'image' => $url,
+            'image' => (string) $url,
             'title' => self::asString($title, true, __METHOD__),
         ));
     }
diff --git a/tests/Debug/Plugin/Method/TableTest.php b/tests/Debug/Plugin/Method/TableTest.php
index 8ffbc1de..bda5f79d 100644
--- a/tests/Debug/Plugin/Method/TableTest.php
+++ b/tests/Debug/Plugin/Method/TableTest.php
@@ -27,6 +27,7 @@
  * @covers \bdk\Debug\Dump\Text
  * @covers \bdk\Debug\Plugin\Method\Table
  * @covers \bdk\Debug\Route\Firephp
+ * @covers \bdk\Debug\Route\Script
  * @covers \bdk\Debug\ServiceProvider
  * @covers \bdk\Debug\Utility\Table
  * @covers \bdk\Debug\Utility\TableRow
diff --git a/tests/Debug/Route/DiscordTest.php b/tests/Debug/Route/DiscordTest.php
index 464ecd92..a071169c 100644
--- a/tests/Debug/Route/DiscordTest.php
+++ b/tests/Debug/Route/DiscordTest.php
@@ -11,6 +11,7 @@
 /**
  * Test Discord route
  *
+ * @covers \bdk\Debug\Route\AbstractErrorRoute
  * @covers \bdk\Debug\Route\Discord
  *
  * @phpcs:disable SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
diff --git a/tests/Debug/Route/SlackTest.php b/tests/Debug/Route/SlackTest.php
index e36dba67..61b866e7 100644
--- a/tests/Debug/Route/SlackTest.php
+++ b/tests/Debug/Route/SlackTest.php
@@ -13,6 +13,7 @@
 /**
  * Test Slack route
  *
+ * @covers \bdk\Debug\Route\AbstractErrorRoute
  * @covers \bdk\Debug\Route\Slack
  */
 class SlackTest extends DebugTestFramework
diff --git a/tests/Debug/Route/TeamsTest.php b/tests/Debug/Route/TeamsTest.php
index f898cd48..64b0b8e3 100644
--- a/tests/Debug/Route/TeamsTest.php
+++ b/tests/Debug/Route/TeamsTest.php
@@ -11,6 +11,7 @@
 /**
  * Test Teams route
  *
+ * @covers \bdk\Debug\Route\AbstractErrorRoute
  * @covers \bdk\Debug\Route\Teams
  *
  * @phpcs:disable SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder
diff --git a/tests/Debug/Utility/HtmlTest.php b/tests/Debug/Utility/HtmlTest.php
index 1278bdd6..6a795e62 100644
--- a/tests/Debug/Utility/HtmlTest.php
+++ b/tests/Debug/Utility/HtmlTest.php
@@ -9,6 +9,8 @@
  * PHPUnit tests for Debug class
  *
  * @covers \bdk\Debug\Utility\Html
+ * @covers \bdk\Debug\Utility\HtmlBuild
+ * @covers \bdk\Debug\Utility\HtmlParse
  */
 class HtmlTest extends DebugTestFramework
 {
diff --git a/tests/HttpMessage/Utility/UriTest.php b/tests/HttpMessage/Utility/UriTest.php
index f5abadf9..fb029605 100644
--- a/tests/HttpMessage/Utility/UriTest.php
+++ b/tests/HttpMessage/Utility/UriTest.php
@@ -107,6 +107,26 @@ public static function providerParseUrl()
                 'query' => '',
                 'fragment' => '[]%" \\',
             )),
+            'uriInterface' => array(
+                new Uri('//example.com/'),
+                array(
+                    'host' => 'example.com',
+                    'path' => '/',
+                ),
+            ),
+            'uriInterface2' => array(
+                new Uri('http://foo:bar@example.com:8080/path?zip=zap#frag'),
+                array(
+                    'scheme' => 'http',
+                    'host' => 'example.com',
+                    'port' => 8080,
+                    'user' => 'foo',
+                    'pass' => 'bar',
+                    'path' => '/path',
+                    'query' => 'zip=zap',
+                    'fragment' => 'frag',
+                ),
+            ),
         );
     }