Troubleshoot unit tests

Author: bkdotcom

src/Backtrace/Backtrace.php

@@ -112,7 +112,7 @@ public static function getCallerInfo($offset = 0, $options = 0)
             we need to collect object... we'll remove object at end if undesired
         */
         $phpOptions = static::translateOptions($options | self::INCL_OBJECT);
-        $backtrace = \debug_backtrace($phpOptions, 50);
+        $backtrace = \debug_backtrace($phpOptions, 60);
         $backtrace = self::normalize($backtrace);
         $index = SkipInternal::getFirstIndex($backtrace, $offset);
         $index = \max($index, 1); // ensure we're >= 1

src/Debug/Plugin/Method/Table.php

@@ -57,9 +57,6 @@ class Table implements SubscriberInterface
      */
     public function __construct()
     {
-        $this->tableFactory = new TableFactory(array(
-            'getValInfo' => [$this, 'getValInfo'],
-        ));
     }
 
     /**
@@ -174,7 +171,7 @@ private function doTableLogEntry(LogEntry $logEntry)
     {
         $this->initLogEntry($logEntry);
 
-        $table = $this->tableFactory->create(
+        $table = $this->getTableFactory()->create(
             isset($logEntry['args'][0])
                 ? $logEntry['args'][0]
                 : null,
@@ -198,6 +195,21 @@ private function doTableLogEntry(LogEntry $logEntry)
         $this->removeTableMetaFromLogEntry($logEntry);
     }
 
+    /**
+     * Get or create TableFactory instance
+     *
+     * @return TableFactory
+     */
+    private function getTableFactory()
+    {
+        if ($this->tableFactory === null) {
+            $this->tableFactory = new TableFactory(array(
+                'getValInfo' => [$this, 'getValInfo'],
+            ));
+        }
+        return $this->tableFactory;
+    }
+
     /**
      * Find the data, caption, & columns in logEntry arguments
      *

src/Table/Element.php

@@ -75,7 +75,7 @@ public function __serialize()
     {
         $data = array(
             'attribs' => $this->attribs,
-            'children' => \array_map(static function (self $child) {
+            'children' => \array_map(static function ($child) {
                 $data = $child->__serialize();
                 if (\count($data) === 1) {
                     return \reset($data);
@@ -138,7 +138,7 @@ public function getHtml()
     {
         $children = $this->getChildren();
         if ($children) {
-            $innerHtml = "\n" . \implode('', \array_map(static function (self $child) {
+            $innerHtml = "\n" . \implode('', \array_map(static function ($child) {
                 return $child->getOuterHtml() . "\n";
             }, $children));
             if ($this->cfg['indent']) {
@@ -255,6 +255,9 @@ public function addClass($class)
      */
     public function appendChild(self $child)
     {
+        if (!($child instanceof self)) {
+            throw new InvalidArgumentException('Child must be an instance of ' . __CLASS__);
+        }
         $child->setParent($this);
         $this->children[] = $child;
         return $this;

src/Table/Factory.php

@@ -5,6 +5,8 @@
 use bdk\Debug\Utility\Php;
 use bdk\Debug\Utility\PhpType;
 use bdk\Table\TableRow;
+use Exception;
+use Throwable;
 
 /**
  * Create Table structure via iterable (array or object)
@@ -307,15 +309,17 @@ private function getObjectValuesKeys($obj, $keys = [])
     {
         $valsAll = $this->getObjectValues($obj);
         \set_error_handler(static function ($type, $message) {
-            throw new \Exception($message);
+            throw new Exception($message);
         });
         $vals = array();
         foreach ($keys as $key) {
             try {
                 $vals[$key] = \array_key_exists($key, $valsAll)
                     ? $valsAll[$key]
                     : $obj->{$key};
-            } catch (\Throwable $e) {
+            } catch (Exception $e) {
+                $vals[$key] = self::VAL_UNDEFINED;
+            } catch (Throwable $e) {
                 $vals[$key] = self::VAL_UNDEFINED;
             }
         }

tests/Table/ElementTest.php

@@ -4,7 +4,11 @@
 
 use bdk\Table\Element;
 use bdk\PhpUnitPolyfill\AssertionTrait;
+use ErrorNotice;
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
+use TypeError;
 
 /**
  * PHPUnit tests for bdk\Table\Element
@@ -302,11 +306,10 @@ public function testSetChildren()
      */
     public function testSetChildrenInvalid()
     {
-        $this->expectException('TypeError');
-        // $this->expectExceptionMessage('Children must be instances of');
-
-        $parent = new Element('div');
-        $parent->setChildren(['not an Element object']);
+        self::assertExceptionOrTypeError(function () {
+            $parent = new Element('div');
+            $parent->setChildren(['not an Element object']);
+        });
     }
 
     /**
@@ -883,4 +886,24 @@ public function testGetHtmlPrioritizesChildren()
         $html = $parent->getHtml();
         self::assertStringContainsString('<span>Child</span>', $html);
     }
+
+    protected static function assertExceptionOrTypeError($callable)
+    {
+        try {
+            $callable();
+        } catch (ErrorNotice $e) {
+            self::assertSame('A non well formed numeric value encountered', $e->getMessage());
+            return;
+        } catch (RuntimeException $e) {
+            self::assertSame('A non well formed numeric value encountered', $e->getMessage());
+            return;
+        } catch (InvalidArgumentException $e) {
+            self::assertTrue(true);
+            return;
+        } catch (TypeError $e) {
+            self::assertSame(\get_class($e), 'TypeError');
+            return;
+        }
+        throw new AssertionFailedError('Exception not thrown');
+    }
 }