Update Tracy core

Author: adrianbj

TracyDebugger.module.php

@@ -27,7 +27,7 @@ public static function getModuleInfo() {
             'summary' => __('Tracy debugger from Nette with many PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/forum/58-tracy-debugger/',
-            'version' => '4.27.4',
+            'version' => '4.27.5',
             'autoload' => 100000, // in PW 3.0.114+ higher numbers are loaded first - we want Tracy first
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',

panels/RequestInfoPanel.php

@@ -1040,6 +1040,7 @@ private function getImages($p) {
 
 
     private function imageStr($inputfield, $image) {
+        if(!$image instanceof PageImage) return '';
         $imagePreview = '';
         if(isset($inputfield) && $inputfield) {
             $thumb = $inputfield->getAdminThumb($image);

tracy-2.11.x/composer.json

@@ -24,10 +24,10 @@
 		"nette/di": "^3.0",
 		"nette/http": "^3.0",
 		"nette/mail": "^3.0 || ^4.0",
-		"nette/tester": "^2.2",
+		"nette/tester": "^2.6",
 		"latte/latte": "^2.5 || ^3.0",
 		"psr/log": "^1.0 || ^2.0 || ^3.0",
-		"phpstan/phpstan-nette": "^2.0@stable"
+		"phpstan/phpstan": "^2.0@stable"
 	},
 	"conflict": {
 		"nette/di": "<3.0"

tracy-2.11.x/examples/dump.php

@@ -35,13 +35,23 @@
 echo "<h2>Objects</h2>\n";
 echo "<p>Hover over the name <code>\$baz</code> to see property declaring class and over the hash <code>#5</code> to see same objects.</p>\n";
 
+enum Suit
+{
+	case Clubs;
+	case Diamonds;
+	case Hearts;
+	case Spades;
+}
+
 class ParentClass
 {
 	public $foo = [10, 20];
 
 	protected $bar = 30;
 
 	private $baz = 'parent';
+
+	public Suit $enum = Suit::Clubs;
 }
 
 #[\AllowDynamicProperties]
@@ -87,7 +97,8 @@ class ChildClass extends ParentClass
 
 $arr = [
 	fopen(__FILE__, 'r'),
-	new class {},
+	new class {
+},
 	function ($x, $y) use (&$arr, $obj) {},
 ];
 

tracy-2.11.x/src/Bridges/Nette/Bridge.php

@@ -24,11 +24,12 @@ class Bridge
 	public static function initialize(): void
 	{
 		$blueScreen = Tracy\Debugger::getBlueScreen();
-		$blueScreen->addAction([self::class, 'renderMemberAccessException']);
-		$blueScreen->addPanel([self::class, 'renderNeonError']);
+		$blueScreen->addAction(self::renderMemberAccessException(...));
+		$blueScreen->addPanel(self::renderNeonError(...));
 	}
 
 
+	/** @return array{link: string, label: string}|null */
 	public static function renderMemberAccessException(?\Throwable $e): ?array
 	{
 		if (!$e instanceof Nette\MemberAccessException && !$e instanceof \LogicException) {
@@ -39,7 +40,7 @@ public static function renderMemberAccessException(?\Throwable $e): ?array
 		do {
 			$loc = array_shift($trace);
 		} while (($loc['class'] ?? null) === Nette\Utils\ObjectHelpers::class);
-		if (!isset($loc['file'])) {
+		if (!isset($loc['file'], $loc['line'])) {
 			return null;
 		}
 
@@ -61,6 +62,7 @@ public static function renderMemberAccessException(?\Throwable $e): ?array
 	}
 
 
+	/** @return array{tab: string, panel: string}|null */
 	public static function renderNeonError(?\Throwable $e): ?array
 	{
 		if (!$e instanceof Nette\Neon\Exception || !preg_match('#line (\d+)#', $e->getMessage(), $m)) {
@@ -70,7 +72,7 @@ public static function renderNeonError(?\Throwable $e): ?array
 			?? Helpers::findTrace($e->getTrace(), [Nette\DI\Config\Adapters\NeonAdapter::class, 'load'])
 		) {
 			$panel = '<p><b>File:</b> ' . Helpers::editorLink($trace['args'][0], (int) $m[1]) . '</p>'
-				. self::highlightNeon(file_get_contents($trace['args'][0]), (int) $m[1]);
+				. self::highlightNeon((string) file_get_contents($trace['args'][0]), (int) $m[1]);
 
 		} elseif ($trace = Helpers::findTrace($e->getTrace(), [Nette\Neon\Decoder::class, 'decode'])) {
 			$panel = self::highlightNeon($trace['args'][0], (int) $m[1]);

tracy-2.11.x/src/Bridges/Nette/MailSender.php

@@ -18,20 +18,13 @@
  */
 class MailSender
 {
-	private Nette\Mail\Mailer $mailer;
-
-	/** sender of email notifications */
-	private ?string $fromEmail = null;
-
-	/** actual host on which notification occurred */
-	private ?string $host = null;
-
-
-	public function __construct(Nette\Mail\Mailer $mailer, ?string $fromEmail = null, ?string $host = null)
-	{
-		$this->mailer = $mailer;
-		$this->fromEmail = $fromEmail;
-		$this->host = $host;
+	public function __construct(
+		private readonly Nette\Mail\Mailer $mailer,
+		/** sender of email notifications */
+		private readonly ?string $fromEmail = null,
+		/** actual host on which notification occurred */
+		private readonly ?string $host = null,
+	) {
 	}
 
 
@@ -42,7 +35,7 @@ public function send(mixed $message, string $email): void
 		$mail = new Nette\Mail\Message;
 		$mail->setHeader('X-Mailer', 'Tracy');
 		if ($this->fromEmail || Nette\Utils\Validators::isEmail("noreply@$host")) {
-			$mail->setFrom($this->fromEmail ?: "noreply@$host");
+			$mail->setFrom($this->fromEmail ?? "noreply@$host");
 		}
 
 		foreach (explode(',', $email) as $item) {

tracy-2.11.x/src/Bridges/Nette/TracyExtension.php

@@ -25,8 +25,8 @@ class TracyExtension extends Nette\DI\CompilerExtension
 
 
 	public function __construct(
-		private bool $debugMode = false,
-		private bool $cliMode = false,
+		private readonly bool $debugMode = false,
+		private readonly bool $cliMode = false,
 	) {
 	}
 
@@ -79,6 +79,9 @@ public function loadConfiguration(): void
 
 	public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 	{
+		$config = $this->config;
+		\assert($config instanceof \stdClass);
+
 		$initialize = $this->initialization ?? new Nette\PhpGenerator\Closure;
 		$initialize->addBody('if (!Tracy\Debugger::isEnabled()) { return; }');
 
@@ -93,7 +96,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 			$initialize->addBody('Tracy\Debugger::setLogger($logger);');
 		}
 
-		$options = (array) $this->config;
+		$options = (array) $config;
 		unset($options['bar'], $options['blueScreen'], $options['netteMailer']);
 
 		foreach (['logSeverity', 'strictMode', 'scream'] as $key) {
@@ -105,7 +108,11 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 		foreach ($options as $key => $value) {
 			if ($value !== null) {
 				$tbl = [
-					'keysToHide' => 'array_push(Tracy\Debugger::getBlueScreen()->keysToHide, ... ?)',
+					'keysToHide' => <<<'XX'
+						$keysToHide = ?;
+						array_push(Tracy\Debugger::$keysToHide, ...$keysToHide);
+						array_push(Tracy\Debugger::getBlueScreen()->keysToHide, ...$keysToHide);
+						XX,
 					'fromEmail' => 'if ($logger instanceof Tracy\Logger) $logger->fromEmail = ?',
 					'emailSnooze' => 'if ($logger instanceof Tracy\Logger) $logger->emailSnooze = ?',
 				];
@@ -116,9 +123,9 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 			}
 		}
 
-		if ($this->config->netteMailer && $builder->getByType(Nette\Mail\IMailer::class)) {
+		if ($config->netteMailer && $builder->getByType(Nette\Mail\IMailer::class)) {
 			$params = [];
-			$params['fromEmail'] = $this->config->fromEmail;
+			$params['fromEmail'] = $config->fromEmail;
 			if (class_exists(Nette\Http\Request::class)) {
 				$params['host'] = new Statement('$this->getByType(?, false)\?->getUrl()->getHost()', [Nette\Http\Request::class]);
 			}
@@ -129,8 +136,8 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 		}
 
 		if ($this->debugMode) {
-			foreach ($this->config->bar as $item) {
-				if (is_string($item) && substr($item, 0, 1) === '@') {
+			foreach ($config->bar as $item) {
+				if (is_string($item) && str_starts_with($item, '@')) {
 					$item = new Statement(['@' . $builder::THIS_CONTAINER, 'getService'], [substr($item, 1)]);
 				} elseif (is_string($item)) {
 					$item = new Statement($item);
@@ -152,7 +159,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 			}
 		}
 
-		foreach ($this->config->blueScreen as $item) {
+		foreach ($config->blueScreen as $item) {
 			$initialize->addBody($builder->formatPhp(
 				'$this->getService(?)->addPanel(?);',
 				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item]),

tracy-2.11.x/src/Bridges/Psr/PsrToTracyLoggerAdapter.php

@@ -31,12 +31,12 @@ class PsrToTracyLoggerAdapter implements Tracy\ILogger
 
 
 	public function __construct(
-		private Psr\Log\LoggerInterface $psrLogger,
+		private readonly Psr\Log\LoggerInterface $psrLogger,
 	) {
 	}
 
 
-	public function log(mixed $value, string $level = self::INFO)
+	public function log(mixed $value, string $level = self::INFO): void
 	{
 		if ($value instanceof \Throwable) {
 			$message = get_debug_type($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();

tracy-2.11.x/src/Bridges/Psr/TracyToPsrLoggerAdapter.php

@@ -32,11 +32,12 @@ class TracyToPsrLoggerAdapter extends Psr\Log\AbstractLogger
 
 
 	public function __construct(
-		private Tracy\ILogger $tracyLogger,
+		private readonly Tracy\ILogger $tracyLogger,
 	) {
 	}
 
 
+	/** @param string|\Stringable $message */
 	public function log($level, $message, array $context = []): void
 	{
 		$level = self::LevelMap[$level] ?? Tracy\ILogger::ERROR;

tracy-2.11.x/src/Tracy/Bar/Bar.php

@@ -24,9 +24,8 @@ class Bar
 
 	/**
 	 * Add custom panel.
-	 * @return static
 	 */
-	public function addPanel(IBarPanel $panel, ?string $id = null): self
+	public function addPanel(IBarPanel $panel, ?string $id = null): static
 	{
 		if ($id === null) {
 			$c = 0;
@@ -105,13 +104,14 @@ public function render(DeferredContent $defer): void
 			} else {
 				$nonceAttr = Helpers::getNonceAttr();
 				$async = false;
-				Debugger::removeOutputBuffers(false);
+				Debugger::removeOutputBuffers(errorOccurred: false);
 				require __DIR__ . '/assets/loader.phtml';
 			}
 		}
 	}
 
 
+	/** @return array{bar: string, panels: string} */
 	private function renderPartial(string $type, string $suffix = ''): array
 	{
 		$panels = $this->renderPanels($suffix);
@@ -127,12 +127,15 @@ private function renderPartial(string $type, string $suffix = ''): array
 	}
 
 
+	/** @return \stdClass[] */
 	private function renderPanels(string $suffix = ''): array
 	{
-		set_error_handler(function (int $severity, string $message, string $file, int $line) {
+		set_error_handler(function (int $severity, string $message, string $file, int $line): bool {
 			if (error_reporting() & $severity) {
 				throw new \ErrorException($message, 0, $severity, $file, $line);
 			}
+
+			return true;
 		});
 
 		$obLevel = ob_get_level();