[DebugBundle] adjust after review

Author: nicolas-grekas

Caster/DOMCaster.php

@@ -68,6 +68,8 @@ public static function castImplementation($dom, array $a, $isNested, &$cut)
 
     public static function castNode(\DOMNode $dom, array $a, $isNested, &$cut)
     {
+        // Commented lines denote properties that exist but are better not dumped for clarity.
+
         $a += array(
             'nodeName' => $dom->nodeName,
             //'nodeValue' => $dom->nodeValue,
@@ -93,6 +95,8 @@ public static function castNode(\DOMNode $dom, array $a, $isNested, &$cut)
 
     public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, $isNested, &$cut)
     {
+        // Commented lines denote properties that exist but are better not dumped for clarity.
+
         $a += array(
             'nodeName' => $dom->nodeName,
             //'nodeValue' => $dom->nodeValue,

Cloner/Data.php

@@ -183,19 +183,19 @@ public static function utf8Encode($s)
     {
         if (function_exists('iconv')) {
             return iconv('CP1252', 'UTF-8', $s);
-        } else {
-            $s .= $s;
-            $len = strlen($s);
-
-            for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
-                switch (true) {
-                    case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
-                    case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
-                    default: $s[$j] = "\xC3"; $s[++$j] = chr(ord($s[$i]) - 64); break;
-                }
-            }
+        }
 
-            return substr($s, 0, $j);
+        $s .= $s;
+        $len = strlen($s);
+
+        for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+            switch (true) {
+                case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
+                case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
+                default: $s[$j] = "\xC3"; $s[++$j] = chr(ord($s[$i]) - 64); break;
+            }
         }
+
+        return substr($s, 0, $j);
     }
 }

Resources/functions/dump.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\VarDumper\VarDumper;
+
+if (!function_exists('dump')) {
+    /**
+     * @author Nicolas Grekas <[email protected]>
+     */
+    function dump($var)
+    {
+        foreach (func_get_args() as $var) {
+            VarDumper::dump($var);
+        }
+    }
+}

VarDumper.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper;
+
+use Symfony\Component\VarDumper\Cloner\ExtCloner;
+use Symfony\Component\VarDumper\Cloner\PhpCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+/**
+ * @author Nicolas Grekas <[email protected]>
+ */
+class VarDumper
+{
+    private static $handler;
+
+    public static function dump($var)
+    {
+        if (null === self::$handler) {
+            $cloner = extension_loaded('symfony_debug') ? new ExtCloner() : new PhpCloner();
+            $dumper = 'cli' === PHP_SAPI ? new CliDumper() : new HtmlDumper();
+            self::$handler = function ($var) use ($cloner, $dumper) {
+                $dumper->dump($cloner->cloneVar($var));
+            };
+        }
+
+        return call_user_func(self::$handler, $h);
+    }
+
+    public static function setHandler($callable)
+    {
+        if (!is_callable($callable, true)) {
+            throw new \InvalidArgumentException('Invalid PHP callback.');
+        }
+
+        $prevHandler = self::$handler;
+        self::$handler = $callable;
+
+        return $prevHandler;
+    }
+}

composer.json

@@ -18,6 +18,7 @@
         "ext-symfony_debug": ""
     },
     "autoload": {
+        "files": [ "Resources/functions/dump.php" ],
         "psr-0": { "Symfony\\Component\\VarDumper\\": "" }
     },
     "target-dir": "Symfony/Component/VarDumper",