src/Access/CustomParameterNamesAccessCheck.php | 7 +------ src/JsonApiSpec.php | 2 +- tests/src/Unit/Access/CustomParameterNamesAccessCheckTest.php | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Access/CustomParameterNamesAccessCheck.php b/src/Access/CustomParameterNamesAccessCheck.php index 5f0d082..98dc812 100644 --- a/src/Access/CustomParameterNamesAccessCheck.php +++ b/src/Access/CustomParameterNamesAccessCheck.php @@ -6,7 +6,6 @@ use Drupal\Core\Access\AccessResult; use Drupal\Core\Routing\Access\AccessInterface; use Drupal\jsonapi\JsonApiSpec; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Route; /** * Validates custom (implementation-specific) query parameter names. @@ -20,17 +19,13 @@ class CustomParameterNamesAccessCheck implements AccessInterface { /** * Validates the JSONAPI parameter names. * - * * @param \Symfony\Component\Routing\Route $route - * The route to check against. * @param \Symfony\Component\HttpFoundation\Request $request * The request. * * @return \Drupal\Core\Access\AccessResult * The access result. */ - public function access(Route $route, Request $request) { - assert('$route->getRequirement("_json_api_custom_parameter_names") === "TRUE"'); - + public function access(Request $request) { $json_api_params = $request->attributes->get('_json_api_params', []); if (!$this->validate($json_api_params)) { return AccessResult::forbidden(); diff --git a/src/JsonApiSpec.php b/src/JsonApiSpec.php index ec9cc0d..6e04310 100644 --- a/src/JsonApiSpec.php +++ b/src/JsonApiSpec.php @@ -7,7 +7,7 @@ namespace Drupal\jsonapi; * * @see http://jsonapi.org/format */ -final class JsonApiSpec { +class JsonApiSpec { /** * Member name: globally allowed characters. diff --git a/tests/src/Unit/Access/CustomParameterNamesAccessCheckTest.php b/tests/src/Unit/Access/CustomParameterNamesAccessCheckTest.php index 547c98f..c53fee1 100644 --- a/tests/src/Unit/Access/CustomParameterNamesAccessCheckTest.php +++ b/tests/src/Unit/Access/CustomParameterNamesAccessCheckTest.php @@ -20,10 +20,9 @@ class CustomParameterNamesAccessCheckTest extends \PHPUnit_Framework_TestCase { public function testJsonApiParamsValidation($name, $valid) { $access_checker = new CustomParameterNamesAccessCheck(); - $route = new Route('/foo', [], ['_json_api_custom_parameter_names' => 'TRUE']); $request = new Request(); $request->attributes->set('_json_api_params', [$name => '123']); - $result = $access_checker->access($route, $request); + $result = $access_checker->access($request); if ($valid) { $this->assertTrue($result->isAllowed());