Merge branch '3.4' into 4.3

* 3.4:
  [Form] Fix inconsistencies
  Use Phpunit FQDN in tests comments

Author: nicolas-grekas

Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

@@ -5,6 +5,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Cache\Adapter\NullAdapter;
@@ -72,7 +73,7 @@ public function testAnnotationsCacheWarmerWithDebugEnabled()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Reader
+     * @return MockObject|Reader
      */
     private function getReadOnlyReader()
     {

Tests/Command/CachePoolDeleteCommandTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Bundle\FrameworkBundle\Command\CachePoolDeleteCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -83,7 +84,7 @@ public function testCommandDeleteFailed()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface
+     * @return MockObject|KernelInterface
      */
     private function getKernel()
     {

Tests/Command/CachePruneCommandTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
@@ -49,7 +50,7 @@ private function getEmptyRewindableGenerator(): RewindableGenerator
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface
+     * @return MockObject|KernelInterface
      */
     private function getKernel()
     {
@@ -75,7 +76,7 @@ private function getKernel()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableInterface
+     * @return MockObject|PruneableInterface
      */
     private function getPruneableInterfaceMock()
     {