From 9f853f324f1982cfb923b6404c5bf72c2018299c Mon Sep 17 00:00:00 2001
From: Douglas Greenshields <douglas@usemarkup.com>
Date: Fri, 8 Nov 2019 17:25:00 +0000
Subject: [PATCH 1/2] [Routing] revert the return type for
 UrlGeneratorInterface::generate to remove null

---
 .../Component/Routing/Generator/UrlGeneratorInterface.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
index beb73324ca..64714d354d 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -75,7 +75,7 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      * @param mixed[] $parameters    An array of parameters
      * @param int     $referenceType The type of reference to be generated (one of the constants)
      *
-     * @return string|null The generated URL
+     * @return string The generated URL
      *
      * @throws RouteNotFoundException              If the named route doesn't exist
      * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route

From 5aee181c831a1b4c3dc92fe200adbacb635da09b Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Fri, 8 Nov 2019 23:20:19 +0100
Subject: [PATCH 2/2] [Workflow] Simplified EventDispatcherMock.

---
 .../Component/Workflow/Tests/WorkflowTest.php | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index b559344364..896a77e2cb 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -572,7 +572,7 @@ class WorkflowTest extends TestCase
     }
 }
 
-class EventDispatcherMock implements \Symfony\Component\EventDispatcher\EventDispatcherInterface
+class EventDispatcherMock implements \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
 {
     public $dispatchedEvents = [];
 
@@ -580,32 +580,4 @@ class EventDispatcherMock implements \Symfony\Component\EventDispatcher\EventDis
     {
         $this->dispatchedEvents[] = $eventName;
     }
-
-    public function addListener($eventName, $listener, $priority = 0)
-    {
-    }
-
-    public function addSubscriber(\Symfony\Component\EventDispatcher\EventSubscriberInterface $subscriber)
-    {
-    }
-
-    public function removeListener($eventName, $listener)
-    {
-    }
-
-    public function removeSubscriber(\Symfony\Component\EventDispatcher\EventSubscriberInterface $subscriber)
-    {
-    }
-
-    public function getListeners($eventName = null)
-    {
-    }
-
-    public function getListenerPriority($eventName, $listener)
-    {
-    }
-
-    public function hasListeners($eventName = null)
-    {
-    }
 }