Move Table Abstraction to Object\Subscriber

Remove last remnants of `isTraverseOnly`

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, 40);
+        $backtrace = \debug_backtrace($phpOptions, 50);
         $backtrace = self::normalize($backtrace);
         $index = SkipInternal::getFirstIndex($backtrace, $offset);
         $index = \max($index, 1); // ensure we're >= 1

src/Debug/Abstraction/AbstractObject.php

@@ -13,7 +13,6 @@
 use bdk\Debug;
 use bdk\Debug\AbstractComponent;
 use bdk\Debug\Abstraction\Abstracter;
-use bdk\Debug\Abstraction\Abstraction;
 use bdk\Debug\Abstraction\Object\Abstraction as ObjectAbstraction;
 use bdk\Debug\Abstraction\Object\Constants;
 use bdk\Debug\Abstraction\Object\Definition;
@@ -22,9 +21,7 @@
 use bdk\Debug\Abstraction\Object\Properties;
 use bdk\Debug\Abstraction\Object\PropertiesInstance;
 use bdk\Debug\Abstraction\Object\Subscriber;
-use bdk\Debug\Abstraction\Type;
 use bdk\Table\Element;
-use bdk\Table\Table;
 use ReflectionClass;
 use ReflectionEnumUnitCase;
 use RuntimeException;
@@ -208,10 +205,11 @@ public function __construct(Abstracter $abstracter)
         $this->propertiesInstance = new PropertiesInstance($this);
         $this->definition = new Definition($this);
 
-        if ($abstracter->debug->parentInstance === null) {
-            // we only need to subscribe to these events from root channel
-            $abstracter->debug->eventManager->addSubscriberInterface(new Subscriber($this));
-        }
+        // if we are the root instance, subscribe to events
+        //  otherwise ensure root instance is instantiated
+        $abstracter->debug->parentInstance === null
+            ? $abstracter->debug->eventManager->addSubscriberInterface(new Subscriber($this))
+            : $abstracter->debug->rootInstance->abstracter;
 
         self::$values['sectionOrder'] = $abstracter->getCfg('objectSectionOrder');
         self::$values['sort'] = $abstracter->getCfg('objectSort');
@@ -233,16 +231,6 @@ public function getAbstraction($obj, $method = null, array $hist = array())
         if ($reflector instanceof ReflectionEnumUnitCase) {
             $reflector = $reflector->getEnum();
         }
-        if ($obj instanceof Element) {
-            $hist[] = $obj;
-            $this->debug->eventManager->subscribe(Debug::EVENT_OBJ_ABSTRACT_END, [$this, 'tableCellValueAbstracter']);
-            $values = $obj->jsonSerialize();
-            $values = $this->abstracter->crate($values, $method, $hist);
-            $this->debug->eventManager->unsubscribe(Debug::EVENT_OBJ_ABSTRACT_END, [$this, 'tableCellValueAbstracter']);
-            return $obj instanceof Table
-                ? new Abstraction(Type::TYPE_TABLE, $values)
-                : $values;
-        }
         $values = $this->getAbstractionValues($reflector, $obj, $method, $hist);
         $definitionValueStore = $this->definition->getAbstraction($obj, $values);
         $abs = new ObjectAbstraction($definitionValueStore, $values);
@@ -272,22 +260,6 @@ public static function buildValues(array $values = array())
         return \array_merge(self::$values, $values);
     }
 
-    /**
-     * If cell value is an object, set unstructuredValue for abstraction
-     *
-     * @param ObjectAbstraction $abs Object Abstraction instance
-     *
-     * @return void
-     */
-    public function tableCellValueAbstracter($abs)
-    {
-        if (isset($abs['stringified'])) {
-            $abs['unstructuredValue'] = $abs['stringified'];
-        } elseif (isset($abs['methods']['__toString']['returnValue'])) {
-            $abs['unstructuredValue'] = $abs['methods']['__toString']['returnValue'];
-        }
-    }
-
     /**
      * Collect instance info
      * Property values & static method variables
@@ -301,7 +273,6 @@ private function doAbstraction(ObjectAbstraction $abs)
         if ($abs['isMaxDepth'] || $abs['isRecursion']) {
             return;
         }
-        $abs['isTraverseOnly'] = $this->helper->isTraverseOnly($abs);
         /*
             Debug::EVENT_OBJ_ABSTRACT_START subscriber may
             set isExcluded
@@ -355,7 +326,6 @@ protected function getAbstractionValues(ReflectionClass $reflector, $obj, $metho
                 'collectPropertyValues' => true,
                 'fullyQualifyPhpDocType' => $this->cfg['fullyQualifyPhpDocType'],
                 'hist' => $hist,
-                'isTraverseOnly' => false,
                 'propertyOverrideValues' => array(),
                 'reflector' => $reflector,
             )

src/Debug/Abstraction/AbstractString.php

@@ -370,8 +370,8 @@ private function getTypeMore($val)
             return Type::TYPE_STRING_FILEPATH;
         }
         $strLen = \strlen($val);
-        $maxlen = $this->getMaxLen('other', $strLen);
-        return $maxlen > -1 && $strLen > $maxlen
+        $maxLen = $this->getMaxLen('other', $strLen);
+        return $maxLen > -1 && $strLen > $maxLen
             ? Type::TYPE_STRING_LONG
             : null;
     }

src/Debug/Abstraction/Abstracter.php

@@ -64,6 +64,7 @@ class Abstracter extends AbstractComponent
         'brief' => false, // collect & output less details
                           //    see also AbstractObject::$cfgFlags where each key
                           //    can be set to true/false as a cfg value here
+        'detectFiles' => false,
         'fullyQualifyPhpDocType' => false,
         'interfacesCollapse' => [
             'ArrayAccess',

src/Debug/Abstraction/Object/Abstraction.php

@@ -32,7 +32,6 @@ class Abstraction extends BaseAbstraction
         'collectPropertyValues',
         'fullyQualifyPhpDocType',
         'hist',
-        'isTraverseOnly',
         'propertyOverrideValues',
         'reflector',
         'unstructuredValue',

src/Debug/Abstraction/Object/Helper.php

@@ -166,23 +166,6 @@ public function getPhpDocVar(Reflector $reflector, $fullyQualifyType = false)
         return $phpDoc;
     }
 
-    /**
-     * Test if "traverseOnly" mode
-     *
-     * @param ObjectAbstraction $abs Abstraction instance
-     *
-     * @return bool
-     */
-    public function isTraverseOnly(ObjectAbstraction $abs)
-    {
-        if ($abs['debugMethod'] === 'table' && \count($abs['hist']) < 7) {
-            $abs['cfgFlags'] &= ~AbstractObject::CONST_COLLECT;  // set collect constants to "false"
-            $abs['cfgFlags'] &= ~AbstractObject::METHOD_COLLECT;  // set collect methods to "false"
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Get Constant, Property, or Parameter's type or Method's return type
      * Priority given to phpDoc type, followed by reflection type (if available)

src/Debug/Abstraction/Object/PropertiesInstance.php

@@ -32,9 +32,6 @@ class PropertiesInstance extends Properties
      */
     public function add(Abstraction $abs)
     {
-        if ($abs['isTraverseOnly']) {
-            return;
-        }
         $abs['isLazy']
             ? $this->addValuesLazy($abs)
             : $this->addValues($abs);