Merge branch '4.4' into 5.1

* 4.4:
  Use ::class keyword when possible

Author: fabpot

Tests/DependencyInjection/RegisterListenersPassTest.php

@@ -28,7 +28,7 @@ class RegisterListenersPassTest extends TestCase
      */
     public function testEventSubscriberWithoutInterface()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $builder = new ContainerBuilder();
         $builder->register('event_dispatcher');
         $builder->register('my_event_subscriber', 'stdClass')
@@ -98,7 +98,7 @@ public function testAliasedEventSubscriber()
 
     public function testAbstractEventListener()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The service "foo" tagged "kernel.event_listener" must not be abstract.');
         $container = new ContainerBuilder();
         $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', []);
@@ -110,7 +110,7 @@ public function testAbstractEventListener()
 
     public function testAbstractEventSubscriber()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The service "foo" tagged "kernel.event_subscriber" must not be abstract.');
         $container = new ContainerBuilder();
         $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', []);
@@ -180,7 +180,7 @@ public function testNoPreloadEvents()
 
     public function testEventSubscriberUnresolvableClassName()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('You have requested a non-existent parameter "subscriber.class"');
         $container = new ContainerBuilder();
         $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);

Tests/ImmutableEventDispatcherTest.php

@@ -33,7 +33,7 @@ class ImmutableEventDispatcherTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->innerDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+        $this->innerDispatcher = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventDispatcherInterface::class)->getMock();
         $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
     }
 
@@ -79,7 +79,7 @@ public function testAddListenerDisallowed()
     public function testAddSubscriberDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
+        $subscriber = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventSubscriberInterface::class)->getMock();
 
         $this->dispatcher->addSubscriber($subscriber);
     }
@@ -93,7 +93,7 @@ public function testRemoveListenerDisallowed()
     public function testRemoveSubscriberDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
+        $subscriber = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventSubscriberInterface::class)->getMock();
 
         $this->dispatcher->removeSubscriber($subscriber);
     }