Use ClassStub & LinkStub wrappers

Author: nicolas-grekas

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig

@@ -152,9 +152,6 @@
             margin-top: -9px;
             margin-left: 6px;
         }
-        .form-type {
-            color: #999;
-        }
         .badge-error {
             float: right;
             background: #B0413E;
@@ -442,7 +439,7 @@
             {% endif %}
 
             <span {% if has_error or data.has_children_error|default(false) %}class="has-error"{% endif %}>
-                {{ name|default('(no name)') }} {% if data.type_class is defined %}[<abbr title="{{ data.type_class }}">{{ data.type_class|split('\\')|last }}</abbr>]{% endif %}
+                {{ name|default('(no name)') }} [{{ profiler_dump(data.type_class) }}]
             </span>
         </div>
 
@@ -460,10 +457,7 @@
     {% import _self as tree %}
     <div class="tree-details" {% if data.id is defined %}id="{{ data.id }}-details"{% endif %}>
         <h2>
-            {{ name|default('(no name)') }}
-            {% if data.type_class is defined and data.type is defined %}
-            <span class="form-type">[<abbr title="{{ data.type_class }}">{{ data.type }}</abbr>]</span>
-            {% endif %}
+            {{ name|default('(no name)') }} [{{ profiler_dump(data.type_class) }}]
         </h2>
 
         {% if data.errors is defined and data.errors|length > 0 %}

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php

@@ -16,6 +16,8 @@
 use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Caster\StubCaster;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
@@ -50,7 +52,7 @@ public function extractConfiguration(FormInterface $form)
         $data = array(
             'id' => $this->buildId($form),
             'name' => $form->getName(),
-            'type_class' => get_class($form->getConfig()->getType()->getInnerType()),
+            'type_class' => new ClassStub(get_class($form->getConfig()->getType()->getInnerType())),
             'synchronized' => $this->cloneVar($form->isSynchronized()),
             'passed_options' => array(),
             'resolved_options' => array(),
@@ -211,6 +213,9 @@ private function cloneVar($var)
         if (null === $this->cloner) {
             $this->cloner = new VarCloner();
             $this->cloner->addCasters(array(
+                Stub::class => function (Stub $v, array $a, Stub $s, $isNested) {
+                    return $isNested ? $a : StubCaster::castStub($v, $a, $s, true);
+                },
                 \Exception::class => function (\Exception $e, array $a, Stub $s) {
                     if (isset($a[$k = "\0Exception\0previous"])) {
                         unset($a[$k]);
@@ -219,13 +224,13 @@ private function cloneVar($var)
 
                     return $a;
                 },
-                FormInterface::class => function (FormInterface $f, array $a, Stub $s) {
+                FormInterface::class => function (FormInterface $f, array $a) {
                     return array(
                         Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                        Caster::PREFIX_VIRTUAL.'type_class' => get_class($f->getConfig()->getType()->getInnerType()),
+                        Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())),
                     );
                 },
-                ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a, Stub $stub) {
+                ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
                     return array(
                         Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
                         Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),

src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php

@@ -12,8 +12,12 @@
 namespace Symfony\Component\HttpKernel\DataCollector;
 
 use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Caster\LinkStub;
+use Symfony\Component\VarDumper\Caster\StubCaster;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
@@ -62,9 +66,14 @@ protected function cloneVar($var)
     {
         if (null === $this->cloner) {
             $this->cloner = new VarCloner();
+            $this->cloner->addCasters(array(
+                Stub::class => function (Stub $v, array $a, Stub $s, $isNested) {
+                    return $isNested ? $a : StubCaster::castStub($v, $a, $s, true);
+                },
+            ));
         }
 
-        return $this->cloner->cloneVar($var);
+        return $this->cloner->cloneVar($this->decorateVar($var));
     }
 
     /**
@@ -86,4 +95,33 @@ protected function varToString($var)
 
         return $this->valueExporter->exportValue($var);
     }
+
+    private function decorateVar($var)
+    {
+        if (is_array($var)) {
+            if (isset($var[0], $var[1]) && is_callable($var)) {
+                return ClassStub::wrapCallable($var);
+            }
+            foreach ($var as $k => $v) {
+                if ($v !== $d = $this->decorateVar($v)) {
+                    $var[$k] = $d;
+                }
+            }
+
+            return $var;
+        }
+        if (is_string($var)) {
+            if (false !== strpos($var, '\\')) {
+                $c = (false !== $i = strpos($var, '::')) ? substr($var, 0, $i) : $var;
+                if (class_exists($c, false) || interface_exists($c, false) || trait_exists($c, false)) {
+                    return new ClassStub($var);
+                }
+            }
+            if (false !== strpos($var, DIRECTORY_SEPARATOR) && file_exists($var)) {
+                return new LinkStub($var);
+            }
+        }
+
+        return $var;
+    }
 }

src/Symfony/Component/HttpKernel/composer.json

@@ -20,7 +20,7 @@
         "symfony/event-dispatcher": "~2.8|~3.0",
         "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2",
         "symfony/debug": "~2.8|~3.0",
-        "symfony/var-dumper": "~2.8.9|~3.0.9|~3.1.3|~3.2",
+        "symfony/var-dumper": "~3.2",
         "psr/log": "~1.0"
     },
     "require-dev": {