Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 01:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move System::httpError to BaseModule->httpError

Browse source 
- This will ensure headers set in BaseModule->run will be carried in httpError scenarios
- Deprecate httpError() method in Core\System
This commit is contained in:
Hypolite Petovan 2023-09-21 12:45:24 -04:00
parent da1416c07f
commit e424b7bacb
5 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Module/Special/HTTPException.php
View file

@ -21,12 +21,12 @@
namespace Friendica\Module\Special;
use Friendica\App\Arguments;
use Friendica\App\Request;
use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session\Model\UserSession;
use Friendica\Core\System;
use Friendica\Module\Response;
use Psr\Log\LoggerInterface;
/**
@ -40,7 +40,7 @@ class HTTPException
protected $l10n;
/** @var LoggerInterface */
protected $logger;
/** @var Arguments */
/** @var App\Arguments */
protected $args;
/** @var bool */
protected $isSiteAdmin;
@ -49,7 +49,7 @@ class HTTPException
/** @var string */
protected $requestId;
public function __construct(L10n $l10n, LoggerInterface $logger, Arguments $args, UserSession $session, Request $request, array $server = [])
public function __construct(L10n $l10n, LoggerInterface $logger, App\Arguments $args, UserSession $session, App\Request $request, array $server = [])
{
$this->logger = $logger;
$this->l10n = $l10n;
@ -113,7 +113,13 @@ class HTTPException
}
}
System::httpError($e->getCode(), $e->getDescription(), $content);
// We can't use a constructor parameter for this response object because we
// are in an Exception context where we don't want an existing Response.
$response = new Response();
$response->setStatus($e->getCode(), $e->getDescription());
$response->addContent($content);
System::echoResponse($response->generate());
System::exit();
}
/**