Dumper\Value: added TYPE_* consts

Author: dg

src/Tracy/Dumper/Describer.php

@@ -85,12 +85,12 @@ private function describeVar($var, int $depth = 0, int $refId = null)
 	private function describeDouble(float $num)
 	{
 		if (!is_finite($num)) {
-			return new Value('number', (string) $num);
+			return new Value(Value::TYPE_NUMBER, (string) $num);
 		}
 		$js = json_encode($num);
 		return strpos($js, '.')
 			? $num
-			: new Value('number', "$js.0"); // to distinct int and float in JS
+			: new Value(Value::TYPE_NUMBER, "$js.0"); // to distinct int and float in JS
 	}
 
 
@@ -103,9 +103,9 @@ private function describeString(string $s)
 		if ($res === $s) {
 			return $res;
 		} elseif ($utf) { // is UTF-8
-			return new Value('string', $res, strlen(utf8_decode($s)));
+			return new Value(Value::TYPE_STRING, $res, strlen(utf8_decode($s)));
 		} else {
-			return new Value('bin', $res, strlen($s));
+			return new Value(Value::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 Value('array', $id);
+			$res = new Value(Value::TYPE_ARRAY, $id);
 
 			$shot = &$this->snapshot[$id];
 			if (!$shot) {
@@ -138,7 +138,7 @@ private function describeArray(array $arr, int $depth = 0, int $refId = null)
 			$items = &$shot->items;
 
 		} elseif ($arr && $depth >= $this->maxDepth) {
-			return new Value('stop', count($arr));
+			return new Value(Value::TYPE_STOP, count($arr));
 		}
 
 		$items = [];
@@ -147,7 +147,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 Value('text', self::hideValue($v))
+					? new Value(Value::TYPE_TEXT, self::hideValue($v))
 					: $this->describeVar($v, $depth + 1, $refId),
 			] + ($refId ? [2 => $refId] : []);
 		}
@@ -172,7 +172,7 @@ private function describeObject(object $obj, int $depth = 0): Value
 				$shot->editor = (object) ['file' => $rc->getFileName(), 'line' => $rc->getStartLine(), 'url' => $editor];
 			}
 		} elseif ($shot->depth <= $depth) {
-			return new Value('object', $id);
+			return new Value(Value::TYPE_OBJECT, $id);
 		}
 
 		if ($depth < $this->maxDepth) {
@@ -190,12 +190,12 @@ private function describeObject(object $obj, int $depth = 0): Value
 				$refId = $this->getReferenceId($info, 1);
 				$k = (string) $k;
 				$v = isset($this->keysToHide[strtolower($k)])
-					? new Value('text', self::hideValue($v))
+					? new Value(Value::TYPE_TEXT, self::hideValue($v))
 					: $this->describeVar($v, $depth + 1, $refId);
 				$shot->items[] = [$this->encodeKey($k), $v, $type] + ($refId ? [3 => $refId] : []);
 			}
 		}
-		return new Value('object', $id);
+		return new Value(Value::TYPE_OBJECT, $id);
 	}
 
 
@@ -216,7 +216,7 @@ private function describeResource($resource, int $depth = 0): Value
 				}
 			}
 		}
-		return new Value('resource', $id);
+		return new Value(Value::TYPE_RESOURCE, $id);
 	}
 
 

src/Tracy/Dumper/Renderer.php

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

src/Tracy/Dumper/Value.php

@@ -15,6 +15,16 @@
  */
 final class Value 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;