Moved Browser class into its proper location

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9::getLoader();
+return ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809::getLoader();

vendor/composer/autoload_classmap.php

@@ -27,7 +27,7 @@ return array(
     'DooDigestAuth' => $vendorDir . '/mrclay/minify/min/lib/DooDigestAuth.php',
     'FirePHP' => $vendorDir . '/mrclay/minify/min/lib/FirePHP.php',
     'Grav\\Common\\Assets' => $baseDir . '/system/src/Grav/Common/Assets.php',
-    'Grav\\Common\\Browser' => $baseDir . '/system/src/Grav/Browser.php',
+    'Grav\\Common\\Browser' => $baseDir . '/system/src/Grav/Common/Browser.php',
     'Grav\\Common\\Cache' => $baseDir . '/system/src/Grav/Common/Cache.php',
     'Grav\\Common\\Config' => $baseDir . '/system/src/Grav/Common/Config.php',
     'Grav\\Common\\Data\\Blueprint' => $baseDir . '/system/src/Grav/Common/Data/Blueprint.php',

vendor/composer/autoload_files.php

@@ -6,8 +6,8 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    $vendorDir . '/tracy/tracy/src/shortcuts.php',
     $vendorDir . '/ircmaxell/password-compat/lib/password.php',
     $vendorDir . '/donatj/phpuseragentparser/Source/UserAgentParser.php',
+    $vendorDir . '/tracy/tracy/src/shortcuts.php',
     $baseDir . '/system/defines.php',
 );

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9
+class ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequirec72d8fa047c31604816395255e8b35b9($file);
+            composerRequire063cb81ce05ae9832bbd593f72977809($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirec72d8fa047c31604816395255e8b35b9($file)
+function composerRequire063cb81ce05ae9832bbd593f72977809($file)
 {
     require $file;
 }

vendor/composer/installed.json

@@ -371,62 +371,6 @@
         "description": "Symfony EventDispatcher Component",
         "homepage": "http://symfony.com"
     },
-    {
-        "name": "tracy/tracy",
-        "version": "v2.2.2",
-        "version_normalized": "2.2.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nette/tracy.git",
-            "reference": "f5a2647c9d0174d218d626eab3952ea3a523c6e7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nette/tracy/zipball/f5a2647c9d0174d218d626eab3952ea3a523c6e7",
-            "reference": "f5a2647c9d0174d218d626eab3952ea3a523c6e7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.1"
-        },
-        "require-dev": {
-            "nette/tester": "~1.0"
-        },
-        "time": "2014-06-24 01:18:03",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/Tracy"
-            ],
-            "files": [
-                "src/shortcuts.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause",
-            "GPL-2.0",
-            "GPL-3.0"
-        ],
-        "authors": [
-            {
-                "name": "David Grudl",
-                "homepage": "http://davidgrudl.com"
-            },
-            {
-                "name": "Nette Community",
-                "homepage": "http://nette.org/contributors"
-            }
-        ],
-        "description": "Tracy: useful PHP debugger",
-        "homepage": "http://tracy.nette.org",
-        "keywords": [
-            "debug",
-            "debugger",
-            "nette"
-        ]
-    },
     {
         "name": "gregwar/cache",
         "version": "v1.0.7",
@@ -666,6 +610,62 @@
             "useragent"
         ]
     },
+    {
+        "name": "tracy/tracy",
+        "version": "v2.2.3",
+        "version_normalized": "2.2.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nette/tracy.git",
+            "reference": "97889d2b8cfb7607cc370ca0ddb97c6f5b43deb9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nette/tracy/zipball/97889d2b8cfb7607cc370ca0ddb97c6f5b43deb9",
+            "reference": "97889d2b8cfb7607cc370ca0ddb97c6f5b43deb9",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.1"
+        },
+        "require-dev": {
+            "nette/tester": "~1.0"
+        },
+        "time": "2014-08-24 23:36:30",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/Tracy"
+            ],
+            "files": [
+                "src/shortcuts.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause",
+            "GPL-2.0",
+            "GPL-3.0"
+        ],
+        "authors": [
+            {
+                "name": "David Grudl",
+                "homepage": "http://davidgrudl.com"
+            },
+            {
+                "name": "Nette Community",
+                "homepage": "http://nette.org/contributors"
+            }
+        ],
+        "description": "Tracy: useful PHP debugger",
+        "homepage": "http://tracy.nette.org",
+        "keywords": [
+            "debug",
+            "debugger",
+            "nette"
+        ]
+    },
     {
         "name": "erusev/parsedown-extra",
         "version": "dev-master",
@@ -673,18 +673,18 @@
         "source": {
             "type": "git",
             "url": "https://github.com/erusev/parsedown-extra.git",
-            "reference": "7578fe28ce42e7a1fff4ba2aada3807c4c03d04b"
+            "reference": "424e63fef5299f2a5a0464cd22a666b7a7b48657"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/7578fe28ce42e7a1fff4ba2aada3807c4c03d04b",
-            "reference": "7578fe28ce42e7a1fff4ba2aada3807c4c03d04b",
+            "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/424e63fef5299f2a5a0464cd22a666b7a7b48657",
+            "reference": "424e63fef5299f2a5a0464cd22a666b7a7b48657",
             "shasum": ""
         },
         "require": {
             "erusev/parsedown": "~1.0"
         },
-        "time": "2014-08-16 11:20:35",
+        "time": "2014-08-25 10:49:57",
         "type": "library",
         "installation-source": "source",
         "autoload": {

vendor/erusev/parsedown-extra/ParsedownExtra.php

@@ -166,7 +166,12 @@ class ParsedownExtra extends Parsedown
     {
         $DOMDocument = new DOMDocument;
 
-        $DOMDocument->loadXML($Block['element']);
+        $DOMDocument->loadXML($Block['element'], LIBXML_NOERROR | LIBXML_NOWARNING);
+
+        if ($DOMDocument->documentElement === null)
+        {
+            return $Block;
+        }
 
         $result = $DOMDocument->documentElement->getAttribute('markdown');
 

vendor/erusev/parsedown-extra/composer.json

@@ -0,0 +1,21 @@
+{
+    "name": "erusev/parsedown-extra",
+    "description": "An extension of Parsedown that adds support for Markdown Extra.",
+    "keywords": ["markdown", "markdown extra", "parser", "parsedown"],
+    "homepage": "https://github.com/erusev/parsedown-extra",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Emanuil Rusev",
+            "email": "hello@erusev.com",
+            "homepage": "http://erusev.com"
+        }
+    ],
+    "require": {
+        "erusev/parsedown": "~1.0"
+    },
+    "autoload": {
+        "psr-0": {"ParsedownExtra": ""}
+    }
+}

vendor/tracy/tracy/composer.json

@@ -0,0 +1,27 @@
+{
+	"name": "tracy/tracy",
+	"description": "Tracy: useful PHP debugger",
+	"keywords": ["debug", "debugger", "nette"],
+	"homepage": "http://tracy.nette.org",
+	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
+	"authors": [
+		{
+			"name": "David Grudl",
+			"homepage": "http://davidgrudl.com"
+		},
+		{
+			"name": "Nette Community",
+			"homepage": "http://nette.org/contributors"
+		}
+	],
+	"require": {
+		"php": ">=5.3.1"
+	},
+	"require-dev": {
+		"nette/tester": "~1.0"
+	},
+	"autoload": {
+		"classmap": ["src/Tracy"],
+		"files": ["src/shortcuts.php"]
+	}
+}

vendor/tracy/tracy/examples/Firebug-dump.php

@@ -0,0 +1,45 @@
+<?php ob_start(); // needed by FireLogger ?>
+
+<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
+
+<h1>FireLogger demo</h1>
+
+<p>Requires Firefox, Firebug and <a href="http://firelogger.binaryage.com">FireLogger</a>.</p>
+
+<?php
+
+require __DIR__ . '/../src/tracy.php';
+
+use Tracy\Debugger;
+
+
+$arr = array(10, 20, array('key1' => 'val1', 'key2' => TRUE));
+
+// will show in FireLogger tab in Firebug
+Debugger::fireLog('Hello World');
+Debugger::fireLog($arr);
+
+
+function first($arg1, $arg2)
+{
+	second(TRUE, FALSE);
+}
+
+
+
+function second($arg1, $arg2)
+{
+	third(array(1, 2, 3));
+}
+
+
+function third($arg1)
+{
+	throw new Exception('The my exception', 123);
+}
+
+try {
+	first(10, 'any string');
+} catch (Exception $e) {
+	Debugger::fireLog($e);
+}

vendor/tracy/tracy/examples/assets/style.css

@@ -0,0 +1,23 @@
+body {
+	font: 15px/1.5 Tahoma, sans-serif;
+	color: #333;
+	background: #fff;
+	margin: 1.6em;
+	padding: 0;
+}
+
+h1 {
+	font-size: 210%;
+	font-weight: normal;
+	color: #036;
+}
+
+pre.tracy-dump {
+	border: 1px solid silver;
+	padding: 1em;
+	margin: 1em 0;
+}
+
+a {
+	color: #000080;
+}

vendor/tracy/tracy/examples/barDump.php

@@ -0,0 +1,24 @@
+<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
+
+<style> html { background: url(assets/arrow.png) no-repeat bottom right; height: 100%; } </style>
+
+<h1>Tracy Debug Bar demo</h1>
+
+<p>You can dump variables to bar in rightmost bottom egde.</p>
+
+<?php
+
+require __DIR__ . '/../src/tracy.php';
+
+use Tracy\Debugger;
+
+Debugger::enable();
+
+$arr = array(10, 20.2, TRUE, NULL, 'hello', (object) NULL, array());
+
+
+Debugger::barDump(get_defined_vars());
+
+Debugger::barDump($arr, 'The Array');
+
+Debugger::barDump('<a href="#">test</a>', 'String');

vendor/tracy/tracy/examples/dump.php

@@ -0,0 +1,39 @@
+<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
+
+<h1>Tracy Dumper demo</h1>
+
+<?php
+
+require __DIR__ . '/../src/tracy.php';
+
+use Tracy\Debugger;
+
+
+Debugger::enable(Debugger::DEVELOPMENT);
+
+class Test
+{
+	public $x = array(10, NULL);
+
+	private $y = 'hello';
+
+	protected $z = 30;
+}
+
+$arr = array(10, 20.2, TRUE, NULL, 'hello', (object) NULL, array(), fopen(__FILE__, 'r'));
+
+$obj = new Test;
+
+
+dump('<a href="#">test</a>');
+
+dump($arr);
+
+dump($obj);
+
+
+echo "<h2>With location</h2>\n";
+
+Debugger::$showLocation = TRUE;
+
+dump($arr);

vendor/tracy/tracy/examples/exception.php

@@ -0,0 +1,33 @@
+<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
+
+<h1>Tracy Exception demo</h1>
+
+<?php
+
+require __DIR__ . '/../src/tracy.php';
+
+use Tracy\Debugger;
+
+Debugger::enable();
+
+
+function first($arg1, $arg2)
+{
+	second(TRUE, FALSE);
+}
+
+
+
+function second($arg1, $arg2)
+{
+	third(array(1, 2, 3));
+}
+
+
+function third($arg1)
+{
+	throw new Exception('The my exception', 123);
+}
+
+
+first(10, 'any string');

vendor/tracy/tracy/examples/fatal-error.php

@@ -0,0 +1,35 @@
+<!DOCTYPE html><link rel="stylesheet" href="assets/style.css">
+
+<h1>Tracy Fatal Error demo</h1>
+
+<?php
+
+require __DIR__ . '/../src/tracy.php';
+
+use Tracy\Debugger;
+
+
+Debugger::enable();
+
+
+
+function first($arg1, $arg2)
+{
+	second(TRUE, FALSE);
+}
+
+
+
+function second($arg1, $arg2)
+{
+	third(array(1, 2, 3));
+}
+
+
+function third($arg1)
+{
+	missing_funcion();
+}
+
+
+first(10, 'any string');

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

@@ -103,6 +103,9 @@ class Debugger
 	/** @var string 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 string|array email(s) to which send error notifications */
 	public static $email;
 
@@ -475,6 +478,12 @@ class Debugger
 		} elseif (($severity & error_reporting()) !== $severity) {
 			return FALSE; // calls normal error handler to fill-in error_get_last()
 
+		} elseif (($severity & self::$logSeverity) === $severity) {
+			$e = new ErrorException($message, 0, $severity, $file, $line);
+			$e->context = $context;
+			self::log($e, self::ERROR);
+			return NULL;
+
 		} elseif (!self::$productionMode && (is_bool(self::$strictMode) ? self::$strictMode : ((self::$strictMode & $severity) === $severity))) {
 			$e = new ErrorException($message, 0, $severity, $file, $line);
 			$e->context = $context;

vendor/tracy/tracy/src/Tracy/Helpers.php

@@ -79,6 +79,7 @@ class Helpers
 	}
 
 
+	/** @internal */
 	public static function fixStack($exception)
 	{
 		if (function_exists('xdebug_get_function_stack')) {
@@ -104,11 +105,7 @@ class Helpers
 	}
 
 
-	/**
-	 * Returns correctly UTF-8 encoded string.
-	 * @param  string  byte stream to fix
-	 * @return string
-	 */
+	/** @internal */
 	public static function fixEncoding($s)
 	{
 		if (PHP_VERSION_ID < 50400) {

vendor/tracy/tracy/src/Tracy/Logger.php

@@ -72,6 +72,7 @@ class Logger
 	 * @param  string
 	 * @param  string
 	 * @return void
+	 * @internal
 	 */
 	public static function defaultMailer($message, $email)
 	{

vendor/tracy/tracy/src/Tracy/OutputDebugger.php

@@ -42,6 +42,7 @@ class OutputDebugger
 	}
 
 
+	/** @internal */
 	public function handler($s, $phase)
 	{
 		$trace = debug_backtrace(FALSE);
@@ -62,7 +63,6 @@ class OutputDebugger
 	{
 		$res = '<style>code, pre {white-space:nowrap} a {text-decoration:none} pre {color:gray;display:inline} big {color:red}</style><code>';
 		foreach ($this->list as $item) {
-			list($file, $line, $s) = $item;
 			$res .= Helpers::editorLink($item[0], $item[1]) . ' '
 				. str_replace(self::BOM, '<big>BOM</big>', Dumper::toHtml($item[2])) . "<br>\n";
 		}

vendor/tracy/tracy/src/Tracy/templates/bluescreen.css

@@ -14,6 +14,7 @@ html {
 	background: white;
 	color: #333;
 	position: absolute;
+	z-index: 20000;
 	left: 0;
 	top: 0;
 	width: 100%;
@@ -54,7 +55,6 @@ html {
 	position: absolute;
 	right: .5em;
 	top: .5em;
-	z-index: 20000;
 	text-decoration: none;
 	background: #CD1818;
 	color: white !important;

vendor/tracy/tracy/src/Tracy/templates/bluescreen.phtml

@@ -117,7 +117,7 @@ $counter = 0;
 						<i>inner-code</i><?php if (isset($row['line'])) echo ':', $row['line'] ?>
 					<?php endif ?>
 
-					<?php if (isset($row['file']) && is_file($row['file'])): ?><a href="#tracyBsSrc<?php echo "$level-$key" ?>" class="tracy-toggle tracy-collapsed">source</a>&nbsp; <?php endif ?>
+					<?php if (isset($row['file']) && is_file($row['file'])): ?><a href="#tracyBsSrc<?php echo "$level-$key" ?>" class="tracy-toggle<?php if ($expanded !== $key) echo ' tracy-collapsed' ?>">source</a>&nbsp; <?php endif ?>
 
 					<?php if (isset($row['object'])) echo "<a href='#tracyBsObj$level-$key' class='tracy-toggle tracy-collapsed'>" ?>
 					<?php if (isset($row['class'])) echo htmlspecialchars($row['class'] . $row['type']) ?>
@@ -128,11 +128,11 @@ $counter = 0;
 					</p>
 
 					<?php if (isset($row['file']) && is_file($row['file'])): ?>
-						<div <?php if ($expanded !== $key) echo 'class="tracy-collapsed"'; ?> id="tracyBsSrc<?php echo "$level-$key" ?>"><?php echo self::highlightFile($row['file'], $row['line']) ?></div>
+						<div <?php if ($expanded !== $key) echo 'class="tracy-collapsed"' ?> id="tracyBsSrc<?php echo "$level-$key" ?>"><?php echo self::highlightFile($row['file'], $row['line']) ?></div>
 					<?php endif ?>
 
 					<?php if (isset($row['object'])): ?>
-						<div class="tracy-collapsed outer" id="tracyBsObj<?php echo "$level-$key" ?>"><?php echo Dumper::toHtml($row['object']); ?></div>
+						<div class="tracy-collapsed outer" id="tracyBsObj<?php echo "$level-$key" ?>"><?php echo Dumper::toHtml($row['object']) ?></div>
 					<?php endif ?>
 
 					<?php if (!empty($row['args'])): ?>