Neon: namespace changed to Nette\Neon

nette · Apr 29, 2014 · d40a980 · d40a980 · fprochazka · May 5, 2014
1 parent 22e1676
commit d40a980
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Nette/Bridges/Framework/TracyBridge.php b/Nette/Bridges/Framework/TracyBridge.php
@@ -36,14 +36,14 @@ public static function initialize()
 					'panel' => '<p>' . (is_file($e->sourceName) ? '<b>File:</b> ' . Helpers::editorLink($e->sourceName, $e->sourceLine) : htmlspecialchars($e->sourceName)) . '</p>'
 						. ($e->sourceCode ? '<pre>' . BlueScreen::highlightLine(htmlspecialchars($e->sourceCode), $e->sourceLine) . '</pre>' : ''),
 				);
-			} elseif ($e instanceof Nette\Utils\NeonException && preg_match('#line (\d+)#', $e->getMessage(), $m)) {
+			} elseif ($e instanceof Nette\Neon\Exception && preg_match('#line (\d+)#', $e->getMessage(), $m)) {
 				if ($item = Helpers::findTrace($e->getTrace(), 'Nette\DI\Config\Adapters\NeonAdapter::load')) {
 					return array(
 						'tab' => 'NEON',
 						'panel' => '<p><b>File:</b> ' . Helpers::editorLink($item['args'][0], $m[1]) . '</p>'
 							. BlueScreen::highlightFile($item['args'][0], $m[1])
 					);
-				} elseif ($item = Helpers::findTrace($e->getTrace(), 'Nette\Utils\Neon::decode')) {
+				} elseif ($item = Helpers::findTrace($e->getTrace(), 'Nette\Neon\Decoder::decode')) {
 					return array(
 						'tab' => 'NEON',
 						'panel' => BlueScreen::highlightPhp($item['args'][0], $m[1])

diff --git a/Nette/Loaders/NetteLoader.php b/Nette/Loaders/NetteLoader.php
@@ -60,6 +60,9 @@ class NetteLoader
 		'Nette\DateTime' => 'Nette\Utils\DateTime',
 		'Nette\Image' => 'Nette\Utils\Image',
 		'Nette\ObjectMixin' => 'Nette\Utils\ObjectMixin',
+		'Nette\Utils\NeonException' => 'Nette\Neon\Exception',
+		'Nette\Utils\NeonEntity' => 'Nette\Neon\Entity',
+		'Nette\Utils\Neon' => 'Nette\Neon\Neon',
 	);
 
 	/** @var array */