GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ROUTER][UTIL] Allow specifying the Accept format for a route

Browse Source
This commit is contained in:
Hugo Sales 2021-08-18 21:33:07 +01:00
parent 86bdc398c5
commit 26bf78360b
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Controller.php
View File

@ -118,10 +118,11 @@ class Controller extends AbstractController implements EventSubscriberInterface
$event->setResponse($this->render($template, $this->vars)); $event->setResponse($this->render($template, $this->vars));
break; break;
case 'json': case 'json':
case 'jsonld':
$event->setResponse(new JsonResponse($response)); $event->setResponse(new JsonResponse($response));
break; break;
default: default:
throw new ClientException(_m('Unsupported format'), 406); // 406 Not Acceptable throw new ClientException(_m('Unsupported format: {format}', ['format' => $format]), 406); // 406 Not Acceptable
} }
return $event; return $event;

4
src/Core/Router/RouteLoader.php
View File

@ -75,7 +75,7 @@ class RouteLoader extends Loader
* @param mixed $target Some kind of callable, typically class with `__invoke` or [object, method] * @param mixed $target Some kind of callable, typically class with `__invoke` or [object, method]
* @param null|array $param_reqs Array of {param} => regex * @param null|array $param_reqs Array of {param} => regex
* @param null|array $options Possible keys are ['condition', 'defaults', 'format', * @param null|array $options Possible keys are ['condition', 'defaults', 'format',
* 'fragment', 'http-methods', 'locale', 'methods', 'schemes'] * 'fragment', 'http-methods', 'locale', 'methods', 'schemes', 'accept']
* 'http-methods' and 'methods' are aliases * 'http-methods' and 'methods' are aliases
*/ */
public function connect(string $id, string $uri_path, $target, ?array $options = [], ?array $param_reqs = []) public function connect(string $id, string $uri_path, $target, ?array $options = [], ?array $param_reqs = [])
@ -111,7 +111,7 @@ class RouteLoader extends Loader
methods: $options['http-methods'] ?? $options['methods'] ?? [], methods: $options['http-methods'] ?? $options['methods'] ?? [],
// condition = '' -- Symfony condition expression, // condition = '' -- Symfony condition expression,
// see https://symfony.com/doc/current/routing.html#matching-expressions // see https://symfony.com/doc/current/routing.html#matching-expressions
condition: $options['condition'] ?? '' condition: isset($options['accept']) ? "request.headers.get('Accept') in " . json_encode($options['accept']) : ($options['condition'] ?? '')
) )
); );
} }