diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php
index 4ff411666e..901164814c 100644
--- a/phpBB/phpbb/feed/event/http_auth_subscriber.php
+++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php
@@ -20,7 +20,7 @@ use phpbb\request\request_interface;
 use phpbb\user;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -64,10 +64,10 @@ class http_auth_subscriber implements EventSubscriberInterface
 	/**
 	 * Handle HTTP authentication for feed routes
 	 *
-	 * @param GetResponseEvent $event
+	 * @param RequestEvent $event
 	 * @return void
 	 */
-	public function on_kernel_request(GetResponseEvent $event)
+	public function on_kernel_request(RequestEvent $event)
 	{
 		// Check if HTTP authentication is enabled
 		if (!$this->config['feed_http_auth'])
@@ -184,10 +184,10 @@ class http_auth_subscriber implements EventSubscriberInterface
 	/**
 	 * Send HTTP authentication challenge
 	 *
-	 * @param GetResponseEvent $event
+	 * @param RequestEvent $event
 	 * @return void
 	 */
-	protected function send_auth_challenge(GetResponseEvent $event)
+	protected function send_auth_challenge(RequestEvent $event)
 	{
 		$realm = $this->config['sitename'];
 
diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php
index 5fede1572b..5e1c11b07c 100644
--- a/tests/feed/http_auth_subscriber_test.php
+++ b/tests/feed/http_auth_subscriber_test.php
@@ -104,7 +104,8 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->with('_route')
 			->willReturn('not_a_feed_route');
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
+			->onlyMethods(['getRequest', 'setResponse'])
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -137,7 +138,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(false);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -169,7 +170,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 		$request->expects($this->never())
 			->method('isSecure');
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -203,7 +204,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -238,7 +239,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -251,9 +252,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 		$event->expects($this->once())
 			->method('setResponse')
 			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
-			->will($this->returnCallback(function ($newResponse) use (&$response) {
+			->willReturnCallback(function ($newResponse) use (&$response) {
 				$response = $newResponse;
-			}));
+			});
 
 		$this->subscriber->on_kernel_request($event);
 
@@ -295,7 +296,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -344,7 +345,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -395,7 +396,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -408,9 +409,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 		$event->expects($this->once())
 			->method('setResponse')
 			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
-			->will($this->returnCallback(function ($newResponse) use (&$response) {
+			->willReturnCallback(function ($newResponse) use (&$response) {
 				$response = $newResponse;
-			}));
+			});
 
 		$this->subscriber->on_kernel_request($event);
 
@@ -452,7 +453,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 			->method('isSecure')
 			->willReturn(true);
 
-		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent')
+		$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -465,9 +466,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
 		$event->expects($this->once())
 			->method('setResponse')
 			->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
-			->will($this->returnCallback(function ($newResponse) use (&$response) {
+			->willReturnCallback(function ($newResponse) use (&$response) {
 				$response = $newResponse;
-			}));
+			});
 
 		$this->subscriber->on_kernel_request($event);