Merge branch '3.4'

* 3.4:
  Add TokenProcessor
  [DI] Handle root namespace in service definitions
  Add support for command lazy-loading
  Use rawurlencode() to transform the Cookie into a string
  [TwigBundle] Added a RuntimeExtensionInterface to take advantage of autoconfigure
  [Process] Fix parsing args on Windows
  Add exculde verbosity test
  [HttpKernel][VarDumper] Truncate profiler data & optim perf
  [DI] Allow imports in string format for YAML
  [Validator] Allow to use a property path to get value to compare in comparison constraints
  [Security] Fix authentication.failure event not dispatched on AccountStatusException
  add option to define the access decision manager
  Add support for doctrin/dbal 2.6 types

Author: nicolas-grekas

Extension/DataCollector/FormDataCollector.php

@@ -19,11 +19,7 @@
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Caster\ClassStub;
-use Symfony\Component\VarDumper\Caster\CutStub;
-use Symfony\Component\VarDumper\Cloner\ClonerInterface;
-use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
  * Data collector for {@link FormInterface} instances.
@@ -71,11 +67,6 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
      */
     private $formsByView;
 
-    /**
-     * @var ClonerInterface
-     */
-    private $cloner;
-
     public function __construct(FormDataExtractorInterface $dataExtractor)
     {
         if (!class_exists(ClassStub::class)) {
@@ -248,49 +239,33 @@ public function serialize()
     /**
      * {@inheritdoc}
      */
-    protected function cloneVar($var, $isClass = false)
+    protected function getCasters()
     {
-        if ($var instanceof Data) {
-            return $var;
-        }
-        if (null === $this->cloner) {
-            $this->cloner = new VarCloner();
-            $this->cloner->setMaxItems(-1);
-            $this->cloner->addCasters(array(
-                '*' => function ($v, array $a, Stub $s, $isNested) {
-                    foreach ($a as &$v) {
-                        if (is_object($v) && !$v instanceof \DateTimeInterface) {
-                            $v = new CutStub($v);
-                        }
-                    }
-
-                    return $a;
-                },
-                \Exception::class => function (\Exception $e, array $a, Stub $s) {
-                    if (isset($a[$k = "\0Exception\0previous"])) {
+        return parent::getCasters() + array(
+            \Exception::class => function (\Exception $e, array $a, Stub $s) {
+                foreach (array("\0Exception\0previous", "\0Exception\0trace") as $k) {
+                    if (isset($a[$k])) {
                         unset($a[$k]);
                         ++$s->cut;
                     }
-
-                    return $a;
-                },
-                FormInterface::class => function (FormInterface $f, array $a) {
-                    return array(
-                        Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                        Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())),
-                    );
-                },
-                ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
-                    return array(
-                        Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
-                        Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
-                        Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
-                    );
-                },
-            ));
-        }
-
-        return $this->cloner->cloneVar($var, Caster::EXCLUDE_VERBOSE);
+                }
+
+                return $a;
+            },
+            FormInterface::class => function (FormInterface $f, array $a) {
+                return array(
+                    Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
+                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())),
+                );
+            },
+            ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
+                return array(
+                    Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
+                    Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
+                    Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
+                );
+            },
+        );
     }
 
     private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &$outputByHash)

composer.json

@@ -39,8 +39,8 @@
         "symfony/dependency-injection": "<3.4",
         "symfony/doctrine-bridge": "<3.4",
         "symfony/framework-bundle": "<3.4",
-        "symfony/twig-bridge": "<3.4",
-        "symfony/var-dumper": "<3.4"
+        "symfony/http-kernel": "<3.4",
+        "symfony/twig-bridge": "<3.4"
     },
     "suggest": {
         "symfony/validator": "For form validation.",