Upgrade 1-11.38

vendor/symfony/form/Extension/DataCollector/DataCollectorExtension.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Form\Extension\DataCollector;
 
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\AbstractExtension;
 
 /**
@@ -22,9 +21,6 @@ use Symfony\Component\Form\AbstractExtension;
  */
 class DataCollectorExtension extends AbstractExtension
 {
-    /**
-     * @var EventSubscriberInterface
-     */
     private $dataCollector;
 
     public function __construct(FormDataCollectorInterface $dataCollector)

vendor/symfony/form/Extension/DataCollector/EventListener/DataCollectorListener.php

@@ -24,9 +24,6 @@ use Symfony\Component\Form\FormEvents;
  */
 class DataCollectorListener implements EventSubscriberInterface
 {
-    /**
-     * @var FormDataCollectorInterface
-     */
     private $dataCollector;
 
     public function __construct(FormDataCollectorInterface $dataCollector)
@@ -49,8 +46,6 @@ class DataCollectorListener implements EventSubscriberInterface
 
     /**
      * Listener for the {@link FormEvents::POST_SET_DATA} event.
-     *
-     * @param FormEvent $event The event object
      */
     public function postSetData(FormEvent $event)
     {
@@ -65,8 +60,6 @@ class DataCollectorListener implements EventSubscriberInterface
 
     /**
      * Listener for the {@link FormEvents::POST_SUBMIT} event.
-     *
-     * @param FormEvent $event The event object
      */
     public function postSubmit(FormEvent $event)
     {

vendor/symfony/form/Extension/DataCollector/FormDataCollector.php

@@ -16,15 +16,10 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-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\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.
@@ -34,9 +29,6 @@ use Symfony\Component\VarDumper\Cloner\VarCloner;
  */
 class FormDataCollector extends DataCollector implements FormDataCollectorInterface
 {
-    /**
-     * @var FormDataExtractor
-     */
     private $dataExtractor;
 
     /**
@@ -72,16 +64,6 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
      */
     private $formsByView;
 
-    /**
-     * @var ValueExporter
-     */
-    private $valueExporter;
-
-    /**
-     * @var ClonerInterface
-     */
-    private $cloner;
-
     private $hasVarDumper;
 
     public function __construct(FormDataExtractorInterface $dataExtractor)
@@ -255,61 +237,33 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
     /**
      * {@inheritdoc}
      */
-    protected function cloneVar($var, $isClass = false)
+    protected function getCasters()
     {
-        if ($var instanceof Data) {
-            return $var;
-        }
-        if (null === $this->cloner) {
-            if ($this->hasVarDumper) {
-                $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 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;
-                    },
-                    \Exception::class => function (\Exception $e, array $a, Stub $s) {
-                        if (isset($a[$k = "\0Exception\0previous"])) {
-                            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(),
-                        );
-                    },
-                ));
-            } else {
-                @trigger_error(sprintf('Using the %s() method without the VarDumper component is deprecated since version 3.2 and won\'t be supported in 4.0. Install symfony/var-dumper version 3.2 or above.', __METHOD__), E_USER_DEPRECATED);
-                $this->cloner = false;
-            }
-        }
-        if (false !== $this->cloner) {
-            return $this->cloner->cloneVar($var, Caster::EXCLUDE_VERBOSE);
-        }
-
-        if (null === $this->valueExporter) {
-            $this->valueExporter = new ValueExporter();
-        }
-
-        return $this->valueExporter->exportValue($var);
+                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)

vendor/symfony/form/Extension/DataCollector/FormDataCollectorInterface.php

@@ -24,37 +24,26 @@ interface FormDataCollectorInterface extends DataCollectorInterface
 {
     /**
      * Stores configuration data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectConfiguration(FormInterface $form);
 
     /**
      * Stores the default data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectDefaultData(FormInterface $form);
 
     /**
      * Stores the submitted data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectSubmittedData(FormInterface $form);
 
     /**
      * Stores the view variables of the given form view and its children.
-     *
-     * @param FormView $view A root form view
      */
     public function collectViewVariables(FormView $view);
 
     /**
      * Specifies that the given objects represent the same conceptual form.
-     *
-     * @param FormInterface $form A form object
-     * @param FormView      $view A view object
      */
     public function associateFormWithView(FormInterface $form, FormView $view);
 
@@ -63,8 +52,6 @@ interface FormDataCollectorInterface extends DataCollectorInterface
      * a tree-like data structure.
      *
      * The result can be queried using {@link getData()}.
-     *
-     * @param FormInterface $form A root form
      */
     public function buildPreliminaryFormTree(FormInterface $form);
 
@@ -85,9 +72,6 @@ interface FormDataCollectorInterface extends DataCollectorInterface
      * tree, only the view data will be included in the result. If a
      * corresponding {@link FormInterface} exists otherwise, call
      * {@link associateFormWithView()} before calling this method.
-     *
-     * @param FormInterface $form A root form
-     * @param FormView      $view A root view
      */
     public function buildFinalFormTree(FormInterface $form, FormView $view);
 

vendor/symfony/form/Extension/DataCollector/FormDataExtractor.php

@@ -166,8 +166,6 @@ class FormDataExtractor implements FormDataExtractorInterface
     /**
      * Recursively builds an HTML ID for a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return string The HTML ID
      */
     private function buildId(FormInterface $form)

vendor/symfony/form/Extension/DataCollector/FormDataExtractorInterface.php

@@ -24,8 +24,6 @@ interface FormDataExtractorInterface
     /**
      * Extracts the configuration data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's configuration
      */
     public function extractConfiguration(FormInterface $form);
@@ -33,8 +31,6 @@ interface FormDataExtractorInterface
     /**
      * Extracts the default data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's default data
      */
     public function extractDefaultData(FormInterface $form);
@@ -42,8 +38,6 @@ interface FormDataExtractorInterface
     /**
      * Extracts the submitted data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's submitted data
      */
     public function extractSubmittedData(FormInterface $form);
@@ -51,8 +45,6 @@ interface FormDataExtractorInterface
     /**
      * Extracts the view variables of a form.
      *
-     * @param FormView $view The form view
-     *
      * @return array Information about the view's variables
      */
     public function extractViewVariables(FormView $view);

vendor/symfony/form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php

@@ -25,14 +25,7 @@ use Symfony\Component\Form\ResolvedFormTypeInterface;
  */
 class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
 {
-    /**
-     * @var ResolvedFormTypeInterface
-     */
     private $proxiedType;
-
-    /**
-     * @var FormDataCollectorInterface
-     */
     private $dataCollector;
 
     public function __construct(ResolvedFormTypeInterface $proxiedType, FormDataCollectorInterface $dataCollector)

vendor/symfony/form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php

@@ -24,14 +24,7 @@ use Symfony\Component\Form\ResolvedFormTypeInterface;
  */
 class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface
 {
-    /**
-     * @var ResolvedFormTypeFactoryInterface
-     */
     private $proxiedFactory;
-
-    /**
-     * @var FormDataCollectorInterface
-     */
     private $dataCollector;
 
     public function __construct(ResolvedFormTypeFactoryInterface $proxiedFactory, FormDataCollectorInterface $dataCollector)

vendor/symfony/form/Extension/DataCollector/Type/DataCollectorTypeExtension.php

@@ -25,7 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 class DataCollectorTypeExtension extends AbstractTypeExtension
 {
     /**
-     * @var \Symfony\Component\EventDispatcher\EventSubscriberInterface
+     * @var DataCollectorListener
      */
     private $listener;