mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-12 07:24:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6882 from marc1706/ticket/15085-master

Browse Source 
[ticket/15085] Use ResponseEvent in http auth subscriber and update tests
This commit is contained in:
Marc Alexander
2025-10-07 21:55:03 +02:00
committed by GitHub
parent fb3167b80f edf9067802
commit fe542243c6
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/feed/event/http_auth_subscriber.php
View File

@@ -20,7 +20,7 @@ use phpbb\request\request_interface;
use phpbb\user; use phpbb\user;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
/** /**
@@ -64,10 +64,10 @@ class http_auth_subscriber implements EventSubscriberInterface
/** /**
* Handle HTTP authentication for feed routes * Handle HTTP authentication for feed routes
* *
* @param GetResponseEvent $event * @param RequestEvent $event
* @return void * @return void
*/ */
public function on_kernel_request(GetResponseEvent $event) public function on_kernel_request(RequestEvent $event)
{ {
// Check if HTTP authentication is enabled // Check if HTTP authentication is enabled
if (!$this->config['feed_http_auth']) if (!$this->config['feed_http_auth'])
@@ -184,10 +184,10 @@ class http_auth_subscriber implements EventSubscriberInterface
/** /**
* Send HTTP authentication challenge * Send HTTP authentication challenge
* *
* @param GetResponseEvent $event * @param RequestEvent $event
* @return void * @return void
*/ */
protected function send_auth_challenge(GetResponseEvent $event) protected function send_auth_challenge(RequestEvent $event)
{ {
$realm = $this->config['sitename']; $realm = $this->config['sitename'];

31
tests/feed/http_auth_subscriber_test.php
View File

@@ -104,7 +104,8 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->with('_route') ->with('_route')
->willReturn('not_a_feed_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() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -137,7 +138,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(false); ->willReturn(false);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -169,7 +170,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
$request->expects($this->never()) $request->expects($this->never())
->method('isSecure'); ->method('isSecure');
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -203,7 +204,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -238,7 +239,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -251,9 +252,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
$event->expects($this->once()) $event->expects($this->once())
->method('setResponse') ->method('setResponse')
->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
->will($this->returnCallback(function ($newResponse) use (&$response) { ->willReturnCallback(function ($newResponse) use (&$response) {
$response = $newResponse; $response = $newResponse;
})); });
$this->subscriber->on_kernel_request($event); $this->subscriber->on_kernel_request($event);
@@ -295,7 +296,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -344,7 +345,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -395,7 +396,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -408,9 +409,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
$event->expects($this->once()) $event->expects($this->once())
->method('setResponse') ->method('setResponse')
->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
->will($this->returnCallback(function ($newResponse) use (&$response) { ->willReturnCallback(function ($newResponse) use (&$response) {
$response = $newResponse; $response = $newResponse;
})); });
$this->subscriber->on_kernel_request($event); $this->subscriber->on_kernel_request($event);
@@ -452,7 +453,7 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
->method('isSecure') ->method('isSecure')
->willReturn(true); ->willReturn(true);
$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -465,9 +466,9 @@ class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case
$event->expects($this->once()) $event->expects($this->once())
->method('setResponse') ->method('setResponse')
->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response'))
->will($this->returnCallback(function ($newResponse) use (&$response) { ->willReturnCallback(function ($newResponse) use (&$response) {
$response = $newResponse; $response = $newResponse;
})); });
$this->subscriber->on_kernel_request($event); $this->subscriber->on_kernel_request($event);