nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use rawContent for Special Options to avoid a protected options() method

Browse source
This commit is contained in:
Philipp Holzer 2022-01-04 20:47:17 +01:00
parent 35a2fd45af
commit 6dbbd08179
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
4 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Router.php
View file

@ -262,7 +262,7 @@ class Router
$this->parameters = [];
// Check if the HTTP method ist OPTIONS and return the special Options Module with the possible HTTP methods
// Check if the HTTP method is OPTIONS and return the special Options Module with the possible HTTP methods
if ($this->args->getMethod() === static::OPTIONS) {
$routeOptions = $dispatcher->getOptions($cmd);

15
src/BaseModule.php
View file

@ -173,18 +173,6 @@ abstract class BaseModule implements ICanHandleRequests
{
}
/**
* Module OPTIONS method to process submitted data
*
* Extend this method if the module is supposed to process OPTIONS requests.
* Doesn't display any content
*
* @param string[] $request The $_REQUEST content
*/
protected function options(array $request = [])
{
}
/**
* {@inheritDoc}
*/
@ -237,9 +225,6 @@ abstract class BaseModule implements ICanHandleRequests
case Router::PUT:
$this->put($request);
break;
case Router::OPTIONS:
$this->options($request);
break;
}
$timestamp = microtime(true);

8
src/Module/Special/Options.php
View file

@ -34,13 +34,9 @@ use Friendica\Module\Response;
*/
class Options extends BaseModule
{
protected function options(array $request = [])
protected function rawContent(array $request = [])
{
$allowedMethods = $this->parameters['AllowedMethods'] ?? [];
if (empty($allowedMethods)) {
$allowedMethods = Router::ALLOWED_METHODS;
}
$allowedMethods = $this->parameters['AllowedMethods'] ?? Router::ALLOWED_METHODS;
// @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS
$this->response->setHeader(implode(',', $allowedMethods), 'Allow');

1
tests/src/Module/Special/OptionsTest.php
View file

@ -40,7 +40,6 @@ class OptionsTest extends FixtureTest
self::assertEquals([
'Allow' => [implode(',', [Router::GET, Router::POST])],
ICanCreateResponses::X_HEADER => ['blank'],
'Content-Type'
], $response->getHeaders());
self::assertEquals(implode(',', [Router::GET, Router::POST]), $response->getHeaderLine('Allow'));
}