Merge branch '7.4' into 8.0

* 7.4:
  do not use PHPUnit mock objects without configured expectations
  fix test
  do not use PHPUnit mock objects without configured expectations
  do not use PHPUnit mock objects without configured expectations
  do not use PHPUnit mock objects without configured expectations

Author: xabbuh

Tests/Debug/WrappedListenerTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Debug\WrappedListener;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
@@ -23,7 +24,7 @@ class WrappedListenerTest extends TestCase
     #[DataProvider('provideListenersToDescribe')]
     public function testListenerDescription($listener, $expected)
     {
-        $wrappedListener = new WrappedListener($listener, null, $this->createMock(Stopwatch::class), $this->createMock(EventDispatcherInterface::class));
+        $wrappedListener = new WrappedListener($listener, null, new Stopwatch(), new EventDispatcher());
 
         $this->assertStringMatchesFormat($expected, $wrappedListener->getPretty());
     }

Tests/ImmutableEventDispatcherTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\EventDispatcher\Tests;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
@@ -23,73 +23,81 @@
  */
 class ImmutableEventDispatcherTest extends TestCase
 {
-    private MockObject&EventDispatcherInterface $innerDispatcher;
-    private ImmutableEventDispatcher $dispatcher;
-
-    protected function setUp(): void
-    {
-        $this->innerDispatcher = $this->createMock(EventDispatcherInterface::class);
-        $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
-    }
-
     public function testDispatchDelegates()
     {
+        $innerDispatcher = $this->createMock(EventDispatcherInterface::class);
+        $dispatcher = new ImmutableEventDispatcher($innerDispatcher);
+
         $event = new Event();
         $resultEvent = new Event();
 
-        $this->innerDispatcher->expects($this->once())
+        $innerDispatcher->expects($this->once())
             ->method('dispatch')
             ->with($event, 'event')
             ->willReturn($resultEvent);
 
-        $this->assertSame($resultEvent, $this->dispatcher->dispatch($event, 'event'));
+        $this->assertSame($resultEvent, $dispatcher->dispatch($event, 'event'));
     }
 
     public function testGetListenersDelegates()
     {
-        $this->innerDispatcher->expects($this->once())
+        $innerDispatcher = $this->createMock(EventDispatcherInterface::class);
+        $dispatcher = new ImmutableEventDispatcher($innerDispatcher);
+
+        $innerDispatcher->expects($this->once())
             ->method('getListeners')
             ->with('event')
             ->willReturn(['result']);
 
-        $this->assertSame(['result'], $this->dispatcher->getListeners('event'));
+        $this->assertSame(['result'], $dispatcher->getListeners('event'));
     }
 
     public function testHasListenersDelegates()
     {
-        $this->innerDispatcher->expects($this->once())
+        $innerDispatcher = $this->createMock(EventDispatcherInterface::class);
+        $dispatcher = new ImmutableEventDispatcher($innerDispatcher);
+
+        $innerDispatcher->expects($this->once())
             ->method('hasListeners')
             ->with('event')
             ->willReturn(true);
 
-        $this->assertTrue($this->dispatcher->hasListeners('event'));
+        $this->assertTrue($dispatcher->hasListeners('event'));
     }
 
     public function testAddListenerDisallowed()
     {
+        $dispatcher = new ImmutableEventDispatcher(new EventDispatcher());
+
         $this->expectException(\BadMethodCallException::class);
-        $this->dispatcher->addListener('event', fn () => 'foo');
+        $dispatcher->addListener('event', fn () => 'foo');
     }
 
     public function testAddSubscriberDisallowed()
     {
+        $dispatcher = new ImmutableEventDispatcher(new EventDispatcher());
+
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->createMock(EventSubscriberInterface::class);
+        $subscriber = $this->createStub(EventSubscriberInterface::class);
 
-        $this->dispatcher->addSubscriber($subscriber);
+        $dispatcher->addSubscriber($subscriber);
     }
 
     public function testRemoveListenerDisallowed()
     {
+        $dispatcher = new ImmutableEventDispatcher(new EventDispatcher());
+
         $this->expectException(\BadMethodCallException::class);
-        $this->dispatcher->removeListener('event', fn () => 'foo');
+        $dispatcher->removeListener('event', fn () => 'foo');
     }
 
     public function testRemoveSubscriberDisallowed()
     {
+        $dispatcher = new ImmutableEventDispatcher(new EventDispatcher());
+
         $this->expectException(\BadMethodCallException::class);
-        $subscriber = $this->createMock(EventSubscriberInterface::class);
+        $subscriber = $this->createStub(EventSubscriberInterface::class);
 
-        $this->dispatcher->removeSubscriber($subscriber);
+        $dispatcher->removeSubscriber($subscriber);
     }
 }