Skip to content

Commit

Permalink
Debugger: CSS classes php-xxx changed to nette-dump-xxx (BC break)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dg
dg committed Oct 4, 2012
1 parent 0570564 commit 28b7040
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion Nette/Diagnostics/Debugger.php
View file
Expand Up @@ -602,7 +602,7 @@ public static function dump($var, $return = FALSE)

if (self::$consoleMode) {
if (self::$consoleColors && substr(getenv('TERM'), 0, 5) === 'xterm') {
$output = preg_replace_callback('#<span class="php-(\w+)">|</span>#', function($m) {
$output = preg_replace_callback('#<span class="nette-(\w+)">|</span>#', function($m) {
return "\033[" . (isset($m[1], Debugger::$consoleColors[$m[1]]) ? Debugger::$consoleColors[$m[1]] : '0') . "m";
}, $output);
}
Expand Down
24 changes: 12 additions & 12 deletions Nette/Diagnostics/Helpers.php
View file
Expand Up @@ -84,20 +84,20 @@ public static function htmlDump(&$var, $level = 0)
}

if (is_bool($var)) {
return '<span class="php-bool">' . ($var ? 'TRUE' : 'FALSE') . "</span>\n";
return '<span class="nette-dump-bool">' . ($var ? 'TRUE' : 'FALSE') . "</span>\n";

} elseif ($var === NULL) {
return "<span class=\"php-null\">NULL</span>\n";
return "<span class=\"nette-dump-null\">NULL</span>\n";

} elseif (is_int($var)) {
return "<span class=\"php-int\">$var</span>\n";
return "<span class=\"nette-dump-int\">$var</span>\n";

} elseif (is_float($var)) {
$var = var_export($var, TRUE);
if (strpos($var, '.') === FALSE) {
$var .= '.0';
}
return "<span class=\"php-float\">$var</span>\n";
return "<span class=\"nette-dump-float\">$var</span>\n";

} elseif (is_string($var)) {
if (Debugger::$maxLen && strlen($var) > Debugger::$maxLen) {
Expand All @@ -107,10 +107,10 @@ public static function htmlDump(&$var, $level = 0)
}
$s = strtr($s, preg_match($reBinary, $s) || preg_last_error() ? $tableBin : $tableUtf);
$len = strlen($var);
return "<span class=\"php-string\">\"$s\"</span>" . ($len > 1 ? " ($len)" : "") . "\n";
return "<span class=\"nette-dump-string\">\"$s\"</span>" . ($len > 1 ? " ($len)" : "") . "\n";

} elseif (is_array($var)) {
$s = '<span class="php-array">array</span>(' . count($var) . ") ";
$s = '<span class="nette-dump-array">array</span>(' . count($var) . ") ";
$space = str_repeat($space1 = ' ', $level);
$brackets = range(0, count($var) - 1) === array_keys($var) ? "[]" : "{}";

Expand All @@ -133,7 +133,7 @@ public static function htmlDump(&$var, $level = 0)
}
$k = strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf);
$k = htmlSpecialChars(preg_match('#^\w+$#', $k) ? $k : "\"$k\"");
$s .= "$space$space1<span class=\"php-key\">$k</span> => " . self::htmlDump($v, $level + 1);
$s .= "$space$space1<span class=\"nette-dump-key\">$k</span> => " . self::htmlDump($v, $level + 1);
}
unset($var[$marker]);
$s .= "$space$brackets[1]</code>";
Expand All @@ -154,7 +154,7 @@ public static function htmlDump(&$var, $level = 0)
} else {
$arr = (array) $var;
}
$s = '<span class="php-object">' . get_class($var) . "</span>(" . count($arr) . ") ";
$s = '<span class="nette-dump-object">' . get_class($var) . "</span>(" . count($arr) . ") ";
$space = str_repeat($space1 = ' ', $level);

static $list = array();
Expand All @@ -169,12 +169,12 @@ public static function htmlDump(&$var, $level = 0)
foreach ($arr as $k => &$v) {
$m = '';
if ($k[0] === "\x00") {
$m = ' <span class="php-visibility">' . ($k[1] === '*' ? 'protected' : 'private') . '</span>';
$m = ' <span class="nette-dump-visibility">' . ($k[1] === '*' ? 'protected' : 'private') . '</span>';
$k = substr($k, strrpos($k, "\x00") + 1);
}
$k = strtr($k, preg_match($reBinary, $k) || preg_last_error() ? $tableBin : $tableUtf);
$k = htmlSpecialChars(preg_match('#^\w+$#', $k) ? $k : "\"$k\"");
$s .= "$space$space1<span class=\"php-key\">$k</span>$m => " . self::htmlDump($v, $level + 1);
$s .= "$space$space1<span class=\"nette-dump-key\">$k</span>$m => " . self::htmlDump($v, $level + 1);
}
array_pop($list);
$s .= "$space}</code>";
Expand All @@ -186,14 +186,14 @@ public static function htmlDump(&$var, $level = 0)

} elseif (is_resource($var)) {
$type = get_resource_type($var);
$s = '<span class="php-resource">' . htmlSpecialChars($type) . " resource</span> ";
$s = '<span class="nette-dump-resource">' . htmlSpecialChars($type) . " resource</span> ";

static $info = array('stream' => 'stream_get_meta_data', 'curl' => 'curl_getinfo');
if (isset($info[$type])) {
$space = str_repeat($space1 = ' ', $level);
$s .= "<code>{\n";
foreach (call_user_func($info[$type], $var) as $k => $v) {
$s .= $space . $space1 . '<span class="php-key">' . htmlSpecialChars($k) . "</span> => " . self::htmlDump($v, $level + 1);
$s .= $space . $space1 . '<span class="nette-dump-key">' . htmlSpecialChars($k) . "</span> => " . self::htmlDump($v, $level + 1);
}
$s .= "$space}</code>";
}
Expand Down
2 changes: 1 addition & 1 deletion Nette/Diagnostics/templates/bar.dumps.panel.phtml
View file
Expand Up @@ -36,7 +36,7 @@ use Nette;
color: #999;
}

#nette-debug .nette-DumpPanel pre .php-array, #nette-debug .nette-DumpPanel pre .php-object {
#nette-debug .nette-DumpPanel pre .nette-dump-array, #nette-debug .nette-DumpPanel pre .nette-dump-object {
color: #c16549;
}

Expand Down
20 changes: 10 additions & 10 deletions Nette/Diagnostics/templates/bar.phtml
View file
Expand Up @@ -290,24 +290,24 @@ use Nette;
color: inherit;
background: inherit;
}
pre.nette-dump .php-array, pre.nette-dump .php-object,
#nette-debug pre.nette-dump .php-array, #nette-debug pre.nette-dump .php-object {
pre.nette-dump .nette-dump-array, pre.nette-dump .nette-dump-object,
#nette-debug pre.nette-dump .nette-dump-array, #nette-debug pre.nette-dump .nette-dump-object {
color: #C22;
}
pre.nette-dump .php-string,
#nette-debug pre.nette-dump .php-string {
pre.nette-dump .nette-dump-string,
#nette-debug pre.nette-dump .nette-dump-string {
color: #080;
}
pre.nette-dump .php-int, pre.nette-dump .php-float,
#nette-debug pre.nette-dump .php-int, #nette-debug pre.nette-dump .php-float {
pre.nette-dump .nette-dump-int, pre.nette-dump .nette-dump-float,
#nette-debug pre.nette-dump .nette-dump-int, #nette-debug pre.nette-dump .nette-dump-float {
color: #37D;
}
pre.nette-dump .php-null, pre.nette-dump .php-bool,
#nette-debug pre.nette-dump .php-null, #nette-debug pre.nette-dump .php-bool {
pre.nette-dump .nette-dump-null, pre.nette-dump .nette-dump-bool,
#nette-debug pre.nette-dump .nette-dump-null, #nette-debug pre.nette-dump .nette-dump-bool {
color: black;
}
pre.nette-dump .php-visibility,
#nette-debug pre.nette-dump .php-visibility {
pre.nette-dump .nette-dump-visibility,
#nette-debug pre.nette-dump .nette-dump-visibility {
font-size: 85%; color: #999;
}

Expand Down
8 changes: 4 additions & 4 deletions Nette/Diagnostics/templates/bluescreen.phtml
View file
Expand Up @@ -189,19 +189,19 @@ $counter = 0;
border: none;
}

#netteBluescreen pre .php-array, #netteBluescreen pre .php-object {
#netteBluescreen pre .nette-dump-array, #netteBluescreen pre .nette-dump-object {
color: #C22;
}

#netteBluescreen pre .php-string {
#netteBluescreen pre .nette-dump-string {
color: #080;
}

#netteBluescreen pre .php-int, #netteBluescreen pre .php-float, #netteBluescreen pre .php-null, #netteBluescreen pre .php-bool {
#netteBluescreen pre .nette-dump-int, #netteBluescreen pre .nette-dump-float, #netteBluescreen pre .nette-dump-null, #netteBluescreen pre .nette-dump-bool {
color: #328ADC;
}

#netteBluescreen pre .php-visibility {
#netteBluescreen pre .nette-dump-visibility {
font-size: 85%;
color: #998;
}
Expand Down
44 changes: 22 additions & 22 deletions tests/Nette/Diagnostics/Debugger.dump().001.phpt
View file
Expand Up @@ -34,56 +34,56 @@ class Test

Debugger::$consoleMode = FALSE;

Assert::match( '<pre class="nette-dump"><span class="php-null">NULL</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-null">NULL</span>
</pre>', Debugger::dump(NULL, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-bool">TRUE</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-bool">TRUE</span>
</pre>', Debugger::dump(TRUE, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-bool">FALSE</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-bool">FALSE</span>
</pre>', Debugger::dump(FALSE, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-int">0</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-int">0</span>
</pre>', Debugger::dump(0, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-int">1</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-int">1</span>
</pre>', Debugger::dump(1, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-float">0.0</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-float">0.0</span>
</pre>', Debugger::dump(0.0, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-float">0.1</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-float">0.1</span>
</pre>', Debugger::dump(0.1, TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-string">""</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-string">""</span>
</pre>', Debugger::dump('', TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-string">"0"</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-string">"0"</span>
</pre>', Debugger::dump('0', TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-string">"\\x00"</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-string">"\\x00"</span>
</pre>', Debugger::dump("\x00", TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-array">array</span>(5) <code>[
<span class="php-key">0</span> => <span class="php-int">1</span>
<span class="php-key">1</span> => <span class="php-string">"hello"</span> (5)
<span class="php-key">2</span> => <span class="php-array">array</span>(0)
<span class="php-key">3</span> => <span class="php-array">array</span>(2) <code>[
<span class="php-key">0</span> => <span class="php-int">1</span>
<span class="php-key">1</span> => <span class="php-int">2</span>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-array">array</span>(5) <code>[
<span class="nette-dump-key">0</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">1</span> => <span class="nette-dump-string">"hello"</span> (5)
<span class="nette-dump-key">2</span> => <span class="nette-dump-array">array</span>(0)
<span class="nette-dump-key">3</span> => <span class="nette-dump-array">array</span>(2) <code>[
<span class="nette-dump-key">0</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">1</span> => <span class="nette-dump-int">2</span>
]</code>
<span class="php-key">4</span> => <span class="php-array">array</span>(2) <code>{
<span class="php-key">1</span> => <span class="php-int">1</span>
<span class="php-key">2</span> => <span class="php-int">2</span>
<span class="nette-dump-key">4</span> => <span class="nette-dump-array">array</span>(2) <code>{
<span class="nette-dump-key">1</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">2</span> => <span class="nette-dump-int">2</span>
}</code>
]</code>
</pre>
', Debugger::dump(array(1, 'hello', array(), array(1, 2), array(1 => 1, 2)), TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-resource">stream resource</span> <code>{%A%}</code>
Assert::match( '<pre class="nette-dump"><span class="nette-dump-resource">stream resource</span> <code>{%A%}</code>
</pre>', Debugger::dump(fopen(__FILE__, 'r'), TRUE) );

Assert::match( '<pre class="nette-dump"><span class="php-object">stdClass</span>(0)
Assert::match( '<pre class="nette-dump"><span class="nette-dump-object">stdClass</span>(0)
</pre>', Debugger::dump((object) NULL, TRUE) );

$obj = new Test;
Expand Down
6 changes: 3 additions & 3 deletions tests/Nette/Diagnostics/Debugger.dump().002.phpt
View file
Expand Up @@ -28,12 +28,12 @@ Debugger::dump(trim('hello'));
dump('hello');

Assert::match( '<pre title="dump(\'hello\')
in file %a% on line %d%" class="nette-dump"><span class="php-string">"hello"</span> (5)
in file %a% on line %d%" class="nette-dump"><span class="nette-dump-string">"hello"</span> (5)
</pre>
<pre title="dump(trim(\'hello\'))
in file %a% on line %d%" class="nette-dump"><span class="php-string">"hello"</span> (5) <small>in %a%:%d%</small>
in file %a% on line %d%" class="nette-dump"><span class="nette-dump-string">"hello"</span> (5) <small>in %a%:%d%</small>
</pre>
<pre title="dump(\'hello\')
in file %a% on line %d%" class="nette-dump"><span class="php-string">"hello"</span> (5) <small>in %a%:%d%</small>
in file %a% on line %d%" class="nette-dump"><span class="nette-dump-string">"hello"</span> (5) <small>in %a%:%d%</small>
</pre>
', ob_get_clean() );
2 changes: 1 addition & 1 deletion tests/Nette/Diagnostics/Debugger.dump().003.phpt
View file
Expand Up @@ -23,5 +23,5 @@ ob_start();
Debugger::dump('sensitive data');
Assert::same( '', ob_get_clean() );

Assert::match( '<pre class="nette-dump"><span class="php-string">"forced"</span> (6)
Assert::match( '<pre class="nette-dump"><span class="nette-dump-string">"forced"</span> (6)
</pre>', Debugger::dump('forced', TRUE) );
12 changes: 6 additions & 6 deletions tests/Nette/Diagnostics/Debugger.error-in-eval.expect
View file
Expand Up @@ -57,9 +57,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-1">
<table>
<tr><th>$message</th><td><pre class="nette-dump"><span class="php-string">"The my error"</span> (12)
<tr><th>$message</th><td><pre class="nette-dump"><span class="nette-dump-string">"The my error"</span> (12)
</pre></td></tr>
<tr><th>$error_type</th><td><pre class="nette-dump"><span class="php-int">256</span>
<tr><th>$error_type</th><td><pre class="nette-dump"><span class="nette-dump-int">256</span>
</pre></td></tr>
</table>
</div>
Expand Down Expand Up @@ -90,9 +90,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-3">
<table>
<tr><th>$user</th><td><pre class="nette-dump"><span class="php-string">"root"</span> (4)
<tr><th>$user</th><td><pre class="nette-dump"><span class="nette-dump-string">"root"</span> (4)
</pre></td></tr>
<tr><th>$pass</th><td><pre class="nette-dump"><span class="php-string">"xxx"</span> (3)
<tr><th>$pass</th><td><pre class="nette-dump"><span class="nette-dump-string">"xxx"</span> (3)
</pre></td></tr>
</table>
</div>
Expand All @@ -112,9 +112,9 @@
<div id="netteBsPnl3" class="inner">
<div class="outer">
<table>
<tr><th>$user</th><td><pre class="nette-dump"><span class="php-string">"root"</span> (4)
<tr><th>$user</th><td><pre class="nette-dump"><span class="nette-dump-string">"root"</span> (4)
</pre></td></tr>
<tr><th>$pass</th><td><pre class="nette-dump"><span class="php-string">"xxx"</span> (3)
<tr><th>$pass</th><td><pre class="nette-dump"><span class="nette-dump-string">"xxx"</span> (3)
</pre></td></tr>
</table>
</div>
Expand Down
16 changes: 8 additions & 8 deletions tests/Nette/Diagnostics/Debugger.exception.html.expect
View file
Expand Up @@ -57,10 +57,10 @@

<div class="nette-collapsed outer" id="netteBsArgs1-0">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="php-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="php-key">0</span> => <span class="php-int">1</span>
<span class="php-key">1</span> => <span class="php-int">2</span>
<span class="php-key">2</span> => <span class="php-int">3</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="nette-dump-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="nette-dump-key">0</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">1</span> => <span class="nette-dump-int">2</span>
<span class="nette-dump-key">2</span> => <span class="nette-dump-int">3</span>
]</code>
</pre></td></tr>
</table>
Expand All @@ -80,9 +80,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-1">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="php-bool">TRUE</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="nette-dump-bool">TRUE</span>
</pre></td></tr>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="php-bool">FALSE</span>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="nette-dump-bool">FALSE</span>
</pre></td></tr>
</table>
</div>
Expand All @@ -101,9 +101,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-2">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="php-int">10</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="nette-dump-int">10</span>
</pre></td></tr>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="php-string">"any string"</span> (10)
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="nette-dump-string">"any string"</span> (10)
</pre></td></tr>
</table>
</div>
Expand Down
24 changes: 12 additions & 12 deletions tests/Nette/Diagnostics/Debugger.strict.html.expect
View file
Expand Up @@ -57,10 +57,10 @@

<div class="nette-collapsed outer" id="netteBsArgs1-1">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="php-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="php-key">0</span> => <span class="php-int">1</span>
<span class="php-key">1</span> => <span class="php-int">2</span>
<span class="php-key">2</span> => <span class="php-int">3</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="nette-dump-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="nette-dump-key">0</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">1</span> => <span class="nette-dump-int">2</span>
<span class="nette-dump-key">2</span> => <span class="nette-dump-int">3</span>
]</code>
</pre></td></tr>
</table>
Expand All @@ -80,9 +80,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-2">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="php-bool">TRUE</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="nette-dump-bool">TRUE</span>
</pre></td></tr>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="php-bool">FALSE</span>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="nette-dump-bool">FALSE</span>
</pre></td></tr>
</table>
</div>
Expand All @@ -101,9 +101,9 @@

<div class="nette-collapsed outer" id="netteBsArgs1-3">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="php-int">10</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><span class="nette-dump-int">10</span>
</pre></td></tr>
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="php-string">"any string"</span> (10)
<tr><th>$arg2</th><td><pre class="nette-dump"><span class="nette-dump-string">"any string"</span> (10)
</pre></td></tr>
</table>
</div>
Expand All @@ -123,10 +123,10 @@
<div id="netteBsPnl3" class="inner">
<div class="outer">
<table>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="php-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="php-key">0</span> => <span class="php-int">1</span>
<span class="php-key">1</span> => <span class="php-int">2</span>
<span class="php-key">2</span> => <span class="php-int">3</span>
<tr><th>$arg1</th><td><pre class="nette-dump"><a href='#' rel='next'><span class="nette-dump-array">array</span>(3) <abbr>&#x25bc;</abbr> </a><code>[
<span class="nette-dump-key">0</span> => <span class="nette-dump-int">1</span>
<span class="nette-dump-key">1</span> => <span class="nette-dump-int">2</span>
<span class="nette-dump-key">2</span> => <span class="nette-dump-int">3</span>
]</code>
</pre></td></tr>%A?%
</table>
Expand Down

0 comments on commit 28b7040

Please sign in to comment.