Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 1aa41ed91811 · 2019-08-12T13:55:02.000+02:00
* 4.3:
  [Form] fix return type on FormDataCollector
  [Cache][DI] cleanup
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -13,7 +13,6 @@
 
 use Cache\IntegrationTests\CachePoolTest;
 use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\Warning;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Warning;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
 
 /**
  * Collects and structures information about forms.
@@ -78,7 +79,7 @@ public function buildFinalFormTree(FormInterface $form, FormView $view);
     /**
      * Returns all collected data.
      *
-     * @return array
+     * @return array|Data
      */
     public function getData();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -28,6 +28,9 @@
  */
 abstract class DataCollector implements DataCollectorInterface
 {
+    /**
+     * @var array|Data
+     */
     protected $data = [];
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@`
`28`	`28`	`*/`
`29`	`29`	`abstract class DataCollector implements DataCollectorInterface`
`30`	`30`	`{`
	`31`	`+ /**`
	`32`	`+ * @var array\|Data`
	`33`	`+ */`
`31`	`34`	`protected $data = [];`
`32`	`35`
`33`	`36`	`/**`