Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2011832 by linclark: Change structure of REST config.

8.0.x
Alex Pott 2013-06-30 12:08:17 +01:00
parent 03d3cb0a36
commit 7f2133b487
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php
View File

@ -75,7 +75,7 @@ class RouteSubscriber implements EventSubscriberInterface {
// If there is no format requirement or if it matches the
// configuration also add the route.
$format_requirement = $route->getRequirement('_format');
if (!$format_requirement || isset($enabled_methods[$method][$format_requirement])) {
if (!$format_requirement || empty($enabled_methods[$method]['supported_formats']) || in_array($format_requirement, $enabled_methods[$method]['supported_formats'])) {
$collection->add("rest.$name", $route);
}
}

4
core/modules/rest/lib/Drupal/rest/RequestHandler.php
View File

@ -51,8 +51,8 @@ class RequestHandler extends ContainerAware {
// format. If the serializer cannot handle it an exception will be thrown
// that bubbles up to the client.
$config = $this->container->get('config.factory')->get('rest.settings')->get('resources');
$enabled_formats = $config[$plugin][$request->getMethod()];
if (empty($enabled_formats) || isset($enabled_formats[$format])) {
$method_settings = $config[$plugin][$request->getMethod()];
if (empty($method_settings['supported_formats']) || in_array($format, $method_settings['supported_formats'])) {
$definition = $resource->getPluginDefinition();
$class = $definition['serialization_class'];
try {

2
core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
View File

@ -195,7 +195,7 @@ abstract class RESTTestBase extends WebTestBase {
$settings = array();
if ($resource_type) {
if ($format) {
$settings[$resource_type][$method][$format] = 'TRUE';
$settings[$resource_type][$method]['supported_formats'][] = $format;
}
else {
$settings[$resource_type][$method] = array();