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.5',
+            'version' => '4.27.6',
             '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',
@@ -2669,6 +2669,9 @@ private function getallheaders() {
      * PUBLIC STATIC HELPER FUNCTIONS
      */
 
+    public static function isAjax() {
+        return isset($_SERVER['HTTP_X_TRACY_AJAX']) && preg_match('#^\w{10,15}$#D', $_SERVER['HTTP_X_TRACY_AJAX']);
+    }
 
     /**
      * is the provided string a valid json string?
@@ -2898,8 +2901,8 @@ public static function getDataValue($property) {
      */
     public static function isAdditionalBar() {
         $isRedirect = preg_match('#^Location:#im', implode("\n", headers_list()));
-        if(Helpers::isAjax() || $isRedirect) {
-            return Helpers::isAjax() ? 'ajax' : 'redirect';
+        if(static::isAjax() || $isRedirect) {
+            return static::isAjax() ? 'ajax' : 'redirect';
         }
         else {
             return false;

tracy-2.11.x/composer.json

@@ -27,7 +27,9 @@
 		"nette/tester": "^2.6",
 		"latte/latte": "^2.5 || ^3.0",
 		"psr/log": "^1.0 || ^2.0 || ^3.0",
-		"phpstan/phpstan": "^2.0@stable"
+		"phpstan/phpstan": "^2.1@stable",
+		"phpstan/extension-installer": "^1.4@stable",
+		"nette/phpstan-rules": "^1.0"
 	},
 	"conflict": {
 		"nette/di": "<3.0"
@@ -48,5 +50,10 @@
 		"branch-alias": {
 			"dev-master": "2.11-dev"
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"phpstan/extension-installer": true
+		}
 	}
 }

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

@@ -46,16 +46,12 @@ public static function renderMemberAccessException(?\Throwable $e): ?array
 
 		$loc = Tracy\Debugger::mapSource($loc['file'], $loc['line']) ?? $loc;
 		if (preg_match('#Cannot (?:read|write to) an undeclared property .+::\$(\w+), did you mean \$(\w+)\?#A', $e->getMessage(), $m)) {
-			return [
-				'link' => Helpers::editorUri($loc['file'], $loc['line'], 'fix', '->' . $m[1], '->' . $m[2]),
-				'label' => 'fix it',
-			];
+			$link = Helpers::editorUri($loc['file'], $loc['line'], 'fix', '->' . $m[1], '->' . $m[2]);
+			return $link !== null ? ['link' => $link, 'label' => 'fix it'] : null;
 		} elseif (preg_match('#Call to undefined (static )?method .+::(\w+)\(\), did you mean (\w+)\(\)?#A', $e->getMessage(), $m)) {
 			$operator = $m[1] ? '::' : '->';
-			return [
-				'link' => Helpers::editorUri($loc['file'], $loc['line'], 'fix', $operator . $m[2] . '(', $operator . $m[3] . '('),
-				'label' => 'fix it',
-			];
+			$link = Helpers::editorUri($loc['file'], $loc['line'], 'fix', $operator . $m[2] . '(', $operator . $m[3] . '(');
+			return $link !== null ? ['link' => $link, 'label' => 'fix it'] : null;
 		}
 
 		return null;

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

@@ -182,7 +182,8 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 	private function parseErrorSeverity(string|array $value): int
 	{
 		$value = implode('|', (array) $value);
-		$res = (int) @parse_ini_string('e = ' . $value)['e']; // @ may fail
+		$ini = @parse_ini_string('e = ' . $value); // @ may fail
+		$res = (int) ($ini['e'] ?? 0);
 		if (!$res) {
 			throw new Nette\InvalidStateException("Syntax error in expression '$value'");
 		}

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

@@ -60,9 +60,8 @@ public function renderLoader(DeferredContent $defer): void
 
 		$this->loaderRendered = true;
 		$requestId = $defer->getRequestId();
-		$nonceAttr = Helpers::getNonceAttr();
 		$async = true;
-		require __DIR__ . '/assets/loader.phtml';
+		require __DIR__ . '/dist/loader.phtml';
 	}
 
 
@@ -74,7 +73,7 @@ public function render(DeferredContent $defer): void
 		$redirectQueue = &$defer->getItems('redirect');
 		$requestId = $defer->getRequestId();
 
-		if (Helpers::isAjax()) {
+		if ($defer->isDeferred()) {
 			if ($defer->isAvailable()) {
 				$defer->addSetup('Tracy.Debug.loadAjax', $this->renderPartial('ajax', '-ajax:' . $requestId));
 			}
@@ -102,10 +101,9 @@ public function render(DeferredContent $defer): void
 				$defer->addSetup('Tracy.Debug.init', $content);
 
 			} else {
-				$nonceAttr = Helpers::getNonceAttr();
 				$async = false;
 				Debugger::removeOutputBuffers(errorOccurred: false);
-				require __DIR__ . '/assets/loader.phtml';
+				require __DIR__ . '/dist/loader.phtml';
 			}
 		}
 	}
@@ -118,16 +116,16 @@ private function renderPartial(string $type, string $suffix = ''): array
 
 		return [
 			'bar' => Helpers::capture(function () use ($type, $panels) {
-				require __DIR__ . '/assets/bar.phtml';
+				require __DIR__ . '/dist/bar.phtml';
 			}),
 			'panels' => Helpers::capture(function () use ($type, $panels) {
-				require __DIR__ . '/assets/panels.phtml';
+				require __DIR__ . '/dist/panels.phtml';
 			}),
 		];
 	}
 
 
-	/** @return \stdClass[] */
+	/** @return list<\stdClass> */
 	private function renderPanels(string $suffix = ''): array
 	{
 		set_error_handler(function (int $severity, string $message, string $file, int $line): bool {

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

@@ -33,7 +33,7 @@ public function getTab(): string
 	{
 		return Helpers::capture(function () {
 			$data = $this->data;
-			require __DIR__ . "/panels/{$this->id}.tab.phtml";
+			require __DIR__ . "/dist/{$this->id}.tab.phtml";
 		});
 	}
 
@@ -44,9 +44,9 @@ public function getTab(): string
 	public function getPanel(): string
 	{
 		return Helpers::capture(function () {
-			if (is_file(__DIR__ . "/panels/{$this->id}.panel.phtml")) {
+			if (is_file(__DIR__ . "/dist/{$this->id}.panel.phtml")) {
 				$data = $this->data;
-				require __DIR__ . "/panels/{$this->id}.panel.phtml";
+				require __DIR__ . "/dist/{$this->id}.panel.phtml";
 			}
 		});
 	}

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

@@ -17,13 +17,13 @@ interface IBarPanel
 {
 	/**
 	 * Renders HTML code for custom tab.
-	 * @return string
+	 * @return ?string
 	 */
 	function getTab();
 
 	/**
 	 * Renders HTML code for custom panel.
-	 * @return string
+	 * @return ?string
 	 */
 	function getPanel();
 }