Exposer: includes uninitialized properties [Closes #448] WIP

nette · Nov 29, 2020 · 0307285 · 0307285
1 parent 9389310
commit 0307285
Showing 1 changed file with 30 additions and 15 deletions.
diff --git a/src/Tracy/Dumper/Exposer.php b/src/Tracy/Dumper/Exposer.php
@@ -18,23 +18,38 @@ final class Exposer
 {
 	public static function exposeObject(object $obj, Value $value, Describer $describer): void
 	{
-		$defaults = get_class_vars(get_class($obj));
-		$arr = (array) $obj;
-		$tmp = $arr; // bug #79477, PHP < 7.4.6
-		foreach ($tmp as $k => $v) {
-			$refId = $describer->getReferenceId($tmp, $k);
-			$type = Value::PROP_PUBLIC;
-			if (isset($k[0]) && $k[0] === "\x00") {
-				$info = explode("\00", $k);
-				$k = end($info);
-				$type = $info[1] === '*' ? Value::PROP_PROTECTED : $info[1];
+		$values = (array) $obj;
+		$tmp = $values; // bug #79477, PHP < 7.4.6
+		$class = get_class($obj);
+		$rc = new \ReflectionObject($obj);
+
+		foreach ($rc->getProperties() as $prop) {
+			$k = $name = $prop->getName();
+
+			if ($prop->isDefault()) {
+				$type = Value::PROP_PUBLIC;
+				if ($prop->isPrivate()) {
+					$type = $class;
+					$k = "\x00$class\x00$k"; // TODO
+				} elseif ($prop->isProtected()) {
+					$type = Value::PROP_PROTECTED;
+					$k = "\x00*\x00$k";
+				}
+				if (!array_key_exists($k, $values)) {
+					$value->items[] = [$name, new Value(Value::TYPE_TEXT, 'undefined'), $type];
+					continue;
+				}
 			} else {
-				$type = array_key_exists($k, $defaults)
-					? Value::PROP_PUBLIC
-					: Value::PROP_DYNAMIC;
-				$k = (string) $k;
+				$type = Value::PROP_DYNAMIC;
 			}
-			$describer->addPropertyTo($value, $k, $v, $type, $refId);
+
+			$describer->addPropertyTo(
+				$value,
+				$name,
+				$values[$k],
+				$type,
+				$describer->getReferenceId($tmp, $k)
+			);
 		}
 	}