diff --git a/system/src/Grav/Browser.php b/system/src/Grav/Common/Browser.php
similarity index 100%
rename from system/src/Grav/Browser.php
rename to system/src/Grav/Common/Browser.php
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 9922f6973..1e7de2708 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitc72d8fa047c31604816395255e8b35b9::getLoader();
+return ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 42d97136e..da84d25ba 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/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',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 2c8b0e2b2..7ee214947 100644
--- a/vendor/composer/autoload_files.php
+++ b/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',
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index ede8c1c05..0060574d8 100644
--- a/vendor/composer/autoload_real.php
+++ b/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;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0ee0cd5f4..0b97cbfa4 100644
--- a/vendor/composer/installed.json
+++ b/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": {
diff --git a/vendor/erusev/parsedown-extra/ParsedownExtra.php b/vendor/erusev/parsedown-extra/ParsedownExtra.php
index b6ac978dc..ef6c6ee2e 100644
--- a/vendor/erusev/parsedown-extra/ParsedownExtra.php
+++ b/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');
diff --git a/vendor/erusev/parsedown-extra/composer.json b/vendor/erusev/parsedown-extra/composer.json
new file mode 100644
index 000000000..d9e9d461d
--- /dev/null
+++ b/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": ""}
+ }
+}
\ No newline at end of file
diff --git a/vendor/tracy/tracy/composer.json b/vendor/tracy/tracy/composer.json
new file mode 100644
index 000000000..a0e1fe71f
--- /dev/null
+++ b/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"]
+ }
+}
diff --git a/vendor/tracy/tracy/examples/Firebug-dump.php b/vendor/tracy/tracy/examples/Firebug-dump.php
new file mode 100644
index 000000000..46ca8160d
--- /dev/null
+++ b/vendor/tracy/tracy/examples/Firebug-dump.php
@@ -0,0 +1,45 @@
+
+
+
+
+FireLogger demo
+
+Requires Firefox, Firebug and FireLogger.
+
+ '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);
+}
diff --git a/vendor/tracy/tracy/examples/assets/arrow.png b/vendor/tracy/tracy/examples/assets/arrow.png
new file mode 100644
index 000000000..7c4a55f69
Binary files /dev/null and b/vendor/tracy/tracy/examples/assets/arrow.png differ
diff --git a/vendor/tracy/tracy/examples/assets/style.css b/vendor/tracy/tracy/examples/assets/style.css
new file mode 100644
index 000000000..0c2412383
--- /dev/null
+++ b/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;
+}
diff --git a/vendor/tracy/tracy/examples/barDump.php b/vendor/tracy/tracy/examples/barDump.php
new file mode 100644
index 000000000..4491d1ef5
--- /dev/null
+++ b/vendor/tracy/tracy/examples/barDump.php
@@ -0,0 +1,24 @@
+
+
+
+
+Tracy Debug Bar demo
+
+You can dump variables to bar in rightmost bottom egde.
+
+test', 'String');
diff --git a/vendor/tracy/tracy/examples/dump.php b/vendor/tracy/tracy/examples/dump.php
new file mode 100644
index 000000000..3ff89e202
--- /dev/null
+++ b/vendor/tracy/tracy/examples/dump.php
@@ -0,0 +1,39 @@
+
+
+Tracy Dumper demo
+
+test');
+
+dump($arr);
+
+dump($obj);
+
+
+echo "With location
\n";
+
+Debugger::$showLocation = TRUE;
+
+dump($arr);
diff --git a/vendor/tracy/tracy/examples/exception.php b/vendor/tracy/tracy/examples/exception.php
new file mode 100644
index 000000000..7135015db
--- /dev/null
+++ b/vendor/tracy/tracy/examples/exception.php
@@ -0,0 +1,33 @@
+
+
+Tracy Exception demo
+
+
+
+Tracy Fatal Error demo
+
+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;
diff --git a/vendor/tracy/tracy/src/Tracy/Helpers.php b/vendor/tracy/tracy/src/Tracy/Helpers.php
index 56f24e563..851098b1e 100644
--- a/vendor/tracy/tracy/src/Tracy/Helpers.php
+++ b/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) {
diff --git a/vendor/tracy/tracy/src/Tracy/Logger.php b/vendor/tracy/tracy/src/Tracy/Logger.php
index 89f29276b..767342cd1 100644
--- a/vendor/tracy/tracy/src/Tracy/Logger.php
+++ b/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)
{
diff --git a/vendor/tracy/tracy/src/Tracy/OutputDebugger.php b/vendor/tracy/tracy/src/Tracy/OutputDebugger.php
index f47abe94b..011a0ec46 100644
--- a/vendor/tracy/tracy/src/Tracy/OutputDebugger.php
+++ b/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 = '';
foreach ($this->list as $item) {
- list($file, $line, $s) = $item;
$res .= Helpers::editorLink($item[0], $item[1]) . ' '
. str_replace(self::BOM, 'BOM', Dumper::toHtml($item[2])) . "
\n";
}
diff --git a/vendor/tracy/tracy/src/Tracy/templates/bluescreen.css b/vendor/tracy/tracy/src/Tracy/templates/bluescreen.css
index b41f3d777..d3da27558 100644
--- a/vendor/tracy/tracy/src/Tracy/templates/bluescreen.css
+++ b/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;
diff --git a/vendor/tracy/tracy/src/Tracy/templates/bluescreen.phtml b/vendor/tracy/tracy/src/Tracy/templates/bluescreen.phtml
index 9e76c66bd..94729c6fc 100644
--- a/vendor/tracy/tracy/src/Tracy/templates/bluescreen.phtml
+++ b/vendor/tracy/tracy/src/Tracy/templates/bluescreen.phtml
@@ -117,7 +117,7 @@ $counter = 0;
inner-code
- " class="tracy-toggle tracy-collapsed">source
+ " class="tracy-toggle">source
" ?>
@@ -128,11 +128,11 @@ $counter = 0;
- id="tracyBsSrc">
+ id="tracyBsSrc">
- ">
+ ">