Don't needlessly serialize unused classDefinitions (ie Table, TableRow, & TableCell)

LogPhp::logPhpIni... if multiple ini files present, they weren't detected as file / linked

Author: bkdotcom

src/Debug/Abstraction/AbstractObject.php

@@ -237,9 +237,12 @@ public function getAbstraction($obj, $method = null, array $hist = array())
         $abs->setSubject($obj);
         $abs['hist'][] = $obj;
         $this->doAbstraction($abs);
-        return $abs['unstructuredValue']
-            ? $abs['unstructuredValue']
-            : $abs->clean();
+        if ($abs['unstructuredValue']) {
+            return $abs['unstructuredValue'];
+        }
+        // Mark definition as used
+        $this->definition->markAsUsed($definitionValueStore);
+        return $abs->clean();
     }
 
     /**

src/Debug/Abstraction/Abstracter.php

@@ -174,7 +174,7 @@ public function crate($mixed, $method = null, array $hist = array())
     public function crateWithVals($mixed, array $values = array())
     {
         /*
-            Note: this->crateValues is the raw values passed to this method
+            Note: this->crateVals is the raw values passed to this method
                the values may end up being processed in Abstraction::onSet
                ie, converting attribs.class to an array
         */
@@ -189,10 +189,18 @@ public function crateWithVals($mixed, array $values = array())
             ? \array_values($typeInfo)
             : array();
         unset($values['type']);
+        $cfgRestore = array();
+        if (isset($values['detectFiles'])) {
+            $cfgRestore['detectFiles'] = $this->abstractString->setCfg('detectFiles', $values['detectFiles']);
+            unset($values['detectFiles']);
+        }
         $abs = $this->getAbstraction($mixed, __FUNCTION__, $typeInfo);
         foreach ($values as $k => $v) {
             $abs[$k] = $v;
         }
+        if ($cfgRestore) {
+            $this->debug->setCfg($cfgRestore, Debug::CONFIG_NO_RETURN);
+        }
         $this->crateVals = array();
         return $abs;
     }

src/Debug/Abstraction/Object/Abstraction.php

@@ -137,6 +137,7 @@ public function getInheritedValues()
     {
         $values = $this->inherited->getValues();
         unset($values['cfgFlags']);
+        unset($values['__isUsed']);
         return $values;
     }
 

src/Debug/Abstraction/Object/Definition.php

@@ -150,13 +150,29 @@ public function getValueStoreDefault()
             return $this->default;
         }
         $values = $this->object->buildValues(static::buildValues());
-        $classValueStore = new ValueStore($values);
-        $this->default = $classValueStore;
-        $this->debug->data->set([
-            'classDefinitions',
-            $values['className'], // "\x00default\x00"
-        ], $classValueStore);
-        return $classValueStore;
+        $this->default = new ValueStore($values);
+        $dataPath = ['classDefinitions', $values['className']];
+        $this->debug->data->set($dataPath, $this->default);
+        return $this->default;
+    }
+
+    /**
+     * Mark a definition as used (referenced by a logged ObjectAbstraction)
+     *
+     * @param ValueStore $valueStore The definition ValueStore
+     *
+     * @return void
+     */
+    public function markAsUsed(ValueStore $valueStore)
+    {
+        if ($valueStore['__isUsed']) {
+            return; // already marked
+        }
+        $valueStore['__isUsed'] = true;
+        if ($valueStore['inherited']) {
+            // also mark "parent" definition as used
+            $this->markAsUsed($valueStore['inherited']);
+        }
     }
 
     /**

src/Debug/Debug.php

@@ -119,7 +119,7 @@ class Debug extends AbstractDebug
     const EVENT_STREAM_WRAP = 'debug.streamWrap';
 
     const META = "\x00meta\x00";
-    const VERSION = '3.5';
+    const VERSION = '3.6';
 
     /** @var array<string,mixed> */
     protected $cfg = array(

src/Debug/Plugin/LogFiles.php

@@ -257,10 +257,7 @@ private function logFilesAsTree($files)
                         'expand' => true,
                     ),
                 )
-            ),
-            $this->debug->meta(array(
-                'detectFiles' => true,
-            ))
+            )
         );
         $this->debug->setCfg('maxDepth', $maxDepthBak, Debug::CONFIG_NO_PUBLISH | Debug::CONFIG_NO_RETURN);
     }

src/Debug/Plugin/LogPhp.php

@@ -283,12 +283,12 @@ private function logPhpIni()
             $this->debug->abstracter->crateWithVals(
                 $iniFiles,
                 array(
+                    'detectFiles' => true,
                     'options' => array(
                         'showListKeys' => false,
                     ),
                 )
-            ),
-            $this->debug->meta('detectFiles')
+            )
         );
     }