Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/Debug/WrappedListenerTest.php

@@ -23,7 +23,7 @@ class WrappedListenerTest extends TestCase
      */
     public function testListenerDescription($listener, $expected)
     {
-        $wrappedListener = new WrappedListener($listener, null, $this->getMockBuilder(Stopwatch::class)->getMock(), $this->getMockBuilder(EventDispatcherInterface::class)->getMock());
+        $wrappedListener = new WrappedListener($listener, null, $this->createMock(Stopwatch::class), $this->createMock(EventDispatcherInterface::class));
 
         $this->assertStringMatchesFormat($expected, $wrappedListener->getPretty());
     }

Tests/EventDispatcherTest.php

@@ -213,7 +213,7 @@ public function testAddSubscriberWithPriorities()
         $listeners = $this->dispatcher->getListeners('pre.foo');
         $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
         $this->assertCount(2, $listeners);
-        $this->assertInstanceOf(\Symfony\Component\EventDispatcher\Tests\TestEventSubscriberWithPriorities::class, $listeners[0][0]);
+        $this->assertInstanceOf(TestEventSubscriberWithPriorities::class, $listeners[0][0]);
     }
 
     public function testAddSubscriberWithMultipleListeners()

Tests/ImmutableEventDispatcherTest.php

@@ -13,6 +13,9 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -33,7 +36,7 @@ class ImmutableEventDispatcherTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->innerDispatcher = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventDispatcherInterface::class)->getMock();
+        $this->innerDispatcher = $this->createMock(EventDispatcherInterface::class);
         $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
     }
 
@@ -79,7 +82,7 @@ public function testAddListenerDisallowed()
     public function testAddSubscriberDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventSubscriberInterface::class)->getMock();
+        $subscriber = $this->createMock(EventSubscriberInterface::class);
 
         $this->dispatcher->addSubscriber($subscriber);
     }
@@ -93,7 +96,7 @@ public function testRemoveListenerDisallowed()
     public function testRemoveSubscriberDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventSubscriberInterface::class)->getMock();
+        $subscriber = $this->createMock(EventSubscriberInterface::class);
 
         $this->dispatcher->removeSubscriber($subscriber);
     }