New StreamLogger & MultiLogger

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=8.0 <8.3",
+		"php": ">=7.2 <8.3",
 		"ext-session": "*",
 		"ext-json": "*"
 	},
@@ -42,7 +42,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.10-dev"
+			"dev-master": "3.0-dev"
 		}
 	}
 }

examples/assets/style.css

@@ -22,10 +22,8 @@ h2 {
 	font-size: 140%;
 }
 
-pre.tracy-dump {
+tracy-dump {
 	border: 1px solid silver;
-	padding: 1em;
-	margin: 1em 0;
 }
 
 a {

readme.md

@@ -49,7 +49,8 @@ Alternatively, you can download the whole package or [tracy.phar](https://github
 
 | Tracy     | compatible with PHP | compatible with browsers
 |-----------|---------------|----------
-| Tracy 2.10| PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 13.1+ and iOS Safari 13.4+
+| Tracy 3.0 | PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 15.4+ and iOS Safari 15.4+
+| Tracy 2.10| PHP 8.0 – 8.2 | Chrome 64+, Firefox 69+, Safari 15.4+ and iOS Safari 15.4+
 | Tracy 2.9 | PHP 7.2 – 8.2 | Chrome 64+, Firefox 69+, Safari 13.1+ and iOS Safari 13.4+
 | Tracy 2.8 | PHP 7.2 – 8.1 | Chrome 55+, Firefox 53+, Safari 11+ and iOS Safari 11+
 | Tracy 2.7 | PHP 7.1 – 8.0 | Chrome 55+, Firefox 53+, MS Edge 16+, Safari 11+ and iOS Safari 11+
@@ -144,22 +145,22 @@ In order to detect misspellings when assigning to an object, we use [trait Nette
 Content Security Policy
 -----------------------
 
-If your site uses Content Security Policy, you'll need to add `'nonce-<value>'` to `script-src` for Tracy to work properly. Some 3rd plugins may require additional directives.
+If your site uses Content Security Policy, you'll need to add `'nonce-<value>'` and `'strict-dynamic'` to `script-src` for Tracy to work properly. Some 3rd plugins may require additional directives.
 Nonce is not supported in the `style-src` directive, if you use this directive you need to add `'unsafe-inline'`, but this should be avoided in production mode.
 
 Configuration example for [Nette Framework](https://nette.org):
 
 ```neon
 http:
 	csp:
-		script-src: nonce
+		script-src: [nonce, strict-dynamic]
 ```
 
 Example in pure PHP:
 
 ```php
 $nonce = base64_encode(random_bytes(20));
-header("Content-Security-Policy: script-src 'nonce-$nonce';");
+header("Content-Security-Policy: script-src 'nonce-$nonce' 'strict-dynamic';");
 ```
 
 
@@ -264,6 +265,23 @@ If you use the Nette Framework, you can set this and others in the configuration
 To protect your e-mail box from flood, Tracy sends **only one message** and creates a file `email-sent`. When a developer receives the e-mail notification, he checks the log, corrects his application and deletes the `email-sent` monitoring file. This activates the e-mail sending again.
 
 
+Monolog integration
+-------------------
+
+This package provides a PSR-3 adapter, allowing for integration of [monolog/monolog](https://github.com/Seldaek/monolog).
+
+```php
+$monolog = new Monolog\Logger('main-channel');
+$monolog->pushHandler(new Monolog\Handler\StreamHandler($logFilePath, Monolog\Logger::DEBUG));
+
+$tracyLogger = new Tracy\Bridges\Psr\PsrToTracyLoggerAdapter($monolog);
+Debugger::setLogger($tracyLogger);
+Debugger::enable();
+
+Debugger::log('info'); // writes: [<TIMESTAMP>] main-channel.INFO: info [] []
+Debugger::log('warning', Debugger::WARNING); // writes: [<TIMESTAMP>] main-channel.WARNING: warning [] []
+```
+
 Variable dumping
 ----------------
 
@@ -343,35 +361,6 @@ echo Debugger::timer(); // elapsed time in seconds
 ```
 
 
-FireLogger
-----------
-
-You cannot always send debugging information to the browser window. This applies to AJAX requests or generating XML files to output. In such cases, you can send the messages by a separate channel into FireLogger. Error, Notice and Warning levels are sent to FireLogger window automatically. It is also possible to log suppressed exceptions in running application when attention to them is important.
-
-How to do it?
-
-- install extension [FireLogger for Chrome](https://chrome.google.com/webstore/detail/firelogger-for-chrome/hmagilfopmdjkeomnjpchokglfdfjfeh)
-- turn on Chrome DevTools (using Ctrl-Shift-I key) and open Console
-
-Navigate to the [demo page](https://examples.nette.org/tracy/) and you will see messages sent from PHP.
-
-Because Tracy\Debugger communicates with FireLogger via HTTP headers, you must call the logging function before the PHP script sends anything to output. It is also possible to enable output buffering and delay the output.
-
-```php
-use Tracy\Debugger;
-
-Debugger::fireLog('Hello World'); // send string into FireLogger console
-
-Debugger::fireLog($_SERVER); // or even arrays and objects
-
-Debugger::fireLog(new Exception('Test Exception')); // or exceptions
-```
-
-The result looks like this:
-
-![FireLogger](https://nette.github.io/tracy/images/tracy-firelogger.png)
-
-
 Custom Logger
 -------------
 

src/Bridges/Nette/Bridge.php

@@ -9,97 +9,25 @@
 
 namespace Tracy\Bridges\Nette;
 
-use Latte;
 use Nette;
 use Tracy;
 use Tracy\BlueScreen;
 use Tracy\Helpers;
 
 
 /**
- * Bridge for NEON & Latte.
+ * Bridge for NEON.
  */
 class Bridge
 {
 	public static function initialize(): void
 	{
 		$blueScreen = Tracy\Debugger::getBlueScreen();
-		if (!class_exists(Latte\Bridges\Tracy\BlueScreenPanel::class)) {
-			$blueScreen->addPanel([self::class, 'renderLatteError']);
-			$blueScreen->addAction([self::class, 'renderLatteUnknownMacro']);
-			$blueScreen->addFileGenerator(function (string $file) {
-				return substr($file, -6) === '.latte'
-					? "{block content}\n\$END\$"
-					: null;
-			});
-			Tracy\Debugger::addSourceMapper([self::class, 'mapLatteSourceCode']);
-		}
-
 		$blueScreen->addAction([self::class, 'renderMemberAccessException']);
 		$blueScreen->addPanel([self::class, 'renderNeonError']);
 	}
 
 
-	public static function renderLatteError(?\Throwable $e): ?array
-	{
-		if ($e instanceof Latte\CompileException && $e->sourceName) {
-			return [
-				'tab' => 'Template',
-				'panel' => (preg_match('#\n|\?#', $e->sourceName)
-						? ''
-						: '<p>'
-							. (@is_file($e->sourceName) // @ - may trigger error
-								? '<b>File:</b> ' . Helpers::editorLink($e->sourceName, $e->sourceLine)
-								: '<b>' . htmlspecialchars($e->sourceName . ($e->sourceLine ? ':' . $e->sourceLine : '')) . '</b>')
-							. '</p>')
-					. BlueScreen::highlightFile($e->sourceCode, $e->sourceLine, 15, false),
-			];
-		}
-
-		return null;
-	}
-
-
-	public static function renderLatteUnknownMacro(?\Throwable $e): ?array
-	{
-		if (
-			$e instanceof Latte\CompileException
-			&& $e->sourceName
-			&& @is_file($e->sourceName) // @ - may trigger error
-			&& (preg_match('#Unknown macro (\{\w+)\}, did you mean (\{\w+)\}\?#A', $e->getMessage(), $m)
-				|| preg_match('#Unknown attribute (n:\w+), did you mean (n:\w+)\?#A', $e->getMessage(), $m))
-		) {
-			return [
-				'link' => Helpers::editorUri($e->sourceName, $e->sourceLine, 'fix', $m[1], $m[2]),
-				'label' => 'fix it',
-			];
-		}
-
-		return null;
-	}
-
-
-	/** @return array{file: string, line: int, label: string, active: bool} */
-	public static function mapLatteSourceCode(string $file, int $line): ?array
-	{
-		if (!strpos($file, '.latte--')) {
-			return null;
-		}
-
-		$lines = file($file);
-		if (
-			!preg_match('#^/(?:\*\*|/) source: (\S+\.latte)#m', implode('', array_slice($lines, 0, 10)), $m)
-			|| !@is_file($m[1]) // @ - may trigger error
-		) {
-			return null;
-		}
-
-		$file = $m[1];
-		$line = $line && preg_match('#/\* line (\d+) \*/#', $lines[$line - 1], $m) ? (int) $m[1] : 0;
-		return ['file' => $file, 'line' => $line, 'label' => 'Latte', 'active' => true];
-	}
-
-
 	public static function renderMemberAccessException(?\Throwable $e): ?array
 	{
 		if (!$e instanceof Nette\MemberAccessException && !$e instanceof \LogicException) {

src/Bridges/Nette/MailSender.php

@@ -20,11 +20,10 @@ class MailSender
 {
 	use Nette\SmartObject;
 
-	/** @var Nette\Mail\IMailer */
-	private $mailer;
+	private Nette\Mail\IMailer $mailer;
 
 	/** @var string|null sender of email notifications */
-	private $fromEmail;
+	private ?string $fromEmail = null;
 
 
 	public function __construct(Nette\Mail\IMailer $mailer, ?string $fromEmail = null)
@@ -34,10 +33,7 @@ public function __construct(Nette\Mail\IMailer $mailer, ?string $fromEmail = nul
 	}
 
 
-	/**
-	 * @param  mixed  $message
-	 */
-	public function send($message, string $email): void
+	public function send(mixed $message, string $email): void
 	{
 		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['SERVER_NAME'] ?? php_uname('n'));
 

src/Bridges/Nette/TracyExtension.php

@@ -22,17 +22,11 @@ class TracyExtension extends Nette\DI\CompilerExtension
 {
 	private const ErrorSeverityPattern = 'E_(?:ALL|PARSE|STRICT|RECOVERABLE_ERROR|(?:CORE|COMPILE)_(?:ERROR|WARNING)|(?:USER_)?(?:ERROR|WARNING|NOTICE|DEPRECATED))';
 
-	/** @var bool */
-	private $debugMode;
 
-	/** @var bool */
-	private $cliMode;
-
-
-	public function __construct(bool $debugMode = false, bool $cliMode = false)
-	{
-		$this->debugMode = $debugMode;
-		$this->cliMode = $cliMode;
+	public function __construct(
+		private bool $debugMode = false,
+		private bool $cliMode = false,
+	) {
 	}
 
 
@@ -116,7 +110,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 				];
 				$initialize->addBody($builder->formatPhp(
 					($tbl[$key] ?? 'Tracy\Debugger::$' . $key . ' = ?') . ';',
-					Nette\DI\Helpers::filterArguments([$value])
+					Nette\DI\Helpers::filterArguments([$value]),
 				));
 			}
 		}
@@ -130,14 +124,14 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		if ($this->debugMode) {
 			foreach ($this->config->bar as $item) {
 				if (is_string($item) && substr($item, 0, 1) === '@') {
-					$item = new Statement(['@' . $builder::THIS_CONTAINER, 'getService'], [substr($item, 1)]);
+					$item = new Statement(['@' . $builder::ThisContainer, 'getService'], [substr($item, 1)]);
 				} elseif (is_string($item)) {
 					$item = new Statement($item);
 				}
 
 				$initialize->addBody($builder->formatPhp(
 					'$this->getService(?)->addPanel(?);',
-					Nette\DI\Helpers::filterArguments([$this->prefix('bar'), $item])
+					Nette\DI\Helpers::filterArguments([$this->prefix('bar'), $item]),
 				));
 			}
 
@@ -154,7 +148,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		foreach ($this->config->blueScreen as $item) {
 			$initialize->addBody($builder->formatPhp(
 				'$this->getService(?)->addPanel(?);',
-				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item])
+				Nette\DI\Helpers::filterArguments([$this->prefix('blueScreen'), $item]),
 			));
 		}
 
@@ -171,7 +165,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	/**
 	 * @param  string|string[]  $value
 	 */
-	private function parseErrorSeverity($value): int
+	private function parseErrorSeverity(string|array $value): int
 	{
 		$value = implode('|', (array) $value);
 		$res = (int) @parse_ini_string('e = ' . $value)['e']; // @ may fail

src/Bridges/Psr/PsrToTracyLoggerAdapter.php

@@ -28,20 +28,17 @@ class PsrToTracyLoggerAdapter implements Tracy\ILogger
 		Tracy\ILogger::CRITICAL => Psr\Log\LogLevel::CRITICAL,
 	];
 
-	/** @var Psr\Log\LoggerInterface */
-	private $psrLogger;
 
-
-	public function __construct(Psr\Log\LoggerInterface $psrLogger)
-	{
-		$this->psrLogger = $psrLogger;
+	public function __construct(
+		private Psr\Log\LoggerInterface $psrLogger,
+	) {
 	}
 
 
-	public function log($value, $level = self::INFO)
+	public function log(mixed $value, string $level = self::INFO)
 	{
 		if ($value instanceof \Throwable) {
-			$message = Tracy\Helpers::getClass($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
+			$message = get_debug_type($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
 			$context = ['exception' => $value];
 
 		} elseif (!is_string($value)) {
@@ -56,7 +53,7 @@ public function log($value, $level = self::INFO)
 		$this->psrLogger->log(
 			self::LevelMap[$level] ?? Psr\Log\LogLevel::ERROR,
 			$message,
-			$context
+			$context,
 		);
 	}
 }