Session: added own session handler (removed problematic @session_start)

Author: dg

src/Tracy/Bar.php

@@ -13,10 +13,19 @@
  */
 class Bar
 {
+	/** @var Session */
+	private $session;
+
 	/** @var IBarPanel[] */
 	private $panels = [];
 
 
+	public function __construct(Session $session)
+	{
+		$this->session = $session;
+	}
+
+
 	/**
 	 * Add custom panel.
 	 * @param  IBarPanel
@@ -53,8 +62,7 @@ public function getPanel($id)
 	 */
 	public function render()
 	{
-		@session_start(); // @ session may be already started or it is not possible to start session
-		$previousBars = & $_SESSION['__NF']['tracybar-2.3'];
+		$previousBars = & $this->session->getContent()['redirect'];
 		$isRedirect = preg_match('#^Location:#im', implode("\n", headers_list()));
 		if ($isRedirect) {
 			Dumper::fetchLiveData();

src/Tracy/Debugger.php

@@ -114,6 +114,9 @@ class Debugger
 	/** @var ILogger */
 	private static $fireLogger;
 
+	/** @var Session */
+	private static $session;
+
 
 	/**
 	 * Static class - cannot be instantiated.
@@ -180,6 +183,10 @@ public static function enable($mode = NULL, $logDirectory = NULL, $email = NULL)
 
 		array_map('class_exists', ['Tracy\Bar', 'Tracy\BlueScreen', 'Tracy\DefaultBarPanel', 'Tracy\Dumper',
 			'Tracy\FireLogger', 'Tracy\Helpers', 'Tracy\Logger']);
+
+		if (!self::$productionMode) {
+			self::getSession()->open(session_save_path() ?: ini_get('upload_tmp_dir') ?: self::$logDirectory);
+		}
 	}
 
 
@@ -415,7 +422,7 @@ public static function getBlueScreen()
 	public static function getBar()
 	{
 		if (!self::$bar) {
-			self::$bar = new Bar;
+			self::$bar = new Bar(self::getSession());
 			self::$bar->addPanel($info = new DefaultBarPanel('info'), 'Tracy:info');
 			$info->cpuUsage = self::$cpuUsage;
 			self::$bar->addPanel(new DefaultBarPanel('errors'), 'Tracy:errors'); // filled by errorHandler()
@@ -459,6 +466,19 @@ public static function getFireLogger()
 	}
 
 
+	/**
+	 * @return Session
+	 * @internal
+	 */
+	public static function getSession()
+	{
+		if (!self::$session) {
+			self::$session = new Session;
+		}
+		return self::$session;
+	}
+
+
 	/********************* useful tools ****************d*g**/
 
 

src/Tracy/Session.php

@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * This file is part of the Tracy (https://tracy.nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Tracy;
+
+
+/**
+ * Session.
+ * @internal
+ */
+class Session
+{
+	const COOKIE_NAME = 'tracy-session';
+
+	/** @var string|NULL */
+	private $id;
+
+	/** @var resource|NULL */
+	private $handle;
+
+	/** @var array|NULL */
+	private $data;
+
+
+	public function open($directory)
+	{
+		$cookie = isset($_COOKIE[self::COOKIE_NAME]) ? $_COOKIE[self::COOKIE_NAME] : NULL;
+		if ($directory && is_string($cookie) && preg_match('#^[0-9a-f]{10}\z#i', $cookie)) {
+			$this->id = $cookie;
+		} elseif ($directory && PHP_SAPI !== 'cli' && !headers_sent()) {
+			$this->id = substr(md5(uniqid('', TRUE)), 0, 10);
+			setcookie(self::COOKIE_NAME, $this->id, 0, '/', '', FALSE, TRUE);
+		} else {
+			return;
+		}
+
+		$this->handle = fopen($directory . '/tracy.' . $this->id, 'a+');
+	}
+
+
+	public function getId()
+	{
+		return $this->id;
+	}
+
+
+	public function & getContent()
+	{
+		if ($this->handle && $this->data === NULL) {
+			flock($this->handle, LOCK_EX);
+			$this->data = @unserialize(stream_get_contents($this->handle)) ?: []; // @ - file may be empty
+		}
+		return $this->data;
+	}
+
+
+	public function __destruct()
+	{
+		if ($this->handle && $this->data !== NULL) {
+			ftruncate($this->handle, 0);
+			fwrite($this->handle, serialize($this->data));
+			fclose($this->handle);
+			$this->handle = NULL;
+		}
+	}
+
+}

src/tracy.php

@@ -17,4 +17,5 @@
 require __DIR__ . '/Tracy/Logger.php';
 require __DIR__ . '/Tracy/Debugger.php';
 require __DIR__ . '/Tracy/OutputDebugger.php';
+require __DIR__ . '/Tracy/Session.php';
 require __DIR__ . '/shortcuts.php';