Dumper\Model: added TYPE_* consts

Author: dg

src/Tracy/Dumper/Describer.php

@@ -87,10 +87,10 @@ private function describeVar($var, int $depth = 0, int $refId = null)
 	private function describeDouble(float $num)
 	{
 		if (!is_finite($num)) {
-			return new Model('number', (string) $num);
+			return new Model(Model::TYPE_NUMBER, (string) $num);
 		}
 		$tmp = json_encode($num);
-		return strpos($tmp, '.') ? $num : new Model('number', "$tmp.0");
+		return strpos($tmp, '.') ? $num : new Model(Model::TYPE_NUMBER, "$tmp.0");
 	}
 
 
@@ -103,9 +103,9 @@ private function describeString(string $s)
 		if ($res === $s) {
 			return $res;
 		} elseif ($utf) { // is UTF-8
-			return new Model('string', $res, strlen(utf8_decode($s)));
+			return new Model(Model::TYPE_STRING, $res, strlen(utf8_decode($s)));
 		} else {
-			return new Model('bin', $res, strlen($s));
+			return new Model(Model::TYPE_BINARY, $res, strlen($s));
 		}
 	}
 
@@ -117,7 +117,7 @@ private function describeArray(array $arr, int $depth = 0, int $refId = null)
 	{
 		if ($refId || count($arr) > $this->maxItems) {
 			$id = $refId ? 'a' . $refId : 'A' . count($this->snapshot);
-			$res = new Model('array', $id);
+			$res = new Model(Model::TYPE_ARRAY, $id);
 
 			$shot = &$this->snapshot[$id];
 			if ($shot && $shot->depth <= $depth) {
@@ -137,7 +137,7 @@ private function describeArray(array $arr, int $depth = 0, int $refId = null)
 			$items = &$shot->items;
 
 		} elseif ($arr && $depth >= $this->maxDepth) {
-			return new Model('stop', count($arr));
+			return new Model(Model::TYPE_STOP, count($arr));
 		}
 
 		$items = [];
@@ -146,7 +146,7 @@ private function describeArray(array $arr, int $depth = 0, int $refId = null)
 			$items[] = [
 				$this->describeVar($k, $depth + 1),
 				is_string($k) && isset($this->keysToHide[strtolower($k)])
-					? new Model('text', self::hideValue($v))
+					? new Model(Model::TYPE_TEXT, self::hideValue($v))
 					: $this->describeVar($v, $depth + 1, $refId),
 			] + ($refId ? [2 => $refId] : []);
 		}
@@ -161,7 +161,7 @@ private function describeObject(object $obj, int $depth = 0): Model
 		/** @var ?\stdClass $shot */
 		$shot = &$this->snapshot[$id];
 		if ($shot && $shot->depth <= $depth) {
-			return new Model('object', $id);
+			return new Model(Model::TYPE_OBJECT, $id);
 		}
 
 		$shot = $shot ?? (object) [
@@ -191,12 +191,12 @@ private function describeObject(object $obj, int $depth = 0): Model
 				$refId = $this->getReferenceId($info, 1);
 				$k = (string) $k;
 				$v = isset($this->keysToHide[strtolower($k)])
-					? new Model('text', self::hideValue($v))
+					? new Model(Model::TYPE_TEXT, self::hideValue($v))
 					: $this->describeVar($v, $depth + 1, $refId);
 				$shot->items[] = [$this->encodeKey($k), $v, $type] + ($refId ? [3 => $refId] : []);
 			}
 		}
-		return new Model('object', $id);
+		return new Model(Model::TYPE_OBJECT, $id);
 	}
 
 
@@ -217,7 +217,7 @@ private function describeResource($resource, int $depth = 0): Model
 				}
 			}
 		}
-		return new Model('resource', $id);
+		return new Model(Model::TYPE_RESOURCE, $id);
 	}
 
 

src/Tracy/Dumper/Model.php

@@ -15,6 +15,16 @@
  */
 final class Model implements \JsonSerializable
 {
+	public const
+		TYPE_ARRAY = 'array',
+		TYPE_BINARY = 'bin',
+		TYPE_NUMBER = 'number',
+		TYPE_OBJECT = 'object',
+		TYPE_RESOURCE = 'resource',
+		TYPE_STOP = 'stop',
+		TYPE_STRING = 'string',
+		TYPE_TEXT = 'text';
+
 	/** @var string */
 	public $type;
 

src/Tracy/Dumper/Renderer.php

@@ -136,33 +136,33 @@ private function renderVar($model, int $depth = 0, bool $isKey = false): string
 			case !$model instanceof Model:
 				throw new \Exception('Unknown type');
 
-			case $model->type === 'object':
+			case $model->type === $model::TYPE_OBJECT:
 				return $this->renderObject($model, $depth);
 
-			case $model->type === 'array':
+			case $model->type === $model::TYPE_ARRAY:
 				return $this->renderArray($model, $depth);
 
-			case $model->type === 'number':
+			case $model->type === $model::TYPE_NUMBER:
 				return '<span class="tracy-dump-number">' . Helpers::escapeHtml($model->value) . '</span>';
 
-			case $model->type === 'text':
+			case $model->type === $model::TYPE_TEXT:
 				return '<span>' . Helpers::escapeHtml($model->value) . '</span>';
 
-			case $model->type === 'string':
-			case $model->type === 'bin':
+			case $model->type === $model::TYPE_STRING:
+			case $model->type === $model::TYPE_BINARY:
 				if ($isKey) {
 					return '<span class="tracy-dump-string">\'' . str_replace("\n", "\n ", $model->value) . "'</span>";
 				}
 				return '<span class="tracy-dump-string"'
-					. ($model->length > 1 ? ' title="' . $model->length . ' ' . ($model->type === 'string' ? 'characters' : 'bytes') . '">' : '>')
+					. ($model->length > 1 ? ' title="' . $model->length . ' ' . ($model->type === $model::TYPE_STRING ? 'characters' : 'bytes') . '">' : '>')
 					. (strpos($model->value, "\n") === false ? '' : "\n   ") . "'"
 					. str_replace("\n", "\n    ", $model->value)
 					. "'</span>";
 
-			case $model->type === 'stop':
+			case $model->type === $model::TYPE_STOP:
 				return '<span class="tracy-dump-array">array</span> (' . $model->value . ') …';
 
-			case $model->type === 'resource':
+			case $model->type === $model::TYPE_RESOURCE:
 				return $this->renderResource($model, $depth);
 
 			default: