Merge branch '4.3' into 4.4

* 4.3:
  [Form] fix return type on FormDataCollector
  [Cache][DI] cleanup

src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

@@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 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;

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;

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

@@ -14,6 +14,7 @@ namespace Symfony\Component\Form\Extension\DataCollector;
 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 @@ interface FormDataCollectorInterface extends DataCollectorInterface
     /**
      * Returns all collected data.
      *
-     * @return array
+     * @return array|Data
      */
     public function getData();
 }

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

@@ -28,6 +28,9 @@ use Symfony\Component\VarDumper\Cloner\VarCloner;
  */
 abstract class DataCollector implements DataCollectorInterface
 {
+    /**
+     * @var array|Data
+     */
     protected $data = [];
 
     /**