evolution-cms / evolution

core/vendor/symfony/translation/Tests/TranslatorTest.php

Doc Comments +3 added lines

@@ -537,6 +537,9 @@
 {
     protected $str;
 
+    /**
+     * @param string $str
+     */
     public function __construct($str)
     {
         $this->str = $str;

core/vendor/symfony/translation/Translator.php

Doc Comments +13 added lines, -1 removed lines

@@ -239,7 +239,7 @@ 
     /**
      * Gets the loaders.
      *
-     * @return array LoaderInterface[]
+     * @return LoaderInterface[] LoaderInterface[]
      */
     protected function getLoaders()
     {
@@ -298,6 +298,9 @@ 
         $this->catalogues[$locale] = include $cache->getPath();
     }
 
+    /**
+     * @param string $locale
+     */
     private function dumpCatalogue($locale, ConfigCacheInterface $cache): void
     {
         $this->initializeCatalogue($locale);
@@ -353,11 +356,17 @@ 
         return $fallbackContent;
     }
 
+    /**
+     * @param string $locale
+     */
     private function getCatalogueCachePath($locale)
     {
         return $this->cacheDir.'/catalogue.'.$locale.'.'.strtr(substr(base64_encode(hash('sha256', serialize($this->fallbackLocales), true)), 0, 7), '/', '_').'.php';
     }
 
+    /**
+     * @param string $locale
+     */
     private function doLoadCatalogue($locale): void
     {
         $this->catalogues[$locale] = new MessageCatalogue($locale);
@@ -372,6 +381,9 @@ 
         }
     }
 
+    /**
+     * @param string $locale
+     */
     private function loadFallbackCatalogues($locale): void
     {
         $current = $this->catalogues[$locale];

Spacing +1 added lines, -1 removed lines

@@ -284,7 +284,7 @@
 
         $this->assertValidLocale($locale);
         $cache = $this->getConfigCacheFactory()->cache($this->getCatalogueCachePath($locale),
-            function (ConfigCacheInterface $cache) use ($locale) {
+            function(ConfigCacheInterface $cache) use ($locale) {
                 $this->dumpCatalogue($locale, $cache);
             }
         );

Braces +1 added lines, -1 removed lines

@@ -284,7 +284,7 @@
 
         $this->assertValidLocale($locale);
         $cache = $this->getConfigCacheFactory()->cache($this->getCatalogueCachePath($locale),
-            function (ConfigCacheInterface $cache) use ($locale) {
+            function (ConfigCacheInterface $cache) use ($locale){
                 $this->dumpCatalogue($locale, $cache);
             }
         );

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
 %s
 return \$catalogue;
 
-EOF
+eof
             ,
             $locale,
             var_export($this->catalogues[$locale]->all(), true),
@@ -338,7 +338,7 @@ 
 $catalogue%s = new MessageCatalogue('%s', %s);
 $catalogue%s->addFallbackCatalogue($catalogue%s);
 
-EOF
+eof
                 ,
                 $fallbackSuffix,
                 $fallback,

core/vendor/symfony/translation/TranslatorInterface.php

Doc Comments +1 added lines

@@ -55,6 +55,7 @@
      * @param string $locale The locale
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
+     * @return boolean|null
      */
     public function setLocale($locale);
 

core/vendor/symfony/translation/Writer/TranslationWriterInterface.php

Doc Comments +1 added lines

@@ -29,6 +29,7 @@
      * @param array            $options   Options that are passed to the dumper
      *
      * @throws InvalidArgumentException
+     * @return void
      */
     public function write(MessageCatalogue $catalogue, $format, $options = array());
 }

core/vendor/tracy/tracy/examples/exception.php

Doc Comments +7 added lines

@@ -23,12 +23,19 @@
 	}
 
 
+	/**
+	 * @param boolean $arg1
+	 * @param boolean $arg2
+	 */
 	public function second($arg1, $arg2)
 	{
 		self::third([1, 2, 3]);
 	}
 
 
+	/**
+	 * @param integer[] $arg1
+	 */
 	public static function third($arg1)
 	{
 		throw new Exception('The my exception', 123);

Indentation +15 added lines, -15 removed lines

@@ -17,34 +17,34 @@
 
 class DemoClass
 {
-	public function first($arg1, $arg2)
-	{
-		$this->second(true, false);
-	}
+    public function first($arg1, $arg2)
+    {
+        $this->second(true, false);
+    }
 
 
-	public function second($arg1, $arg2)
-	{
-		self::third([1, 2, 3]);
-	}
+    public function second($arg1, $arg2)
+    {
+        self::third([1, 2, 3]);
+    }
 
 
-	public static function third($arg1)
-	{
-		throw new Exception('The my exception', 123);
-	}
+    public static function third($arg1)
+    {
+        throw new Exception('The my exception', 123);
+    }
 }
 
 
 function demo($a, $b)
 {
-	$demo = new DemoClass;
-	$demo->first($a, $b);
+    $demo = new DemoClass;
+    $demo->first($a, $b);
 }
 
 
 if (Debugger::$productionMode) {
-	echo '<p><b>For security reasons, Tracy is visible only on localhost. Look into the source code to see how to enable Tracy.</b></p>';
+    echo '<p><b>For security reasons, Tracy is visible only on localhost. Look into the source code to see how to enable Tracy.</b></p>';
 }
 
 demo(10, 'any string');

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-require __DIR__ . '/../src/tracy.php';
+require __DIR__.'/../src/tracy.php';
 
 use Tracy\Debugger;
 
 // For security reasons, Tracy is visible only on localhost.
 // You may force Tracy to run in development mode by passing the Debugger::DEVELOPMENT instead of Debugger::DETECT.
-Debugger::enable(Debugger::DETECT, __DIR__ . '/log');
+Debugger::enable(Debugger::DETECT, __DIR__.'/log');
 
 ?>
 <!DOCTYPE html><link rel="stylesheet" href="assets/style.css">

core/vendor/tracy/tracy/examples/firelogger.php

Doc Comments +7 added lines

@@ -17,12 +17,19 @@
 }
 
 
+/**
+ * @param boolean $arg1
+ * @param boolean $arg2
+ */
 function second($arg1, $arg2)
 {
 	third([1, 2, 3]);
 }
 
 
+/**
+ * @param integer[] $arg1
+ */
 function third($arg1)
 {
 	throw new Exception('The my exception', 123);

Indentation +5 added lines, -5 removed lines

@@ -13,26 +13,26 @@
 
 function first($arg1, $arg2)
 {
-	second(true, false);
+    second(true, false);
 }
 
 
 function second($arg1, $arg2)
 {
-	third([1, 2, 3]);
+    third([1, 2, 3]);
 }
 
 
 function third($arg1)
 {
-	throw new Exception('The my exception', 123);
+    throw new Exception('The my exception', 123);
 }
 
 
 try {
-	first(10, 'any string');
+    first(10, 'any string');
 } catch (Exception $e) {
-	Debugger::fireLog($e);
+    Debugger::fireLog($e);
 }
 
 ?>

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/../src/tracy.php';
+require __DIR__.'/../src/tracy.php';
 
 use Tracy\Debugger;
 

core/vendor/tracy/tracy/src/Tracy/Bar.php

Doc Comments +1 added lines

@@ -141,6 +141,7 @@
 
 
 	/**
+	 * @param string $suffix
 	 * @return array
 	 */
 	private function renderPanels($suffix = null)

Indentation +234 added lines, -234 removed lines

@@ -13,233 +13,233 @@ 
  */
 class Bar
 {
-	/** @var IBarPanel[] */
-	private $panels = [];
-
-	/** @var bool  initialized by dispatchAssets() */
-	private $useSession = false;
-
-	/** @var string|NULL  generated by renderLoader() */
-	private $contentId;
-
-
-	/**
-	 * Add custom panel.
-	 * @param  IBarPanel  $panel
-	 * @param  string  $id
-	 * @return static
-	 */
-	public function addPanel(IBarPanel $panel, $id = null)
-	{
-		if ($id === null) {
-			$c = 0;
-			do {
-				$id = get_class($panel) . ($c++ ? "-$c" : '');
-			} while (isset($this->panels[$id]));
-		}
-		$this->panels[$id] = $panel;
-		return $this;
-	}
-
-
-	/**
-	 * Returns panel with given id
-	 * @param  string  $id
-	 * @return IBarPanel|null
-	 */
-	public function getPanel($id)
-	{
-		return isset($this->panels[$id]) ? $this->panels[$id] : null;
-	}
-
-
-	/**
-	 * Renders loading <script>
-	 * @return void
-	 */
-	public function renderLoader()
-	{
-		if (!$this->useSession) {
-			throw new \LogicException('Start session before Tracy is enabled.');
-		}
-		$contentId = $this->contentId = $this->contentId ?: substr(md5(uniqid('', true)), 0, 10);
-		$nonce = Helpers::getNonce();
-		$async = true;
-		require __DIR__ . '/assets/Bar/loader.phtml';
-	}
-
-
-	/**
-	 * Renders debug bar.
-	 * @return void
-	 */
-	public function render()
-	{
-		$useSession = $this->useSession && session_status() === PHP_SESSION_ACTIVE;
-		$redirectQueue = &$_SESSION['_tracy']['redirect'];
-
-		foreach (['bar', 'redirect', 'bluescreen'] as $key) {
-			$queue = &$_SESSION['_tracy'][$key];
-			$queue = array_slice((array) $queue, -10, null, true);
-			$queue = array_filter($queue, function ($item) {
-				return isset($item['time']) && $item['time'] > time() - 60;
-			});
-		}
-
-		$rows = [];
-
-		if (Helpers::isAjax()) {
-			if ($useSession) {
-				$rows[] = (object) ['type' => 'ajax', 'panels' => $this->renderPanels('-ajax')];
-				$contentId = $_SERVER['HTTP_X_TRACY_AJAX'] . '-ajax';
-				$_SESSION['_tracy']['bar'][$contentId] = ['content' => self::renderHtmlRows($rows), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
-			}
-
-		} elseif (preg_match('#^Location:#im', implode("\n", headers_list()))) { // redirect
-			if ($useSession) {
-				Dumper::fetchLiveData();
-				Dumper::$livePrefix = count($redirectQueue) . 'p';
-				$redirectQueue[] = [
-					'panels' => $this->renderPanels('-r' . count($redirectQueue)),
-					'dumps' => Dumper::fetchLiveData(),
-					'time' => time(),
-				];
-			}
-
-		} elseif (Helpers::isHtmlMode()) {
-			$rows[] = (object) ['type' => 'main', 'panels' => $this->renderPanels()];
-			$dumps = Dumper::fetchLiveData();
-			foreach (array_reverse((array) $redirectQueue) as $info) {
-				$rows[] = (object) ['type' => 'redirect', 'panels' => $info['panels']];
-				$dumps += $info['dumps'];
-			}
-			$redirectQueue = null;
-			$content = self::renderHtmlRows($rows);
-
-			if ($this->contentId) {
-				$_SESSION['_tracy']['bar'][$this->contentId] = ['content' => $content, 'dumps' => $dumps, 'time' => time()];
-			} else {
-				$contentId = substr(md5(uniqid('', true)), 0, 10);
-				$nonce = Helpers::getNonce();
-				$async = false;
-				require __DIR__ . '/assets/Bar/loader.phtml';
-			}
-		}
-	}
-
-
-	/**
-	 * @return string
-	 */
-	private static function renderHtmlRows(array $rows)
-	{
-		ob_start(function () {});
-		require __DIR__ . '/assets/Bar/panels.phtml';
-		require __DIR__ . '/assets/Bar/bar.phtml';
-		return Helpers::fixEncoding(ob_get_clean());
-	}
-
-
-	/**
-	 * @return array
-	 */
-	private function renderPanels($suffix = null)
-	{
-		set_error_handler(function ($severity, $message, $file, $line) {
-			if (error_reporting() & $severity) {
-				throw new \ErrorException($message, 0, $severity, $file, $line);
-			}
-		});
-
-		$obLevel = ob_get_level();
-		$panels = [];
-
-		foreach ($this->panels as $id => $panel) {
-			$idHtml = preg_replace('#[^a-z0-9]+#i', '-', $id) . $suffix;
-			try {
-				$tab = (string) $panel->getTab();
-				$panelHtml = $tab ? (string) $panel->getPanel() : null;
-				if ($tab && $panel instanceof \Nette\Diagnostics\IBarPanel) {
-					$e = new \Exception('Support for Nette\Diagnostics\IBarPanel is deprecated');
-				}
-
-			} catch (\Exception $e) {
-			} catch (\Throwable $e) {
-			}
-			if (isset($e)) {
-				while (ob_get_level() > $obLevel) { // restore ob-level if broken
-					ob_end_clean();
-				}
-				$idHtml = "error-$idHtml";
-				$tab = "Error in $id";
-				$panelHtml = "<h1>Error: $id</h1><div class='tracy-inner'>" . nl2br(Helpers::escapeHtml($e)) . '</div>';
-				unset($e);
-			}
-			$panels[] = (object) ['id' => $idHtml, 'tab' => $tab, 'panel' => $panelHtml];
-		}
-
-		restore_error_handler();
-		return $panels;
-	}
-
-
-	/**
-	 * Renders debug bar assets.
-	 * @return bool
-	 */
-	public function dispatchAssets()
-	{
-		$asset = isset($_GET['_tracy_bar']) ? $_GET['_tracy_bar'] : null;
-		if ($asset === 'js') {
-			header('Content-Type: application/javascript');
-			header('Cache-Control: max-age=864000');
-			header_remove('Pragma');
-			header_remove('Set-Cookie');
-			$this->renderAssets();
-			return true;
-		}
-
-		$this->useSession = session_status() === PHP_SESSION_ACTIVE;
-
-		if ($this->useSession && Helpers::isAjax()) {
-			header('X-Tracy-Ajax: 1'); // session must be already locked
-		}
-
-		if ($this->useSession && $asset && preg_match('#^content(-ajax)?\.(\w+)$#', $asset, $m)) {
-			$session = &$_SESSION['_tracy']['bar'][$m[2] . $m[1]];
-			header('Content-Type: application/javascript');
-			header('Cache-Control: max-age=60');
-			header_remove('Set-Cookie');
-			if (!$m[1]) {
-				$this->renderAssets();
-			}
-			if ($session) {
-				$method = $m[1] ? 'loadAjax' : 'init';
-				echo "Tracy.Debug.$method(", json_encode($session['content']), ', ', json_encode($session['dumps']), ');';
-				$session = null;
-			}
-			$session = &$_SESSION['_tracy']['bluescreen'][$m[2]];
-			if ($session) {
-				echo 'Tracy.BlueScreen.loadAjax(', json_encode($session['content']), ', ', json_encode($session['dumps']), ');';
-				$session = null;
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-
-	private function renderAssets()
-	{
-		$css = array_map('file_get_contents', array_merge([
-			__DIR__ . '/assets/Bar/bar.css',
-			__DIR__ . '/assets/Toggle/toggle.css',
-			__DIR__ . '/assets/Dumper/dumper.css',
-			__DIR__ . '/assets/BlueScreen/bluescreen.css',
-		], Debugger::$customCssFiles));
-
-		echo
+    /** @var IBarPanel[] */
+    private $panels = [];
+
+    /** @var bool  initialized by dispatchAssets() */
+    private $useSession = false;
+
+    /** @var string|NULL  generated by renderLoader() */
+    private $contentId;
+
+
+    /**
+     * Add custom panel.
+     * @param  IBarPanel  $panel
+     * @param  string  $id
+     * @return static
+     */
+    public function addPanel(IBarPanel $panel, $id = null)
+    {
+        if ($id === null) {
+            $c = 0;
+            do {
+                $id = get_class($panel) . ($c++ ? "-$c" : '');
+            } while (isset($this->panels[$id]));
+        }
+        $this->panels[$id] = $panel;
+        return $this;
+    }
+
+
+    /**
+     * Returns panel with given id
+     * @param  string  $id
+     * @return IBarPanel|null
+     */
+    public function getPanel($id)
+    {
+        return isset($this->panels[$id]) ? $this->panels[$id] : null;
+    }
+
+
+    /**
+     * Renders loading <script>
+     * @return void
+     */
+    public function renderLoader()
+    {
+        if (!$this->useSession) {
+            throw new \LogicException('Start session before Tracy is enabled.');
+        }
+        $contentId = $this->contentId = $this->contentId ?: substr(md5(uniqid('', true)), 0, 10);
+        $nonce = Helpers::getNonce();
+        $async = true;
+        require __DIR__ . '/assets/Bar/loader.phtml';
+    }
+
+
+    /**
+     * Renders debug bar.
+     * @return void
+     */
+    public function render()
+    {
+        $useSession = $this->useSession && session_status() === PHP_SESSION_ACTIVE;
+        $redirectQueue = &$_SESSION['_tracy']['redirect'];
+
+        foreach (['bar', 'redirect', 'bluescreen'] as $key) {
+            $queue = &$_SESSION['_tracy'][$key];
+            $queue = array_slice((array) $queue, -10, null, true);
+            $queue = array_filter($queue, function ($item) {
+                return isset($item['time']) && $item['time'] > time() - 60;
+            });
+        }
+
+        $rows = [];
+
+        if (Helpers::isAjax()) {
+            if ($useSession) {
+                $rows[] = (object) ['type' => 'ajax', 'panels' => $this->renderPanels('-ajax')];
+                $contentId = $_SERVER['HTTP_X_TRACY_AJAX'] . '-ajax';
+                $_SESSION['_tracy']['bar'][$contentId] = ['content' => self::renderHtmlRows($rows), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
+            }
+
+        } elseif (preg_match('#^Location:#im', implode("\n", headers_list()))) { // redirect
+            if ($useSession) {
+                Dumper::fetchLiveData();
+                Dumper::$livePrefix = count($redirectQueue) . 'p';
+                $redirectQueue[] = [
+                    'panels' => $this->renderPanels('-r' . count($redirectQueue)),
+                    'dumps' => Dumper::fetchLiveData(),
+                    'time' => time(),
+                ];
+            }
+
+        } elseif (Helpers::isHtmlMode()) {
+            $rows[] = (object) ['type' => 'main', 'panels' => $this->renderPanels()];
+            $dumps = Dumper::fetchLiveData();
+            foreach (array_reverse((array) $redirectQueue) as $info) {
+                $rows[] = (object) ['type' => 'redirect', 'panels' => $info['panels']];
+                $dumps += $info['dumps'];
+            }
+            $redirectQueue = null;
+            $content = self::renderHtmlRows($rows);
+
+            if ($this->contentId) {
+                $_SESSION['_tracy']['bar'][$this->contentId] = ['content' => $content, 'dumps' => $dumps, 'time' => time()];
+            } else {
+                $contentId = substr(md5(uniqid('', true)), 0, 10);
+                $nonce = Helpers::getNonce();
+                $async = false;
+                require __DIR__ . '/assets/Bar/loader.phtml';
+            }
+        }
+    }
+
+
+    /**
+     * @return string
+     */
+    private static function renderHtmlRows(array $rows)
+    {
+        ob_start(function () {});
+        require __DIR__ . '/assets/Bar/panels.phtml';
+        require __DIR__ . '/assets/Bar/bar.phtml';
+        return Helpers::fixEncoding(ob_get_clean());
+    }
+
+
+    /**
+     * @return array
+     */
+    private function renderPanels($suffix = null)
+    {
+        set_error_handler(function ($severity, $message, $file, $line) {
+            if (error_reporting() & $severity) {
+                throw new \ErrorException($message, 0, $severity, $file, $line);
+            }
+        });
+
+        $obLevel = ob_get_level();
+        $panels = [];
+
+        foreach ($this->panels as $id => $panel) {
+            $idHtml = preg_replace('#[^a-z0-9]+#i', '-', $id) . $suffix;
+            try {
+                $tab = (string) $panel->getTab();
+                $panelHtml = $tab ? (string) $panel->getPanel() : null;
+                if ($tab && $panel instanceof \Nette\Diagnostics\IBarPanel) {
+                    $e = new \Exception('Support for Nette\Diagnostics\IBarPanel is deprecated');
+                }
+
+            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
+            }
+            if (isset($e)) {
+                while (ob_get_level() > $obLevel) { // restore ob-level if broken
+                    ob_end_clean();
+                }
+                $idHtml = "error-$idHtml";
+                $tab = "Error in $id";
+                $panelHtml = "<h1>Error: $id</h1><div class='tracy-inner'>" . nl2br(Helpers::escapeHtml($e)) . '</div>';
+                unset($e);
+            }
+            $panels[] = (object) ['id' => $idHtml, 'tab' => $tab, 'panel' => $panelHtml];
+        }
+
+        restore_error_handler();
+        return $panels;
+    }
+
+
+    /**
+     * Renders debug bar assets.
+     * @return bool
+     */
+    public function dispatchAssets()
+    {
+        $asset = isset($_GET['_tracy_bar']) ? $_GET['_tracy_bar'] : null;
+        if ($asset === 'js') {
+            header('Content-Type: application/javascript');
+            header('Cache-Control: max-age=864000');
+            header_remove('Pragma');
+            header_remove('Set-Cookie');
+            $this->renderAssets();
+            return true;
+        }
+
+        $this->useSession = session_status() === PHP_SESSION_ACTIVE;
+
+        if ($this->useSession && Helpers::isAjax()) {
+            header('X-Tracy-Ajax: 1'); // session must be already locked
+        }
+
+        if ($this->useSession && $asset && preg_match('#^content(-ajax)?\.(\w+)$#', $asset, $m)) {
+            $session = &$_SESSION['_tracy']['bar'][$m[2] . $m[1]];
+            header('Content-Type: application/javascript');
+            header('Cache-Control: max-age=60');
+            header_remove('Set-Cookie');
+            if (!$m[1]) {
+                $this->renderAssets();
+            }
+            if ($session) {
+                $method = $m[1] ? 'loadAjax' : 'init';
+                echo "Tracy.Debug.$method(", json_encode($session['content']), ', ', json_encode($session['dumps']), ');';
+                $session = null;
+            }
+            $session = &$_SESSION['_tracy']['bluescreen'][$m[2]];
+            if ($session) {
+                echo 'Tracy.BlueScreen.loadAjax(', json_encode($session['content']), ', ', json_encode($session['dumps']), ');';
+                $session = null;
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+
+    private function renderAssets()
+    {
+        $css = array_map('file_get_contents', array_merge([
+            __DIR__ . '/assets/Bar/bar.css',
+            __DIR__ . '/assets/Toggle/toggle.css',
+            __DIR__ . '/assets/Dumper/dumper.css',
+            __DIR__ . '/assets/BlueScreen/bluescreen.css',
+        ], Debugger::$customCssFiles));
+
+        echo
 "(function(){
 	var el = document.createElement('style');
 	el.setAttribute('nonce', document.currentScript.getAttribute('nonce') || document.currentScript.nonce);
@@ -248,11 +248,11 @@ 
 	document.head.appendChild(el);})
 ();\n";
 
-		array_map('readfile', array_merge([
-			__DIR__ . '/assets/Bar/bar.js',
-			__DIR__ . '/assets/Toggle/toggle.js',
-			__DIR__ . '/assets/Dumper/dumper.js',
-			__DIR__ . '/assets/BlueScreen/bluescreen.js',
-		], Debugger::$customJsFiles));
-	}
+        array_map('readfile', array_merge([
+            __DIR__ . '/assets/Bar/bar.js',
+            __DIR__ . '/assets/Toggle/toggle.js',
+            __DIR__ . '/assets/Dumper/dumper.js',
+            __DIR__ . '/assets/BlueScreen/bluescreen.js',
+        ], Debugger::$customJsFiles));
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -34,7 +34,7 @@ 
 		if ($id === null) {
 			$c = 0;
 			do {
-				$id = get_class($panel) . ($c++ ? "-$c" : '');
+				$id = get_class($panel).($c++ ? "-$c" : '');
 			} while (isset($this->panels[$id]));
 		}
 		$this->panels[$id] = $panel;
@@ -65,7 +65,7 @@ 
 		$contentId = $this->contentId = $this->contentId ?: substr(md5(uniqid('', true)), 0, 10);
 		$nonce = Helpers::getNonce();
 		$async = true;
-		require __DIR__ . '/assets/Bar/loader.phtml';
+		require __DIR__.'/assets/Bar/loader.phtml';
 	}
 
 
@@ -81,7 +81,7 @@ 
 		foreach (['bar', 'redirect', 'bluescreen'] as $key) {
 			$queue = &$_SESSION['_tracy'][$key];
 			$queue = array_slice((array) $queue, -10, null, true);
-			$queue = array_filter($queue, function ($item) {
+			$queue = array_filter($queue, function($item){
 				return isset($item['time']) && $item['time'] > time() - 60;
 			});
 		}
@@ -91,16 +91,16 @@ 
 		if (Helpers::isAjax()) {
 			if ($useSession) {
 				$rows[] = (object) ['type' => 'ajax', 'panels' => $this->renderPanels('-ajax')];
-				$contentId = $_SERVER['HTTP_X_TRACY_AJAX'] . '-ajax';
+				$contentId = $_SERVER['HTTP_X_TRACY_AJAX'].'-ajax';
 				$_SESSION['_tracy']['bar'][$contentId] = ['content' => self::renderHtmlRows($rows), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
 			}
 
 		} elseif (preg_match('#^Location:#im', implode("\n", headers_list()))) { // redirect
 			if ($useSession) {
 				Dumper::fetchLiveData();
-				Dumper::$livePrefix = count($redirectQueue) . 'p';
+				Dumper::$livePrefix = count($redirectQueue).'p';
 				$redirectQueue[] = [
-					'panels' => $this->renderPanels('-r' . count($redirectQueue)),
+					'panels' => $this->renderPanels('-r'.count($redirectQueue)),
 					'dumps' => Dumper::fetchLiveData(),
 					'time' => time(),
 				];
@@ -122,7 +122,7 @@ 
 				$contentId = substr(md5(uniqid('', true)), 0, 10);
 				$nonce = Helpers::getNonce();
 				$async = false;
-				require __DIR__ . '/assets/Bar/loader.phtml';
+				require __DIR__.'/assets/Bar/loader.phtml';
 			}
 		}
 	}
@@ -133,9 +133,9 @@ 
 	 */
 	private static function renderHtmlRows(array $rows)
 	{
-		ob_start(function () {});
-		require __DIR__ . '/assets/Bar/panels.phtml';
-		require __DIR__ . '/assets/Bar/bar.phtml';
+		ob_start(function(){});
+		require __DIR__.'/assets/Bar/panels.phtml';
+		require __DIR__.'/assets/Bar/bar.phtml';
 		return Helpers::fixEncoding(ob_get_clean());
 	}
 
@@ -145,7 +145,7 @@ 
 	 */
 	private function renderPanels($suffix = null)
 	{
-		set_error_handler(function ($severity, $message, $file, $line) {
+		set_error_handler(function($severity, $message, $file, $line){
 			if (error_reporting() & $severity) {
 				throw new \ErrorException($message, 0, $severity, $file, $line);
 			}
@@ -155,7 +155,7 @@ 
 		$panels = [];
 
 		foreach ($this->panels as $id => $panel) {
-			$idHtml = preg_replace('#[^a-z0-9]+#i', '-', $id) . $suffix;
+			$idHtml = preg_replace('#[^a-z0-9]+#i', '-', $id).$suffix;
 			try {
 				$tab = (string) $panel->getTab();
 				$panelHtml = $tab ? (string) $panel->getPanel() : null;
@@ -172,7 +172,7 @@ 
 				}
 				$idHtml = "error-$idHtml";
 				$tab = "Error in $id";
-				$panelHtml = "<h1>Error: $id</h1><div class='tracy-inner'>" . nl2br(Helpers::escapeHtml($e)) . '</div>';
+				$panelHtml = "<h1>Error: $id</h1><div class='tracy-inner'>".nl2br(Helpers::escapeHtml($e)).'</div>';
 				unset($e);
 			}
 			$panels[] = (object) ['id' => $idHtml, 'tab' => $tab, 'panel' => $panelHtml];
@@ -206,7 +206,7 @@ 
 		}
 
 		if ($this->useSession && $asset && preg_match('#^content(-ajax)?\.(\w+)$#', $asset, $m)) {
-			$session = &$_SESSION['_tracy']['bar'][$m[2] . $m[1]];
+			$session = &$_SESSION['_tracy']['bar'][$m[2].$m[1]];
 			header('Content-Type: application/javascript');
 			header('Cache-Control: max-age=60');
 			header_remove('Set-Cookie');
@@ -233,10 +233,10 @@ 
 	private function renderAssets()
 	{
 		$css = array_map('file_get_contents', array_merge([
-			__DIR__ . '/assets/Bar/bar.css',
-			__DIR__ . '/assets/Toggle/toggle.css',
-			__DIR__ . '/assets/Dumper/dumper.css',
-			__DIR__ . '/assets/BlueScreen/bluescreen.css',
+			__DIR__.'/assets/Bar/bar.css',
+			__DIR__.'/assets/Toggle/toggle.css',
+			__DIR__.'/assets/Dumper/dumper.css',
+			__DIR__.'/assets/BlueScreen/bluescreen.css',
 		], Debugger::$customCssFiles));
 
 		echo
@@ -244,15 +244,15 @@ 
 	var el = document.createElement('style');
 	el.setAttribute('nonce', document.currentScript.getAttribute('nonce') || document.currentScript.nonce);
 	el.className='tracy-debug';
-	el.textContent=" . json_encode(preg_replace('#\s+#u', ' ', implode($css))) . ";
+	el.textContent=" . json_encode(preg_replace('#\s+#u', ' ', implode($css))).";
 	document.head.appendChild(el);})
 ();\n";
 
 		array_map('readfile', array_merge([
-			__DIR__ . '/assets/Bar/bar.js',
-			__DIR__ . '/assets/Toggle/toggle.js',
-			__DIR__ . '/assets/Dumper/dumper.js',
-			__DIR__ . '/assets/BlueScreen/bluescreen.js',
+			__DIR__.'/assets/Bar/bar.js',
+			__DIR__.'/assets/Toggle/toggle.js',
+			__DIR__.'/assets/Dumper/dumper.js',
+			__DIR__.'/assets/BlueScreen/bluescreen.js',
 		], Debugger::$customJsFiles));
 	}
 }

Braces +6 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 		foreach (['bar', 'redirect', 'bluescreen'] as $key) {
 			$queue = &$_SESSION['_tracy'][$key];
 			$queue = array_slice((array) $queue, -10, null, true);
-			$queue = array_filter($queue, function ($item) {
+			$queue = array_filter($queue, function ($item){
 				return isset($item['time']) && $item['time'] > time() - 60;
 			});
 		}
@@ -95,7 +95,8 @@ 
 				$_SESSION['_tracy']['bar'][$contentId] = ['content' => self::renderHtmlRows($rows), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
 			}
 
-		} elseif (preg_match('#^Location:#im', implode("\n", headers_list()))) { // redirect
+		} elseif (preg_match('#^Location:#im', implode("\n", headers_list()))) {
+// redirect
 			if ($useSession) {
 				Dumper::fetchLiveData();
 				Dumper::$livePrefix = count($redirectQueue) . 'p';
@@ -145,7 +146,7 @@ 
 	 */
 	private function renderPanels($suffix = null)
 	{
-		set_error_handler(function ($severity, $message, $file, $line) {
+		set_error_handler(function ($severity, $message, $file, $line){
 			if (error_reporting() & $severity) {
 				throw new \ErrorException($message, 0, $severity, $file, $line);
 			}
@@ -167,7 +168,8 @@ 
 			} catch (\Throwable $e) {
 			}
 			if (isset($e)) {
-				while (ob_get_level() > $obLevel) { // restore ob-level if broken
+				while (ob_get_level() > $obLevel) {
+// restore ob-level if broken
 					ob_end_clean();
 				}
 				$idHtml = "error-$idHtml";

core/vendor/tracy/tracy/src/Tracy/BlueScreen.php

Doc Comments +4 added lines

@@ -107,6 +107,10 @@
 	}
 
 
+	/**
+	 * @param \Throwable $exception
+	 * @param string $template
+	 */
 	private function renderTemplate($exception, $template, $toScreen = true)
 	{
 		$messageHtml = preg_replace(

Indentation +343 added lines, -343 removed lines

@@ -13,347 +13,347 @@
  */
 class BlueScreen
 {
-	/** @var string[] */
-	public $info = [];
-
-	/** @var string[] paths to be collapsed in stack trace (e.g. core libraries) */
-	public $collapsePaths = [];
-
-	/** @var int  */
-	public $maxDepth = 3;
-
-	/** @var int  */
-	public $maxLength = 150;
-
-	/** @var string[] */
-	public $keysToHide = ['password', 'passwd', 'pass', 'pwd', 'creditcard', 'credit card', 'cc', 'pin'];
-
-	/** @var callable[] */
-	private $panels = [];
-
-	/** @var callable[] functions that returns action for exceptions */
-	private $actions = [];
-
-
-	public function __construct()
-	{
-		$this->collapsePaths[] = preg_match('#(.+/vendor)/tracy/tracy/src/Tracy$#', strtr(__DIR__, '\\', '/'), $m)
-			? $m[1]
-			: __DIR__;
-	}
-
-
-	/**
-	 * Add custom panel.
-	 * @param  callable  $panel
-	 * @return static
-	 */
-	public function addPanel($panel)
-	{
-		if (!in_array($panel, $this->panels, true)) {
-			$this->panels[] = $panel;
-		}
-		return $this;
-	}
-
-
-	/**
-	 * Add action.
-	 * @param  callable  $action
-	 * @return static
-	 */
-	public function addAction($action)
-	{
-		$this->actions[] = $action;
-		return $this;
-	}
-
-
-	/**
-	 * Renders blue screen.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return void
-	 */
-	public function render($exception)
-	{
-		if (Helpers::isAjax() && session_status() === PHP_SESSION_ACTIVE) {
-			ob_start(function () {});
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/content.phtml');
-			$contentId = $_SERVER['HTTP_X_TRACY_AJAX'];
-			$_SESSION['_tracy']['bluescreen'][$contentId] = ['content' => ob_get_clean(), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
-
-		} else {
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml');
-		}
-	}
-
-
-	/**
-	 * Renders blue screen to file (if file exists, it will not be overwritten).
-	 * @param  \Exception|\Throwable  $exception
-	 * @param  string  $file file path
-	 * @return void
-	 */
-	public function renderToFile($exception, $file)
-	{
-		if ($handle = @fopen($file, 'x')) {
-			ob_start(); // double buffer prevents sending HTTP headers in some PHP
-			ob_start(function ($buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml', false);
-			ob_end_flush();
-			ob_end_clean();
-			fclose($handle);
-		}
-	}
-
-
-	private function renderTemplate($exception, $template, $toScreen = true)
-	{
-		$messageHtml = preg_replace(
-			'#\'\S[^\']*\S\'|"\S[^"]*\S"#U',
-			'<i>$0</i>',
-			htmlspecialchars((string) $exception->getMessage(), ENT_SUBSTITUTE, 'UTF-8')
-		);
-		$info = array_filter($this->info);
-		$source = Helpers::getSource();
-		$sourceIsUrl = preg_match('#^https?://#', $source);
-		$title = $exception instanceof \ErrorException
-			? Helpers::errorTypeToString($exception->getSeverity())
-			: Helpers::getClass($exception);
-		$lastError = $exception instanceof \ErrorException || $exception instanceof \Error ? null : error_get_last();
-
-		$keysToHide = array_flip(array_map('strtolower', $this->keysToHide));
-		$dump = function ($v, $k = null) use ($keysToHide) {
-			if (is_string($k) && isset($keysToHide[strtolower($k)])) {
-				$v = Dumper::HIDDEN_VALUE;
-			}
-			return Dumper::toHtml($v, [
-				Dumper::DEPTH => $this->maxDepth,
-				Dumper::TRUNCATE => $this->maxLength,
-				Dumper::LIVE => true,
-				Dumper::LOCATION => Dumper::LOCATION_CLASS,
-				Dumper::KEYS_TO_HIDE => $this->keysToHide,
-			]);
-		};
-		$css = array_map('file_get_contents', array_merge([
-			__DIR__ . '/assets/BlueScreen/bluescreen.css',
-		], Debugger::$customCssFiles));
-		$css = preg_replace('#\s+#u', ' ', implode($css));
-
-		$nonce = $toScreen ? Helpers::getNonce() : null;
-		$actions = $toScreen ? $this->renderActions($exception) : [];
-
-		require $template;
-	}
-
-
-	/**
-	 * @return \stdClass[]
-	 */
-	private function renderPanels($ex)
-	{
-		$obLevel = ob_get_level();
-		$res = [];
-		foreach ($this->panels as $callback) {
-			try {
-				$panel = call_user_func($callback, $ex);
-				if (empty($panel['tab']) || empty($panel['panel'])) {
-					continue;
-				}
-				$res[] = (object) $panel;
-				continue;
-			} catch (\Exception $e) {
-			} catch (\Throwable $e) {
-			}
-			while (ob_get_level() > $obLevel) { // restore ob-level if broken
-				ob_end_clean();
-			}
-			is_callable($callback, true, $name);
-			$res[] = (object) [
-				'tab' => "Error in panel $name",
-				'panel' => nl2br(Helpers::escapeHtml($e)),
-			];
-		}
-		return $res;
-	}
-
-
-	/**
-	 * @return array[]
-	 */
-	private function renderActions($ex)
-	{
-		$actions = [];
-		foreach ($this->actions as $callback) {
-			$action = call_user_func($callback, $ex);
-			if (!empty($action['link']) && !empty($action['label'])) {
-				$actions[] = $action;
-			}
-		}
-
-		if (property_exists($ex, 'tracyAction') && !empty($ex->tracyAction['link']) && !empty($ex->tracyAction['label'])) {
-			$actions[] = $ex->tracyAction;
-		}
-
-		if (preg_match('# ([\'"])(\w{3,}(?:\\\\\w{3,})+)\\1#i', $ex->getMessage(), $m)) {
-			$class = $m[2];
-			if (
-				!class_exists($class) && !interface_exists($class) && !trait_exists($class)
-				&& ($file = Helpers::guessClassFile($class)) && !is_file($file)
-			) {
-				$actions[] = [
-					'link' => Helpers::editorUri($file, 1, 'create'),
-					'label' => 'create class',
-				];
-			}
-		}
-
-		if (preg_match('# ([\'"])((?:/|[a-z]:[/\\\\])\w[^\'"]+\.\w{2,5})\\1#i', $ex->getMessage(), $m)) {
-			$file = $m[2];
-			$actions[] = [
-				'link' => Helpers::editorUri($file, 1, $label = is_file($file) ? 'open' : 'create'),
-				'label' => $label . ' file',
-			];
-		}
-
-		$query = ($ex instanceof \ErrorException ? '' : Helpers::getClass($ex) . ' ')
-			. preg_replace('#\'.*\'|".*"#Us', '', $ex->getMessage());
-		$actions[] = [
-			'link' => 'https://www.google.com/search?sourceid=tracy&q=' . urlencode($query),
-			'label' => 'search',
-			'external' => true,
-		];
-
-		if (
-			$ex instanceof \ErrorException
-			&& !empty($ex->skippable)
-			&& preg_match('#^https?://#', $source = Helpers::getSource())
-		) {
-			$actions[] = [
-				'link' => $source . (strpos($source, '?') ? '&' : '?') . '_tracy_skip_error',
-				'label' => 'skip error',
-			];
-		}
-		return $actions;
-	}
-
-
-	/**
-	 * Returns syntax highlighted source code.
-	 * @param  string  $file
-	 * @param  int  $line
-	 * @param  int  $lines
-	 * @return string|null
-	 */
-	public static function highlightFile($file, $line, $lines = 15, array $vars = null)
-	{
-		$source = @file_get_contents($file); // @ file may not exist
-		if ($source) {
-			$source = static::highlightPhp($source, $line, $lines, $vars);
-			if ($editor = Helpers::editorUri($file, $line)) {
-				$source = substr_replace($source, ' data-tracy-href="' . Helpers::escapeHtml($editor) . '"', 4, 0);
-			}
-			return $source;
-		}
-	}
-
-
-	/**
-	 * Returns syntax highlighted source code.
-	 * @param  string  $source
-	 * @param  int  $line
-	 * @param  int  $lines
-	 * @return string
-	 */
-	public static function highlightPhp($source, $line, $lines = 15, array $vars = null)
-	{
-		if (function_exists('ini_set')) {
-			ini_set('highlight.comment', '#998; font-style: italic');
-			ini_set('highlight.default', '#000');
-			ini_set('highlight.html', '#06B');
-			ini_set('highlight.keyword', '#D24; font-weight: bold');
-			ini_set('highlight.string', '#080');
-		}
-
-		$source = str_replace(["\r\n", "\r"], "\n", $source);
-		$source = explode("\n", highlight_string($source, true));
-		$out = $source[0]; // <code><span color=highlight.html>
-		$source = str_replace('<br />', "\n", $source[1]);
-		$out .= static::highlightLine($source, $line, $lines);
-
-		if ($vars) {
-			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars) {
-				return array_key_exists($m[1], $vars)
-					? '" title="'
-						. str_replace('"', '&quot;', trim(strip_tags(Dumper::toHtml($vars[$m[1]], [Dumper::DEPTH => 1]))))
-						. $m[0]
-					: $m[0];
-			}, $out);
-		}
-
-		$out = str_replace('&nbsp;', ' ', $out);
-		return "<pre class='code'><div>$out</div></pre>";
-	}
-
-
-	/**
-	 * Returns highlighted line in HTML code.
-	 * @return string
-	 */
-	public static function highlightLine($html, $line, $lines = 15)
-	{
-		$source = explode("\n", "\n" . str_replace("\r\n", "\n", $html));
-		$out = '';
-		$spans = 1;
-		$start = $i = max(1, min($line, count($source) - 1) - (int) floor($lines * 2 / 3));
-		while (--$i >= 1) { // find last highlighted block
-			if (preg_match('#.*(</?span[^>]*>)#', $source[$i], $m)) {
-				if ($m[1] !== '</span>') {
-					$spans++;
-					$out .= $m[1];
-				}
-				break;
-			}
-		}
-
-		$source = array_slice($source, $start, $lines, true);
-		end($source);
-		$numWidth = strlen((string) key($source));
-
-		foreach ($source as $n => $s) {
-			$spans += substr_count($s, '<span') - substr_count($s, '</span');
-			$s = str_replace(["\r", "\n"], ['', ''], $s);
-			preg_match_all('#<[^>]+>#', $s, $tags);
-			if ($n == $line) {
-				$out .= sprintf(
-					"<span class='highlight'>%{$numWidth}s:    %s\n</span>%s",
-					$n,
-					strip_tags($s),
-					implode('', $tags[0])
-				);
-			} else {
-				$out .= sprintf("<span class='line'>%{$numWidth}s:</span>    %s\n", $n, $s);
-			}
-		}
-		$out .= str_repeat('</span>', $spans) . '</code>';
-		return $out;
-	}
-
-
-	/**
-	 * Should a file be collapsed in stack trace?
-	 * @param  string  $file
-	 * @return bool
-	 */
-	public function isCollapsed($file)
-	{
-		$file = strtr($file, '\\', '/') . '/';
-		foreach ($this->collapsePaths as $path) {
-			$path = strtr($path, '\\', '/') . '/';
-			if (strncmp($file, $path, strlen($path)) === 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /** @var string[] */
+    public $info = [];
+
+    /** @var string[] paths to be collapsed in stack trace (e.g. core libraries) */
+    public $collapsePaths = [];
+
+    /** @var int  */
+    public $maxDepth = 3;
+
+    /** @var int  */
+    public $maxLength = 150;
+
+    /** @var string[] */
+    public $keysToHide = ['password', 'passwd', 'pass', 'pwd', 'creditcard', 'credit card', 'cc', 'pin'];
+
+    /** @var callable[] */
+    private $panels = [];
+
+    /** @var callable[] functions that returns action for exceptions */
+    private $actions = [];
+
+
+    public function __construct()
+    {
+        $this->collapsePaths[] = preg_match('#(.+/vendor)/tracy/tracy/src/Tracy$#', strtr(__DIR__, '\\', '/'), $m)
+            ? $m[1]
+            : __DIR__;
+    }
+
+
+    /**
+     * Add custom panel.
+     * @param  callable  $panel
+     * @return static
+     */
+    public function addPanel($panel)
+    {
+        if (!in_array($panel, $this->panels, true)) {
+            $this->panels[] = $panel;
+        }
+        return $this;
+    }
+
+
+    /**
+     * Add action.
+     * @param  callable  $action
+     * @return static
+     */
+    public function addAction($action)
+    {
+        $this->actions[] = $action;
+        return $this;
+    }
+
+
+    /**
+     * Renders blue screen.
+     * @param  \Exception|\Throwable  $exception
+     * @return void
+     */
+    public function render($exception)
+    {
+        if (Helpers::isAjax() && session_status() === PHP_SESSION_ACTIVE) {
+            ob_start(function () {});
+            $this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/content.phtml');
+            $contentId = $_SERVER['HTTP_X_TRACY_AJAX'];
+            $_SESSION['_tracy']['bluescreen'][$contentId] = ['content' => ob_get_clean(), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
+
+        } else {
+            $this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml');
+        }
+    }
+
+
+    /**
+     * Renders blue screen to file (if file exists, it will not be overwritten).
+     * @param  \Exception|\Throwable  $exception
+     * @param  string  $file file path
+     * @return void
+     */
+    public function renderToFile($exception, $file)
+    {
+        if ($handle = @fopen($file, 'x')) {
+            ob_start(); // double buffer prevents sending HTTP headers in some PHP
+            ob_start(function ($buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
+            $this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml', false);
+            ob_end_flush();
+            ob_end_clean();
+            fclose($handle);
+        }
+    }
+
+
+    private function renderTemplate($exception, $template, $toScreen = true)
+    {
+        $messageHtml = preg_replace(
+            '#\'\S[^\']*\S\'|"\S[^"]*\S"#U',
+            '<i>$0</i>',
+            htmlspecialchars((string) $exception->getMessage(), ENT_SUBSTITUTE, 'UTF-8')
+        );
+        $info = array_filter($this->info);
+        $source = Helpers::getSource();
+        $sourceIsUrl = preg_match('#^https?://#', $source);
+        $title = $exception instanceof \ErrorException
+            ? Helpers::errorTypeToString($exception->getSeverity())
+            : Helpers::getClass($exception);
+        $lastError = $exception instanceof \ErrorException || $exception instanceof \Error ? null : error_get_last();
+
+        $keysToHide = array_flip(array_map('strtolower', $this->keysToHide));
+        $dump = function ($v, $k = null) use ($keysToHide) {
+            if (is_string($k) && isset($keysToHide[strtolower($k)])) {
+                $v = Dumper::HIDDEN_VALUE;
+            }
+            return Dumper::toHtml($v, [
+                Dumper::DEPTH => $this->maxDepth,
+                Dumper::TRUNCATE => $this->maxLength,
+                Dumper::LIVE => true,
+                Dumper::LOCATION => Dumper::LOCATION_CLASS,
+                Dumper::KEYS_TO_HIDE => $this->keysToHide,
+            ]);
+        };
+        $css = array_map('file_get_contents', array_merge([
+            __DIR__ . '/assets/BlueScreen/bluescreen.css',
+        ], Debugger::$customCssFiles));
+        $css = preg_replace('#\s+#u', ' ', implode($css));
+
+        $nonce = $toScreen ? Helpers::getNonce() : null;
+        $actions = $toScreen ? $this->renderActions($exception) : [];
+
+        require $template;
+    }
+
+
+    /**
+     * @return \stdClass[]
+     */
+    private function renderPanels($ex)
+    {
+        $obLevel = ob_get_level();
+        $res = [];
+        foreach ($this->panels as $callback) {
+            try {
+                $panel = call_user_func($callback, $ex);
+                if (empty($panel['tab']) || empty($panel['panel'])) {
+                    continue;
+                }
+                $res[] = (object) $panel;
+                continue;
+            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
+            }
+            while (ob_get_level() > $obLevel) { // restore ob-level if broken
+                ob_end_clean();
+            }
+            is_callable($callback, true, $name);
+            $res[] = (object) [
+                'tab' => "Error in panel $name",
+                'panel' => nl2br(Helpers::escapeHtml($e)),
+            ];
+        }
+        return $res;
+    }
+
+
+    /**
+     * @return array[]
+     */
+    private function renderActions($ex)
+    {
+        $actions = [];
+        foreach ($this->actions as $callback) {
+            $action = call_user_func($callback, $ex);
+            if (!empty($action['link']) && !empty($action['label'])) {
+                $actions[] = $action;
+            }
+        }
+
+        if (property_exists($ex, 'tracyAction') && !empty($ex->tracyAction['link']) && !empty($ex->tracyAction['label'])) {
+            $actions[] = $ex->tracyAction;
+        }
+
+        if (preg_match('# ([\'"])(\w{3,}(?:\\\\\w{3,})+)\\1#i', $ex->getMessage(), $m)) {
+            $class = $m[2];
+            if (
+                !class_exists($class) && !interface_exists($class) && !trait_exists($class)
+                && ($file = Helpers::guessClassFile($class)) && !is_file($file)
+            ) {
+                $actions[] = [
+                    'link' => Helpers::editorUri($file, 1, 'create'),
+                    'label' => 'create class',
+                ];
+            }
+        }
+
+        if (preg_match('# ([\'"])((?:/|[a-z]:[/\\\\])\w[^\'"]+\.\w{2,5})\\1#i', $ex->getMessage(), $m)) {
+            $file = $m[2];
+            $actions[] = [
+                'link' => Helpers::editorUri($file, 1, $label = is_file($file) ? 'open' : 'create'),
+                'label' => $label . ' file',
+            ];
+        }
+
+        $query = ($ex instanceof \ErrorException ? '' : Helpers::getClass($ex) . ' ')
+            . preg_replace('#\'.*\'|".*"#Us', '', $ex->getMessage());
+        $actions[] = [
+            'link' => 'https://www.google.com/search?sourceid=tracy&q=' . urlencode($query),
+            'label' => 'search',
+            'external' => true,
+        ];
+
+        if (
+            $ex instanceof \ErrorException
+            && !empty($ex->skippable)
+            && preg_match('#^https?://#', $source = Helpers::getSource())
+        ) {
+            $actions[] = [
+                'link' => $source . (strpos($source, '?') ? '&' : '?') . '_tracy_skip_error',
+                'label' => 'skip error',
+            ];
+        }
+        return $actions;
+    }
+
+
+    /**
+     * Returns syntax highlighted source code.
+     * @param  string  $file
+     * @param  int  $line
+     * @param  int  $lines
+     * @return string|null
+     */
+    public static function highlightFile($file, $line, $lines = 15, array $vars = null)
+    {
+        $source = @file_get_contents($file); // @ file may not exist
+        if ($source) {
+            $source = static::highlightPhp($source, $line, $lines, $vars);
+            if ($editor = Helpers::editorUri($file, $line)) {
+                $source = substr_replace($source, ' data-tracy-href="' . Helpers::escapeHtml($editor) . '"', 4, 0);
+            }
+            return $source;
+        }
+    }
+
+
+    /**
+     * Returns syntax highlighted source code.
+     * @param  string  $source
+     * @param  int  $line
+     * @param  int  $lines
+     * @return string
+     */
+    public static function highlightPhp($source, $line, $lines = 15, array $vars = null)
+    {
+        if (function_exists('ini_set')) {
+            ini_set('highlight.comment', '#998; font-style: italic');
+            ini_set('highlight.default', '#000');
+            ini_set('highlight.html', '#06B');
+            ini_set('highlight.keyword', '#D24; font-weight: bold');
+            ini_set('highlight.string', '#080');
+        }
+
+        $source = str_replace(["\r\n", "\r"], "\n", $source);
+        $source = explode("\n", highlight_string($source, true));
+        $out = $source[0]; // <code><span color=highlight.html>
+        $source = str_replace('<br />', "\n", $source[1]);
+        $out .= static::highlightLine($source, $line, $lines);
+
+        if ($vars) {
+            $out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars) {
+                return array_key_exists($m[1], $vars)
+                    ? '" title="'
+                        . str_replace('"', '&quot;', trim(strip_tags(Dumper::toHtml($vars[$m[1]], [Dumper::DEPTH => 1]))))
+                        . $m[0]
+                    : $m[0];
+            }, $out);
+        }
+
+        $out = str_replace('&nbsp;', ' ', $out);
+        return "<pre class='code'><div>$out</div></pre>";
+    }
+
+
+    /**
+     * Returns highlighted line in HTML code.
+     * @return string
+     */
+    public static function highlightLine($html, $line, $lines = 15)
+    {
+        $source = explode("\n", "\n" . str_replace("\r\n", "\n", $html));
+        $out = '';
+        $spans = 1;
+        $start = $i = max(1, min($line, count($source) - 1) - (int) floor($lines * 2 / 3));
+        while (--$i >= 1) { // find last highlighted block
+            if (preg_match('#.*(</?span[^>]*>)#', $source[$i], $m)) {
+                if ($m[1] !== '</span>') {
+                    $spans++;
+                    $out .= $m[1];
+                }
+                break;
+            }
+        }
+
+        $source = array_slice($source, $start, $lines, true);
+        end($source);
+        $numWidth = strlen((string) key($source));
+
+        foreach ($source as $n => $s) {
+            $spans += substr_count($s, '<span') - substr_count($s, '</span');
+            $s = str_replace(["\r", "\n"], ['', ''], $s);
+            preg_match_all('#<[^>]+>#', $s, $tags);
+            if ($n == $line) {
+                $out .= sprintf(
+                    "<span class='highlight'>%{$numWidth}s:    %s\n</span>%s",
+                    $n,
+                    strip_tags($s),
+                    implode('', $tags[0])
+                );
+            } else {
+                $out .= sprintf("<span class='line'>%{$numWidth}s:</span>    %s\n", $n, $s);
+            }
+        }
+        $out .= str_repeat('</span>', $spans) . '</code>';
+        return $out;
+    }
+
+
+    /**
+     * Should a file be collapsed in stack trace?
+     * @param  string  $file
+     * @return bool
+     */
+    public function isCollapsed($file)
+    {
+        $file = strtr($file, '\\', '/') . '/';
+        foreach ($this->collapsePaths as $path) {
+            $path = strtr($path, '\\', '/') . '/';
+            if (strncmp($file, $path, strlen($path)) === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -77,13 +77,13 @@ 
 	public function render($exception)
 	{
 		if (Helpers::isAjax() && session_status() === PHP_SESSION_ACTIVE) {
-			ob_start(function () {});
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/content.phtml');
+			ob_start(function(){});
+			$this->renderTemplate($exception, __DIR__.'/assets/BlueScreen/content.phtml');
 			$contentId = $_SERVER['HTTP_X_TRACY_AJAX'];
 			$_SESSION['_tracy']['bluescreen'][$contentId] = ['content' => ob_get_clean(), 'dumps' => Dumper::fetchLiveData(), 'time' => time()];
 
 		} else {
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml');
+			$this->renderTemplate($exception, __DIR__.'/assets/BlueScreen/page.phtml');
 		}
 	}
 
@@ -98,8 +98,8 @@ 
 	{
 		if ($handle = @fopen($file, 'x')) {
 			ob_start(); // double buffer prevents sending HTTP headers in some PHP
-			ob_start(function ($buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
-			$this->renderTemplate($exception, __DIR__ . '/assets/BlueScreen/page.phtml', false);
+			ob_start(function($buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
+			$this->renderTemplate($exception, __DIR__.'/assets/BlueScreen/page.phtml', false);
 			ob_end_flush();
 			ob_end_clean();
 			fclose($handle);
@@ -123,7 +123,7 @@ 
 		$lastError = $exception instanceof \ErrorException || $exception instanceof \Error ? null : error_get_last();
 
 		$keysToHide = array_flip(array_map('strtolower', $this->keysToHide));
-		$dump = function ($v, $k = null) use ($keysToHide) {
+		$dump = function($v, $k = null) use ($keysToHide) {
 			if (is_string($k) && isset($keysToHide[strtolower($k)])) {
 				$v = Dumper::HIDDEN_VALUE;
 			}
@@ -136,7 +136,7 @@ 
 			]);
 		};
 		$css = array_map('file_get_contents', array_merge([
-			__DIR__ . '/assets/BlueScreen/bluescreen.css',
+			__DIR__.'/assets/BlueScreen/bluescreen.css',
 		], Debugger::$customCssFiles));
 		$css = preg_replace('#\s+#u', ' ', implode($css));
 
@@ -212,14 +212,14 @@ 
 			$file = $m[2];
 			$actions[] = [
 				'link' => Helpers::editorUri($file, 1, $label = is_file($file) ? 'open' : 'create'),
-				'label' => $label . ' file',
+				'label' => $label.' file',
 			];
 		}
 
-		$query = ($ex instanceof \ErrorException ? '' : Helpers::getClass($ex) . ' ')
+		$query = ($ex instanceof \ErrorException ? '' : Helpers::getClass($ex).' ')
 			. preg_replace('#\'.*\'|".*"#Us', '', $ex->getMessage());
 		$actions[] = [
-			'link' => 'https://www.google.com/search?sourceid=tracy&q=' . urlencode($query),
+			'link' => 'https://www.google.com/search?sourceid=tracy&q='.urlencode($query),
 			'label' => 'search',
 			'external' => true,
 		];
@@ -230,7 +230,7 @@ 
 			&& preg_match('#^https?://#', $source = Helpers::getSource())
 		) {
 			$actions[] = [
-				'link' => $source . (strpos($source, '?') ? '&' : '?') . '_tracy_skip_error',
+				'link' => $source.(strpos($source, '?') ? '&' : '?').'_tracy_skip_error',
 				'label' => 'skip error',
 			];
 		}
@@ -251,7 +251,7 @@ 
 		if ($source) {
 			$source = static::highlightPhp($source, $line, $lines, $vars);
 			if ($editor = Helpers::editorUri($file, $line)) {
-				$source = substr_replace($source, ' data-tracy-href="' . Helpers::escapeHtml($editor) . '"', 4, 0);
+				$source = substr_replace($source, ' data-tracy-href="'.Helpers::escapeHtml($editor).'"', 4, 0);
 			}
 			return $source;
 		}
@@ -282,7 +282,7 @@ 
 		$out .= static::highlightLine($source, $line, $lines);
 
 		if ($vars) {
-			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars) {
+			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function($m) use ($vars) {
 				return array_key_exists($m[1], $vars)
 					? '" title="'
 						. str_replace('"', '&quot;', trim(strip_tags(Dumper::toHtml($vars[$m[1]], [Dumper::DEPTH => 1]))))
@@ -302,7 +302,7 @@ 
 	 */
 	public static function highlightLine($html, $line, $lines = 15)
 	{
-		$source = explode("\n", "\n" . str_replace("\r\n", "\n", $html));
+		$source = explode("\n", "\n".str_replace("\r\n", "\n", $html));
 		$out = '';
 		$spans = 1;
 		$start = $i = max(1, min($line, count($source) - 1) - (int) floor($lines * 2 / 3));
@@ -335,7 +335,7 @@ 
 				$out .= sprintf("<span class='line'>%{$numWidth}s:</span>    %s\n", $n, $s);
 			}
 		}
-		$out .= str_repeat('</span>', $spans) . '</code>';
+		$out .= str_repeat('</span>', $spans).'</code>';
 		return $out;
 	}
 
@@ -347,9 +347,9 @@ 
 	 */
 	public function isCollapsed($file)
 	{
-		$file = strtr($file, '\\', '/') . '/';
+		$file = strtr($file, '\\', '/').'/';
 		foreach ($this->collapsePaths as $path) {
-			$path = strtr($path, '\\', '/') . '/';
+			$path = strtr($path, '\\', '/').'/';
 			if (strncmp($file, $path, strlen($path)) === 0) {
 				return true;
 			}

Braces +6 added lines, -4 removed lines

@@ -123,7 +123,7 @@ 
 		$lastError = $exception instanceof \ErrorException || $exception instanceof \Error ? null : error_get_last();
 
 		$keysToHide = array_flip(array_map('strtolower', $this->keysToHide));
-		$dump = function ($v, $k = null) use ($keysToHide) {
+		$dump = function ($v, $k = null) use ($keysToHide){
 			if (is_string($k) && isset($keysToHide[strtolower($k)])) {
 				$v = Dumper::HIDDEN_VALUE;
 			}
@@ -165,7 +165,8 @@ 
 			} catch (\Exception $e) {
 			} catch (\Throwable $e) {
 			}
-			while (ob_get_level() > $obLevel) { // restore ob-level if broken
+			while (ob_get_level() > $obLevel) {
+// restore ob-level if broken
 				ob_end_clean();
 			}
 			is_callable($callback, true, $name);
@@ -282,7 +283,7 @@ 
 		$out .= static::highlightLine($source, $line, $lines);
 
 		if ($vars) {
-			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars) {
+			$out = preg_replace_callback('#">\$(\w+)(&nbsp;)?</span>#', function ($m) use ($vars){
 				return array_key_exists($m[1], $vars)
 					? '" title="'
 						. str_replace('"', '&quot;', trim(strip_tags(Dumper::toHtml($vars[$m[1]], [Dumper::DEPTH => 1]))))
@@ -306,7 +307,8 @@ 
 		$out = '';
 		$spans = 1;
 		$start = $i = max(1, min($line, count($source) - 1) - (int) floor($lines * 2 / 3));
-		while (--$i >= 1) { // find last highlighted block
+		while (--$i >= 1) {
+// find last highlighted block
 			if (preg_match('#.*(</?span[^>]*>)#', $source[$i], $m)) {
 				if ($m[1] !== '</span>') {
 					$spans++;

core/vendor/tracy/tracy/src/Tracy/Debugger.php

Doc Comments +5 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
 
 	/**
 	 * Handler to catch warnings and notices.
-	 * @return bool|null   false to call normal error handler, null otherwise
+	 * @return false|null   false to call normal error handler, null otherwise
 	 * @throws ErrorException
 	 * @internal
 	 */
@@ -437,6 +437,9 @@ 
 	}
 
 
+	/**
+	 * @param boolean $errorOccurred
+	 */
 	private static function removeOutputBuffers($errorOccurred)
 	{
 		while (ob_get_level() > self::$obLevel) {
@@ -597,7 +600,7 @@ 
 	/**
 	 * Logs message or exception.
 	 * @param  mixed  $message
-	 * @return mixed
+	 * @return string
 	 */
 	public static function log($message, $priority = ILogger::INFO)
 	{

Indentation +588 added lines, -588 removed lines

@@ -15,629 +15,629 @@
  */
 class Debugger
 {
-	const VERSION = '2.5.4';
+    const VERSION = '2.5.4';
 
-	/** server modes for Debugger::enable() */
-	const
-		DEVELOPMENT = false,
-		PRODUCTION = true,
-		DETECT = null;
+    /** server modes for Debugger::enable() */
+    const
+        DEVELOPMENT = false,
+        PRODUCTION = true,
+        DETECT = null;
 
-	const COOKIE_SECRET = 'tracy-debug';
+    const COOKIE_SECRET = 'tracy-debug';
 
-	/** @var bool in production mode is suppressed any debugging output */
-	public static $productionMode = self::DETECT;
+    /** @var bool in production mode is suppressed any debugging output */
+    public static $productionMode = self::DETECT;
 
-	/** @var bool whether to display debug bar in development mode */
-	public static $showBar = true;
+    /** @var bool whether to display debug bar in development mode */
+    public static $showBar = true;
 
-	/** @var bool whether to send data to FireLogger in development mode */
-	public static $showFireLogger = true;
+    /** @var bool whether to send data to FireLogger in development mode */
+    public static $showFireLogger = true;
 
-	/** @var bool */
-	private static $enabled = false;
+    /** @var bool */
+    private static $enabled = false;
 
-	/** @var string|null reserved memory; also prevents double rendering */
-	private static $reserved;
+    /** @var string|null reserved memory; also prevents double rendering */
+    private static $reserved;
 
-	/** @var int initial output buffer level */
-	private static $obLevel;
+    /** @var int initial output buffer level */
+    private static $obLevel;
 
-	/********************* errors and exceptions reporting ****************d*g**/
+    /********************* errors and exceptions reporting ****************d*g**/
 
-	/** @var bool|int determines whether any error will cause immediate death in development mode; if integer that it's matched against error severity */
-	public static $strictMode = false;
+    /** @var bool|int determines whether any error will cause immediate death in development mode; if integer that it's matched against error severity */
+    public static $strictMode = false;
 
-	/** @var bool disables the @ (shut-up) operator so that notices and warnings are no longer hidden */
-	public static $scream = false;
+    /** @var bool disables the @ (shut-up) operator so that notices and warnings are no longer hidden */
+    public static $scream = false;
 
-	/** @var callable[] functions that are automatically called after fatal error */
-	public static $onFatalError = [];
+    /** @var callable[] functions that are automatically called after fatal error */
+    public static $onFatalError = [];
 
-	/********************* Debugger::dump() ****************d*g**/
+    /********************* Debugger::dump() ****************d*g**/
 
-	/** @var int  how many nested levels of array/object properties display by dump() */
-	public static $maxDepth = 3;
+    /** @var int  how many nested levels of array/object properties display by dump() */
+    public static $maxDepth = 3;
 
-	/** @var int  how long strings display by dump() */
-	public static $maxLength = 150;
+    /** @var int  how long strings display by dump() */
+    public static $maxLength = 150;
 
-	/** @var bool display location by dump()? */
-	public static $showLocation = false;
+    /** @var bool display location by dump()? */
+    public static $showLocation = false;
 
-	/** @deprecated */
-	public static $maxLen = 150;
+    /** @deprecated */
+    public static $maxLen = 150;
 
-	/********************* logging ****************d*g**/
+    /********************* logging ****************d*g**/
 
-	/** @var string|null name of the directory where errors should be logged */
-	public static $logDirectory;
+    /** @var string|null name of the directory where errors should be logged */
+    public static $logDirectory;
 
-	/** @var int  log bluescreen in production mode for this error severity */
-	public static $logSeverity = 0;
+    /** @var int  log bluescreen in production mode for this error severity */
+    public static $logSeverity = 0;
 
-	/** @var string|array email(s) to which send error notifications */
-	public static $email;
+    /** @var string|array email(s) to which send error notifications */
+    public static $email;
 
-	/** for Debugger::log() and Debugger::fireLog() */
-	const
-		DEBUG = ILogger::DEBUG,
-		INFO = ILogger::INFO,
-		WARNING = ILogger::WARNING,
-		ERROR = ILogger::ERROR,
-		EXCEPTION = ILogger::EXCEPTION,
-		CRITICAL = ILogger::CRITICAL;
+    /** for Debugger::log() and Debugger::fireLog() */
+    const
+        DEBUG = ILogger::DEBUG,
+        INFO = ILogger::INFO,
+        WARNING = ILogger::WARNING,
+        ERROR = ILogger::ERROR,
+        EXCEPTION = ILogger::EXCEPTION,
+        CRITICAL = ILogger::CRITICAL;
 
-	/********************* misc ****************d*g**/
+    /********************* misc ****************d*g**/
 
-	/** @var int timestamp with microseconds of the start of the request */
-	public static $time;
+    /** @var int timestamp with microseconds of the start of the request */
+    public static $time;
 
-	/** @var string URI pattern mask to open editor */
-	public static $editor = 'editor://%action/?file=%file&line=%line&search=%search&replace=%replace';
+    /** @var string URI pattern mask to open editor */
+    public static $editor = 'editor://%action/?file=%file&line=%line&search=%search&replace=%replace';
 
-	/** @var array replacements in path */
-	public static $editorMapping = [];
+    /** @var array replacements in path */
+    public static $editorMapping = [];
 
-	/** @var string command to open browser (use 'start ""' in Windows) */
-	public static $browser;
+    /** @var string command to open browser (use 'start ""' in Windows) */
+    public static $browser;
 
-	/** @var string custom static error template */
-	public static $errorTemplate;
+    /** @var string custom static error template */
+    public static $errorTemplate;
 
-	/** @var string[] */
-	public static $customCssFiles = [];
+    /** @var string[] */
+    public static $customCssFiles = [];
 
-	/** @var string[] */
-	public static $customJsFiles = [];
+    /** @var string[] */
+    public static $customJsFiles = [];
 
-	/** @var array|null */
-	private static $cpuUsage;
+    /** @var array|null */
+    private static $cpuUsage;
 
-	/********************* services ****************d*g**/
+    /********************* services ****************d*g**/
 
-	/** @var BlueScreen */
-	private static $blueScreen;
+    /** @var BlueScreen */
+    private static $blueScreen;
 
-	/** @var Bar */
-	private static $bar;
+    /** @var Bar */
+    private static $bar;
 
-	/** @var ILogger */
-	private static $logger;
+    /** @var ILogger */
+    private static $logger;
 
-	/** @var ILogger */
-	private static $fireLogger;
+    /** @var ILogger */
+    private static $fireLogger;
 
-
-	/**
-	 * Static class - cannot be instantiated.
-	 */
-	final public function __construct()
-	{
-		throw new \LogicException;
-	}
-
-
-	/**
-	 * Enables displaying or logging errors and exceptions.
-	 * @param  mixed   $mode  production, development mode, autodetection or IP address(es) whitelist.
-	 * @param  string  $logDirectory  error log directory
-	 * @param  string  $email  administrator email; enables email sending in production mode
-	 * @return void
-	 */
-	public static function enable($mode = null, $logDirectory = null, $email = null)
-	{
-		if ($mode !== null || self::$productionMode === null) {
-			self::$productionMode = is_bool($mode) ? $mode : !self::detectDebugMode($mode);
-		}
-
-		self::$maxLen = &self::$maxLength;
-		self::$reserved = str_repeat('t', 30000);
-		self::$time = isset($_SERVER['REQUEST_TIME_FLOAT']) ? $_SERVER['REQUEST_TIME_FLOAT'] : microtime(true);
-		self::$obLevel = ob_get_level();
-		self::$cpuUsage = !self::$productionMode && function_exists('getrusage') ? getrusage() : null;
-
-		// logging configuration
-		if ($email !== null) {
-			self::$email = $email;
-		}
-		if ($logDirectory !== null) {
-			self::$logDirectory = $logDirectory;
-		}
-		if (self::$logDirectory) {
-			if (!preg_match('#([a-z]+:)?[/\\\\]#Ai', self::$logDirectory)) {
-				self::exceptionHandler(new \RuntimeException('Logging directory must be absolute path.'));
-				self::$logDirectory = null;
-			} elseif (!is_dir(self::$logDirectory)) {
-				self::exceptionHandler(new \RuntimeException("Logging directory '" . self::$logDirectory . "' is not found."));
-				self::$logDirectory = null;
-			}
-		}
-
-		// php configuration
-		if (function_exists('ini_set')) {
-			ini_set('display_errors', self::$productionMode ? '0' : '1'); // or 'stderr'
-			ini_set('html_errors', '0');
-			ini_set('log_errors', '0');
-
-		} elseif (
-			ini_get('display_errors') != !self::$productionMode // intentionally ==
-			&& ini_get('display_errors') !== (self::$productionMode ? 'stderr' : 'stdout')
-		) {
-			self::exceptionHandler(new \RuntimeException("Unable to set 'display_errors' because function ini_set() is disabled."));
-		}
-		error_reporting(E_ALL);
-
-		if (self::$enabled) {
-			return;
-		}
-
-		register_shutdown_function([__CLASS__, 'shutdownHandler']);
-		set_exception_handler([__CLASS__, 'exceptionHandler']);
-		set_error_handler([__CLASS__, 'errorHandler']);
-
-		array_map('class_exists', ['Tracy\Bar', 'Tracy\BlueScreen', 'Tracy\DefaultBarPanel', 'Tracy\Dumper',
-			'Tracy\FireLogger', 'Tracy\Helpers', 'Tracy\Logger', ]);
-
-		self::dispatch();
-		self::$enabled = true;
-	}
-
-
-	/**
-	 * @return void
-	 */
-	public static function dispatch()
-	{
-		if (self::$productionMode || PHP_SAPI === 'cli') {
-			return;
-
-		} elseif (headers_sent($file, $line) || ob_get_length()) {
-			throw new \LogicException(
-				__METHOD__ . '() called after some output has been sent. '
-				. ($file ? "Output started at $file:$line." : 'Try Tracy\OutputDebugger to find where output started.')
-			);
-
-		} elseif (self::$enabled && session_status() !== PHP_SESSION_ACTIVE) {
-			ini_set('session.use_cookies', '1');
-			ini_set('session.use_only_cookies', '1');
-			ini_set('session.use_trans_sid', '0');
-			ini_set('session.cookie_path', '/');
-			ini_set('session.cookie_httponly', '1');
-			session_start();
-		}
-
-		if (self::getBar()->dispatchAssets()) {
-			exit;
-		}
-	}
-
-
-	/**
-	 * Renders loading <script>
-	 * @return void
-	 */
-	public static function renderLoader()
-	{
-		if (!self::$productionMode) {
-			self::getBar()->renderLoader();
-		}
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public static function isEnabled()
-	{
-		return self::$enabled;
-	}
-
-
-	/**
-	 * Shutdown handler to catch fatal errors and execute of the planned activities.
-	 * @return void
-	 * @internal
-	 */
-	public static function shutdownHandler()
-	{
-		if (!self::$reserved) {
-			return;
-		}
-		self::$reserved = null;
-
-		$error = error_get_last();
-		if (in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE, E_RECOVERABLE_ERROR, E_USER_ERROR], true)) {
-			self::exceptionHandler(
-				Helpers::fixStack(new ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line'])),
-				false
-			);
-
-		} elseif (self::$showBar && !self::$productionMode) {
-			self::removeOutputBuffers(false);
-			self::getBar()->render();
-		}
-	}
-
-
-	/**
-	 * Handler to catch uncaught exception.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return void
-	 * @internal
-	 */
-	public static function exceptionHandler($exception, $exit = true)
-	{
-		if (!self::$reserved && $exit) {
-			return;
-		}
-		self::$reserved = null;
-
-		if (!headers_sent()) {
-			http_response_code(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE ') !== false ? 503 : 500);
-			if (Helpers::isHtmlMode()) {
-				header('Content-Type: text/html; charset=UTF-8');
-			}
-		}
-
-		Helpers::improveException($exception);
-		self::removeOutputBuffers(true);
-
-		if (self::$productionMode) {
-			try {
-				self::log($exception, self::EXCEPTION);
-			} catch (\Exception $e) {
-			} catch (\Throwable $e) {
-			}
-
-			if (Helpers::isHtmlMode()) {
-				$logged = empty($e);
-				require self::$errorTemplate ?: __DIR__ . '/assets/Debugger/error.500.phtml';
-			} elseif (PHP_SAPI === 'cli') {
-				fwrite(STDERR, 'ERROR: application encountered an error and can not continue. '
-					. (isset($e) ? "Unable to log error.\n" : "Error was logged.\n"));
-			}
-
-		} elseif (!connection_aborted() && (Helpers::isHtmlMode() || Helpers::isAjax())) {
-			self::getBlueScreen()->render($exception);
-			if (self::$showBar) {
-				self::getBar()->render();
-			}
-
-		} else {
-			self::fireLog($exception);
-			$s = get_class($exception) . ($exception->getMessage() === '' ? '' : ': ' . $exception->getMessage())
-				. ' in ' . $exception->getFile() . ':' . $exception->getLine()
-				. "\nStack trace:\n" . $exception->getTraceAsString();
-			try {
-				$file = self::log($exception, self::EXCEPTION);
-				if ($file && !headers_sent()) {
-					header("X-Tracy-Error-Log: $file");
-				}
-				echo "$s\n" . ($file ? "(stored in $file)\n" : '');
-				if ($file && self::$browser) {
-					exec(self::$browser . ' ' . escapeshellarg($file));
-				}
-			} catch (\Exception $e) {
-				echo "$s\nUnable to log error: {$e->getMessage()}\n";
-			} catch (\Throwable $e) {
-				echo "$s\nUnable to log error: {$e->getMessage()}\n";
-			}
-		}
-
-		try {
-			$e = null;
-			foreach (self::$onFatalError as $handler) {
-				call_user_func($handler, $exception);
-			}
-		} catch (\Exception $e) {
-		} catch (\Throwable $e) {
-		}
-		if ($e) {
-			try {
-				self::log($e, self::EXCEPTION);
-			} catch (\Exception $e) {
-			} catch (\Throwable $e) {
-			}
-		}
-
-		if ($exit) {
-			exit(255);
-		}
-	}
-
-
-	/**
-	 * Handler to catch warnings and notices.
-	 * @return bool|null   false to call normal error handler, null otherwise
-	 * @throws ErrorException
-	 * @internal
-	 */
-	public static function errorHandler($severity, $message, $file, $line, $context = [])
-	{
-		if (self::$scream) {
-			error_reporting(E_ALL);
-		}
-
-		if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
-			if (Helpers::findTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), '*::__toString')) {
-				$previous = isset($context['e']) && ($context['e'] instanceof \Exception || $context['e'] instanceof \Throwable) ? $context['e'] : null;
-				$e = new ErrorException($message, 0, $severity, $file, $line, $previous);
-				$e->context = $context;
-				self::exceptionHandler($e);
-			}
-
-			$e = new ErrorException($message, 0, $severity, $file, $line);
-			$e->context = $context;
-			throw $e;
-
-		} elseif (($severity & error_reporting()) !== $severity) {
-			return false; // calls normal error handler to fill-in error_get_last()
-
-		} elseif (self::$productionMode && ($severity & self::$logSeverity) === $severity) {
-			$e = new ErrorException($message, 0, $severity, $file, $line);
-			$e->context = $context;
-			Helpers::improveException($e);
-			try {
-				self::log($e, self::ERROR);
-			} catch (\Exception $foo) {
-			} catch (\Throwable $foo) {
-			}
-			return null;
-
-		} elseif (
-			!self::$productionMode
-			&& !isset($_GET['_tracy_skip_error'])
-			&& (is_bool(self::$strictMode) ? self::$strictMode : ((self::$strictMode & $severity) === $severity))
-		) {
-			$e = new ErrorException($message, 0, $severity, $file, $line);
-			$e->context = $context;
-			$e->skippable = true;
-			self::exceptionHandler($e);
-		}
-
-		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, $context);
-		$count = &self::getBar()->getPanel('Tracy:errors')->data["$file|$line|$message"];
-
-		if ($count++) { // repeated error
-			return null;
-
-		} elseif (self::$productionMode) {
-			try {
-				self::log("$message in $file:$line", self::ERROR);
-			} catch (\Exception $foo) {
-			} catch (\Throwable $foo) {
-			}
-			return null;
-
-		} else {
-			self::fireLog(new ErrorException($message, 0, $severity, $file, $line));
-			return Helpers::isHtmlMode() || Helpers::isAjax() ? null : false; // false calls normal error handler
-		}
-	}
-
-
-	private static function removeOutputBuffers($errorOccurred)
-	{
-		while (ob_get_level() > self::$obLevel) {
-			$status = ob_get_status();
-			if (in_array($status['name'], ['ob_gzhandler', 'zlib output compression'], true)) {
-				break;
-			}
-			$fnc = $status['chunk_size'] || !$errorOccurred ? 'ob_end_flush' : 'ob_end_clean';
-			if (!@$fnc()) { // @ may be not removable
-				break;
-			}
-		}
-	}
-
-
-	/********************* services ****************d*g**/
-
-
-	/**
-	 * @return BlueScreen
-	 */
-	public static function getBlueScreen()
-	{
-		if (!self::$blueScreen) {
-			self::$blueScreen = new BlueScreen;
-			self::$blueScreen->info = [
-				'PHP ' . PHP_VERSION,
-				isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null,
-				'Tracy ' . self::VERSION,
-			];
-		}
-		return self::$blueScreen;
-	}
-
-
-	/**
-	 * @return Bar
-	 */
-	public static function getBar()
-	{
-		if (!self::$bar) {
-			self::$bar = new Bar;
-			self::$bar->addPanel($info = new DefaultBarPanel('info'), 'Tracy:info');
-			$info->cpuUsage = self::$cpuUsage;
-			self::$bar->addPanel(new DefaultBarPanel('errors'), 'Tracy:errors'); // filled by errorHandler()
-		}
-		return self::$bar;
-	}
-
-
-	/**
-	 * @return void
-	 */
-	public static function setLogger(ILogger $logger)
-	{
-		self::$logger = $logger;
-	}
-
-
-	/**
-	 * @return ILogger
-	 */
-	public static function getLogger()
-	{
-		if (!self::$logger) {
-			self::$logger = new Logger(self::$logDirectory, self::$email, self::getBlueScreen());
-			self::$logger->directory = &self::$logDirectory; // back compatiblity
-			self::$logger->email = &self::$email;
-		}
-		return self::$logger;
-	}
-
-
-	/**
-	 * @return ILogger
-	 */
-	public static function getFireLogger()
-	{
-		if (!self::$fireLogger) {
-			self::$fireLogger = new FireLogger;
-		}
-		return self::$fireLogger;
-	}
-
-
-	/********************* useful tools ****************d*g**/
-
-
-	/**
-	 * Dumps information about a variable in readable format.
-	 * @tracySkipLocation
-	 * @param  mixed  $var  variable to dump
-	 * @param  bool   $return  return output instead of printing it? (bypasses $productionMode)
-	 * @return mixed  variable itself or dump
-	 */
-	public static function dump($var, $return = false)
-	{
-		if ($return) {
-			ob_start(function () {});
-			Dumper::dump($var, [
-				Dumper::DEPTH => self::$maxDepth,
-				Dumper::TRUNCATE => self::$maxLength,
-			]);
-			return ob_get_clean();
-
-		} elseif (!self::$productionMode) {
-			Dumper::dump($var, [
-				Dumper::DEPTH => self::$maxDepth,
-				Dumper::TRUNCATE => self::$maxLength,
-				Dumper::LOCATION => self::$showLocation,
-			]);
-		}
-
-		return $var;
-	}
-
-
-	/**
-	 * Starts/stops stopwatch.
-	 * @param  string  $name
-	 * @return float   elapsed seconds
-	 */
-	public static function timer($name = null)
-	{
-		static $time = [];
-		$now = microtime(true);
-		$delta = isset($time[$name]) ? $now - $time[$name] : 0;
-		$time[$name] = $now;
-		return $delta;
-	}
-
-
-	/**
-	 * Dumps information about a variable in Tracy Debug Bar.
-	 * @tracySkipLocation
-	 * @param  mixed  $var
-	 * @param  string $title
-	 * @param  array  $options
-	 * @return mixed  variable itself
-	 */
-	public static function barDump($var, $title = null, array $options = null)
-	{
-		if (!self::$productionMode) {
-			static $panel;
-			if (!$panel) {
-				self::getBar()->addPanel($panel = new DefaultBarPanel('dumps'), 'Tracy:dumps');
-			}
-			$panel->data[] = ['title' => $title, 'dump' => Dumper::toHtml($var, (array) $options + [
-				Dumper::DEPTH => self::$maxDepth,
-				Dumper::TRUNCATE => self::$maxLength,
-				Dumper::LOCATION => self::$showLocation ?: Dumper::LOCATION_CLASS | Dumper::LOCATION_SOURCE,
-			])];
-		}
-		return $var;
-	}
-
-
-	/**
-	 * Logs message or exception.
-	 * @param  mixed  $message
-	 * @return mixed
-	 */
-	public static function log($message, $priority = ILogger::INFO)
-	{
-		return self::getLogger()->log($message, $priority);
-	}
-
-
-	/**
-	 * Sends message to FireLogger console.
-	 * @param  mixed  $message
-	 * @return bool   was successful?
-	 */
-	public static function fireLog($message)
-	{
-		if (!self::$productionMode && self::$showFireLogger) {
-			return self::getFireLogger()->log($message);
-		}
-	}
-
-
-	/**
-	 * Detects debug mode by IP address.
-	 * @param  string|array  $list  IP addresses or computer names whitelist detection
-	 * @return bool
-	 */
-	public static function detectDebugMode($list = null)
-	{
-		$addr = isset($_SERVER['REMOTE_ADDR'])
-			? $_SERVER['REMOTE_ADDR']
-			: php_uname('n');
-		$secret = isset($_COOKIE[self::COOKIE_SECRET]) && is_string($_COOKIE[self::COOKIE_SECRET])
-			? $_COOKIE[self::COOKIE_SECRET]
-			: null;
-		$list = is_string($list)
-			? preg_split('#[,\s]+#', $list)
-			: (array) $list;
-		if (!isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !isset($_SERVER['HTTP_FORWARDED'])) {
-			$list[] = '127.0.0.1';
-			$list[] = '::1';
-		}
-		return in_array($addr, $list, true) || in_array("$secret@$addr", $list, true);
-	}
+
+    /**
+     * Static class - cannot be instantiated.
+     */
+    final public function __construct()
+    {
+        throw new \LogicException;
+    }
+
+
+    /**
+     * Enables displaying or logging errors and exceptions.
+     * @param  mixed   $mode  production, development mode, autodetection or IP address(es) whitelist.
+     * @param  string  $logDirectory  error log directory
+     * @param  string  $email  administrator email; enables email sending in production mode
+     * @return void
+     */
+    public static function enable($mode = null, $logDirectory = null, $email = null)
+    {
+        if ($mode !== null || self::$productionMode === null) {
+            self::$productionMode = is_bool($mode) ? $mode : !self::detectDebugMode($mode);
+        }
+
+        self::$maxLen = &self::$maxLength;
+        self::$reserved = str_repeat('t', 30000);
+        self::$time = isset($_SERVER['REQUEST_TIME_FLOAT']) ? $_SERVER['REQUEST_TIME_FLOAT'] : microtime(true);
+        self::$obLevel = ob_get_level();
+        self::$cpuUsage = !self::$productionMode && function_exists('getrusage') ? getrusage() : null;
+
+        // logging configuration
+        if ($email !== null) {
+            self::$email = $email;
+        }
+        if ($logDirectory !== null) {
+            self::$logDirectory = $logDirectory;
+        }
+        if (self::$logDirectory) {
+            if (!preg_match('#([a-z]+:)?[/\\\\]#Ai', self::$logDirectory)) {
+                self::exceptionHandler(new \RuntimeException('Logging directory must be absolute path.'));
+                self::$logDirectory = null;
+            } elseif (!is_dir(self::$logDirectory)) {
+                self::exceptionHandler(new \RuntimeException("Logging directory '" . self::$logDirectory . "' is not found."));
+                self::$logDirectory = null;
+            }
+        }
+
+        // php configuration
+        if (function_exists('ini_set')) {
+            ini_set('display_errors', self::$productionMode ? '0' : '1'); // or 'stderr'
+            ini_set('html_errors', '0');
+            ini_set('log_errors', '0');
+
+        } elseif (
+            ini_get('display_errors') != !self::$productionMode // intentionally ==
+            && ini_get('display_errors') !== (self::$productionMode ? 'stderr' : 'stdout')
+        ) {
+            self::exceptionHandler(new \RuntimeException("Unable to set 'display_errors' because function ini_set() is disabled."));
+        }
+        error_reporting(E_ALL);
+
+        if (self::$enabled) {
+            return;
+        }
+
+        register_shutdown_function([__CLASS__, 'shutdownHandler']);
+        set_exception_handler([__CLASS__, 'exceptionHandler']);
+        set_error_handler([__CLASS__, 'errorHandler']);
+
+        array_map('class_exists', ['Tracy\Bar', 'Tracy\BlueScreen', 'Tracy\DefaultBarPanel', 'Tracy\Dumper',
+            'Tracy\FireLogger', 'Tracy\Helpers', 'Tracy\Logger', ]);
+
+        self::dispatch();
+        self::$enabled = true;
+    }
+
+
+    /**
+     * @return void
+     */
+    public static function dispatch()
+    {
+        if (self::$productionMode || PHP_SAPI === 'cli') {
+            return;
+
+        } elseif (headers_sent($file, $line) || ob_get_length()) {
+            throw new \LogicException(
+                __METHOD__ . '() called after some output has been sent. '
+                . ($file ? "Output started at $file:$line." : 'Try Tracy\OutputDebugger to find where output started.')
+            );
+
+        } elseif (self::$enabled && session_status() !== PHP_SESSION_ACTIVE) {
+            ini_set('session.use_cookies', '1');
+            ini_set('session.use_only_cookies', '1');
+            ini_set('session.use_trans_sid', '0');
+            ini_set('session.cookie_path', '/');
+            ini_set('session.cookie_httponly', '1');
+            session_start();
+        }
+
+        if (self::getBar()->dispatchAssets()) {
+            exit;
+        }
+    }
+
+
+    /**
+     * Renders loading <script>
+     * @return void
+     */
+    public static function renderLoader()
+    {
+        if (!self::$productionMode) {
+            self::getBar()->renderLoader();
+        }
+    }
+
+
+    /**
+     * @return bool
+     */
+    public static function isEnabled()
+    {
+        return self::$enabled;
+    }
+
+
+    /**
+     * Shutdown handler to catch fatal errors and execute of the planned activities.
+     * @return void
+     * @internal
+     */
+    public static function shutdownHandler()
+    {
+        if (!self::$reserved) {
+            return;
+        }
+        self::$reserved = null;
+
+        $error = error_get_last();
+        if (in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE, E_RECOVERABLE_ERROR, E_USER_ERROR], true)) {
+            self::exceptionHandler(
+                Helpers::fixStack(new ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line'])),
+                false
+            );
+
+        } elseif (self::$showBar && !self::$productionMode) {
+            self::removeOutputBuffers(false);
+            self::getBar()->render();
+        }
+    }
+
+
+    /**
+     * Handler to catch uncaught exception.
+     * @param  \Exception|\Throwable  $exception
+     * @return void
+     * @internal
+     */
+    public static function exceptionHandler($exception, $exit = true)
+    {
+        if (!self::$reserved && $exit) {
+            return;
+        }
+        self::$reserved = null;
+
+        if (!headers_sent()) {
+            http_response_code(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE ') !== false ? 503 : 500);
+            if (Helpers::isHtmlMode()) {
+                header('Content-Type: text/html; charset=UTF-8');
+            }
+        }
+
+        Helpers::improveException($exception);
+        self::removeOutputBuffers(true);
+
+        if (self::$productionMode) {
+            try {
+                self::log($exception, self::EXCEPTION);
+            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
+            }
+
+            if (Helpers::isHtmlMode()) {
+                $logged = empty($e);
+                require self::$errorTemplate ?: __DIR__ . '/assets/Debugger/error.500.phtml';
+            } elseif (PHP_SAPI === 'cli') {
+                fwrite(STDERR, 'ERROR: application encountered an error and can not continue. '
+                    . (isset($e) ? "Unable to log error.\n" : "Error was logged.\n"));
+            }
+
+        } elseif (!connection_aborted() && (Helpers::isHtmlMode() || Helpers::isAjax())) {
+            self::getBlueScreen()->render($exception);
+            if (self::$showBar) {
+                self::getBar()->render();
+            }
+
+        } else {
+            self::fireLog($exception);
+            $s = get_class($exception) . ($exception->getMessage() === '' ? '' : ': ' . $exception->getMessage())
+                . ' in ' . $exception->getFile() . ':' . $exception->getLine()
+                . "\nStack trace:\n" . $exception->getTraceAsString();
+            try {
+                $file = self::log($exception, self::EXCEPTION);
+                if ($file && !headers_sent()) {
+                    header("X-Tracy-Error-Log: $file");
+                }
+                echo "$s\n" . ($file ? "(stored in $file)\n" : '');
+                if ($file && self::$browser) {
+                    exec(self::$browser . ' ' . escapeshellarg($file));
+                }
+            } catch (\Exception $e) {
+                echo "$s\nUnable to log error: {$e->getMessage()}\n";
+            } catch (\Throwable $e) {
+                echo "$s\nUnable to log error: {$e->getMessage()}\n";
+            }
+        }
+
+        try {
+            $e = null;
+            foreach (self::$onFatalError as $handler) {
+                call_user_func($handler, $exception);
+            }
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+        if ($e) {
+            try {
+                self::log($e, self::EXCEPTION);
+            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
+            }
+        }
+
+        if ($exit) {
+            exit(255);
+        }
+    }
+
+
+    /**
+     * Handler to catch warnings and notices.
+     * @return bool|null   false to call normal error handler, null otherwise
+     * @throws ErrorException
+     * @internal
+     */
+    public static function errorHandler($severity, $message, $file, $line, $context = [])
+    {
+        if (self::$scream) {
+            error_reporting(E_ALL);
+        }
+
+        if ($severity === E_RECOVERABLE_ERROR || $severity === E_USER_ERROR) {
+            if (Helpers::findTrace(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), '*::__toString')) {
+                $previous = isset($context['e']) && ($context['e'] instanceof \Exception || $context['e'] instanceof \Throwable) ? $context['e'] : null;
+                $e = new ErrorException($message, 0, $severity, $file, $line, $previous);
+                $e->context = $context;
+                self::exceptionHandler($e);
+            }
+
+            $e = new ErrorException($message, 0, $severity, $file, $line);
+            $e->context = $context;
+            throw $e;
+
+        } elseif (($severity & error_reporting()) !== $severity) {
+            return false; // calls normal error handler to fill-in error_get_last()
+
+        } elseif (self::$productionMode && ($severity & self::$logSeverity) === $severity) {
+            $e = new ErrorException($message, 0, $severity, $file, $line);
+            $e->context = $context;
+            Helpers::improveException($e);
+            try {
+                self::log($e, self::ERROR);
+            } catch (\Exception $foo) {
+            } catch (\Throwable $foo) {
+            }
+            return null;
+
+        } elseif (
+            !self::$productionMode
+            && !isset($_GET['_tracy_skip_error'])
+            && (is_bool(self::$strictMode) ? self::$strictMode : ((self::$strictMode & $severity) === $severity))
+        ) {
+            $e = new ErrorException($message, 0, $severity, $file, $line);
+            $e->context = $context;
+            $e->skippable = true;
+            self::exceptionHandler($e);
+        }
+
+        $message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, $context);
+        $count = &self::getBar()->getPanel('Tracy:errors')->data["$file|$line|$message"];
+
+        if ($count++) { // repeated error
+            return null;
+
+        } elseif (self::$productionMode) {
+            try {
+                self::log("$message in $file:$line", self::ERROR);
+            } catch (\Exception $foo) {
+            } catch (\Throwable $foo) {
+            }
+            return null;
+
+        } else {
+            self::fireLog(new ErrorException($message, 0, $severity, $file, $line));
+            return Helpers::isHtmlMode() || Helpers::isAjax() ? null : false; // false calls normal error handler
+        }
+    }
+
+
+    private static function removeOutputBuffers($errorOccurred)
+    {
+        while (ob_get_level() > self::$obLevel) {
+            $status = ob_get_status();
+            if (in_array($status['name'], ['ob_gzhandler', 'zlib output compression'], true)) {
+                break;
+            }
+            $fnc = $status['chunk_size'] || !$errorOccurred ? 'ob_end_flush' : 'ob_end_clean';
+            if (!@$fnc()) { // @ may be not removable
+                break;
+            }
+        }
+    }
+
+
+    /********************* services ****************d*g**/
+
+
+    /**
+     * @return BlueScreen
+     */
+    public static function getBlueScreen()
+    {
+        if (!self::$blueScreen) {
+            self::$blueScreen = new BlueScreen;
+            self::$blueScreen->info = [
+                'PHP ' . PHP_VERSION,
+                isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null,
+                'Tracy ' . self::VERSION,
+            ];
+        }
+        return self::$blueScreen;
+    }
+
+
+    /**
+     * @return Bar
+     */
+    public static function getBar()
+    {
+        if (!self::$bar) {
+            self::$bar = new Bar;
+            self::$bar->addPanel($info = new DefaultBarPanel('info'), 'Tracy:info');
+            $info->cpuUsage = self::$cpuUsage;
+            self::$bar->addPanel(new DefaultBarPanel('errors'), 'Tracy:errors'); // filled by errorHandler()
+        }
+        return self::$bar;
+    }
+
+
+    /**
+     * @return void
+     */
+    public static function setLogger(ILogger $logger)
+    {
+        self::$logger = $logger;
+    }
+
+
+    /**
+     * @return ILogger
+     */
+    public static function getLogger()
+    {
+        if (!self::$logger) {
+            self::$logger = new Logger(self::$logDirectory, self::$email, self::getBlueScreen());
+            self::$logger->directory = &self::$logDirectory; // back compatiblity
+            self::$logger->email = &self::$email;
+        }
+        return self::$logger;
+    }
+
+
+    /**
+     * @return ILogger
+     */
+    public static function getFireLogger()
+    {
+        if (!self::$fireLogger) {
+            self::$fireLogger = new FireLogger;
+        }
+        return self::$fireLogger;
+    }
+
+
+    /********************* useful tools ****************d*g**/
+
+
+    /**
+     * Dumps information about a variable in readable format.
+     * @tracySkipLocation
+     * @param  mixed  $var  variable to dump
+     * @param  bool   $return  return output instead of printing it? (bypasses $productionMode)
+     * @return mixed  variable itself or dump
+     */
+    public static function dump($var, $return = false)
+    {
+        if ($return) {
+            ob_start(function () {});
+            Dumper::dump($var, [
+                Dumper::DEPTH => self::$maxDepth,
+                Dumper::TRUNCATE => self::$maxLength,
+            ]);
+            return ob_get_clean();
+
+        } elseif (!self::$productionMode) {
+            Dumper::dump($var, [
+                Dumper::DEPTH => self::$maxDepth,
+                Dumper::TRUNCATE => self::$maxLength,
+                Dumper::LOCATION => self::$showLocation,
+            ]);
+        }
+
+        return $var;
+    }
+
+
+    /**
+     * Starts/stops stopwatch.
+     * @param  string  $name
+     * @return float   elapsed seconds
+     */
+    public static function timer($name = null)
+    {
+        static $time = [];
+        $now = microtime(true);
+        $delta = isset($time[$name]) ? $now - $time[$name] : 0;
+        $time[$name] = $now;
+        return $delta;
+    }
+
+
+    /**
+     * Dumps information about a variable in Tracy Debug Bar.
+     * @tracySkipLocation
+     * @param  mixed  $var
+     * @param  string $title
+     * @param  array  $options
+     * @return mixed  variable itself
+     */
+    public static function barDump($var, $title = null, array $options = null)
+    {
+        if (!self::$productionMode) {
+            static $panel;
+            if (!$panel) {
+                self::getBar()->addPanel($panel = new DefaultBarPanel('dumps'), 'Tracy:dumps');
+            }
+            $panel->data[] = ['title' => $title, 'dump' => Dumper::toHtml($var, (array) $options + [
+                Dumper::DEPTH => self::$maxDepth,
+                Dumper::TRUNCATE => self::$maxLength,
+                Dumper::LOCATION => self::$showLocation ?: Dumper::LOCATION_CLASS | Dumper::LOCATION_SOURCE,
+            ])];
+        }
+        return $var;
+    }
+
+
+    /**
+     * Logs message or exception.
+     * @param  mixed  $message
+     * @return mixed
+     */
+    public static function log($message, $priority = ILogger::INFO)
+    {
+        return self::getLogger()->log($message, $priority);
+    }
+
+
+    /**
+     * Sends message to FireLogger console.
+     * @param  mixed  $message
+     * @return bool   was successful?
+     */
+    public static function fireLog($message)
+    {
+        if (!self::$productionMode && self::$showFireLogger) {
+            return self::getFireLogger()->log($message);
+        }
+    }
+
+
+    /**
+     * Detects debug mode by IP address.
+     * @param  string|array  $list  IP addresses or computer names whitelist detection
+     * @return bool
+     */
+    public static function detectDebugMode($list = null)
+    {
+        $addr = isset($_SERVER['REMOTE_ADDR'])
+            ? $_SERVER['REMOTE_ADDR']
+            : php_uname('n');
+        $secret = isset($_COOKIE[self::COOKIE_SECRET]) && is_string($_COOKIE[self::COOKIE_SECRET])
+            ? $_COOKIE[self::COOKIE_SECRET]
+            : null;
+        $list = is_string($list)
+            ? preg_split('#[,\s]+#', $list)
+            : (array) $list;
+        if (!isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !isset($_SERVER['HTTP_FORWARDED'])) {
+            $list[] = '127.0.0.1';
+            $list[] = '::1';
+        }
+        return in_array($addr, $list, true) || in_array("$secret@$addr", $list, true);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -169,7 +169,7 @@ 
 				self::exceptionHandler(new \RuntimeException('Logging directory must be absolute path.'));
 				self::$logDirectory = null;
 			} elseif (!is_dir(self::$logDirectory)) {
-				self::exceptionHandler(new \RuntimeException("Logging directory '" . self::$logDirectory . "' is not found."));
+				self::exceptionHandler(new \RuntimeException("Logging directory '".self::$logDirectory."' is not found."));
 				self::$logDirectory = null;
 			}
 		}
@@ -214,7 +214,7 @@ 
 
 		} elseif (headers_sent($file, $line) || ob_get_length()) {
 			throw new \LogicException(
-				__METHOD__ . '() called after some output has been sent. '
+				__METHOD__.'() called after some output has been sent. '
 				. ($file ? "Output started at $file:$line." : 'Try Tracy\OutputDebugger to find where output started.')
 			);
 
@@ -312,7 +312,7 @@ 
 
 			if (Helpers::isHtmlMode()) {
 				$logged = empty($e);
-				require self::$errorTemplate ?: __DIR__ . '/assets/Debugger/error.500.phtml';
+				require self::$errorTemplate ?: __DIR__.'/assets/Debugger/error.500.phtml';
 			} elseif (PHP_SAPI === 'cli') {
 				fwrite(STDERR, 'ERROR: application encountered an error and can not continue. '
 					. (isset($e) ? "Unable to log error.\n" : "Error was logged.\n"));
@@ -326,17 +326,17 @@ 
 
 		} else {
 			self::fireLog($exception);
-			$s = get_class($exception) . ($exception->getMessage() === '' ? '' : ': ' . $exception->getMessage())
-				. ' in ' . $exception->getFile() . ':' . $exception->getLine()
-				. "\nStack trace:\n" . $exception->getTraceAsString();
+			$s = get_class($exception).($exception->getMessage() === '' ? '' : ': '.$exception->getMessage())
+				. ' in '.$exception->getFile().':'.$exception->getLine()
+				. "\nStack trace:\n".$exception->getTraceAsString();
 			try {
 				$file = self::log($exception, self::EXCEPTION);
 				if ($file && !headers_sent()) {
 					header("X-Tracy-Error-Log: $file");
 				}
-				echo "$s\n" . ($file ? "(stored in $file)\n" : '');
+				echo "$s\n".($file ? "(stored in $file)\n" : '');
 				if ($file && self::$browser) {
-					exec(self::$browser . ' ' . escapeshellarg($file));
+					exec(self::$browser.' '.escapeshellarg($file));
 				}
 			} catch (\Exception $e) {
 				echo "$s\nUnable to log error: {$e->getMessage()}\n";
@@ -416,7 +416,7 @@ 
 			self::exceptionHandler($e);
 		}
 
-		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, $context);
+		$message = 'PHP '.Helpers::errorTypeToString($severity).': '.Helpers::improveError($message, $context);
 		$count = &self::getBar()->getPanel('Tracy:errors')->data["$file|$line|$message"];
 
 		if ($count++) { // repeated error
@@ -463,9 +463,9 @@ 
 		if (!self::$blueScreen) {
 			self::$blueScreen = new BlueScreen;
 			self::$blueScreen->info = [
-				'PHP ' . PHP_VERSION,
+				'PHP '.PHP_VERSION,
 				isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null,
-				'Tracy ' . self::VERSION,
+				'Tracy '.self::VERSION,
 			];
 		}
 		return self::$blueScreen;
@@ -535,7 +535,7 @@ 
 	public static function dump($var, $return = false)
 	{
 		if ($return) {
-			ob_start(function () {});
+			ob_start(function(){});
 			Dumper::dump($var, [
 				Dumper::DEPTH => self::$maxDepth,
 				Dumper::TRUNCATE => self::$maxLength,

Braces +4 added lines, -2 removed lines

@@ -419,7 +419,8 @@ 
 		$message = 'PHP ' . Helpers::errorTypeToString($severity) . ': ' . Helpers::improveError($message, $context);
 		$count = &self::getBar()->getPanel('Tracy:errors')->data["$file|$line|$message"];
 
-		if ($count++) { // repeated error
+		if ($count++) {
+// repeated error
 			return null;
 
 		} elseif (self::$productionMode) {
@@ -445,7 +446,8 @@ 
 				break;
 			}
 			$fnc = $status['chunk_size'] || !$errorOccurred ? 'ob_end_flush' : 'ob_end_clean';
-			if (!@$fnc()) { // @ may be not removable
+			if (!@$fnc()) {
+// @ may be not removable
 				break;
 			}
 		}