improve object property processor

chevere · May 26, 2024 · 996162c · 996162c
1 parent 0ab738c
commit 996162c
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/Processors/ObjectProcessor.php b/src/Processors/ObjectProcessor.php
@@ -21,7 +21,6 @@
 use Chevere\VarDump\Processors\Traits\ProcessorTrait;
 use Reflection;
 use ReflectionObject;
-use Throwable;
 
 final class ObjectProcessor implements ProcessorInterface, ProcessorNestedInterface
 {
@@ -89,13 +88,14 @@ public function write(): void
 
             return;
         }
-        $this->setProperties(new ReflectionObject($this->var));
+        $this->setProperties($this->var);
     }
 
-    private function setProperties(ReflectionObject $reflection): void
+    private function setProperties(object $object): void
     {
+        $reflection = new ReflectionObject($object);
         $properties = [];
-        $properties = $this->getProperties($reflection);
+        $properties = $this->getProperties($object, $reflection);
         // @codeCoverageIgnoreStart
         if ($properties === [] && $reflection->isInternal()) {
             $properties = $this->getPublicProperties();
@@ -130,6 +130,7 @@ private function getPublicProperties(): array
      * @return array<string, array<mixed>>
      */
     private function getProperties(
+        object $object,
         ReflectionObject $reflection
     ): array {
         $properties = [];
@@ -139,12 +140,15 @@ private function getProperties(
                     continue;
                 }
                 $isUnset = false;
-
-                try {
+                if (! $property->isInitialized($object)) {
+                    if ($property->hasDefaultValue()) {
+                        $value = $property->getDefaultValue();
+                    } else {
+                        $value = '';
+                        $isUnset = true;
+                    }
+                } else {
                     $value = $property->getValue($this->var);
-                } catch (Throwable) {
-                    $value = '';
-                    $isUnset = true;
                 }
                 $properties[$property->getName()] = [
                     implode(