updated core

core/modules/rest/tests/modules/config_test_rest/config_test_rest.info.yml

@@ -6,8 +6,8 @@ package: Testing
 dependencies:
   - config_test
 
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
 core: '8.x'
 project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228

core/modules/rest/tests/modules/rest_test/rest_test.info.yml

@@ -7,8 +7,8 @@ package: Testing
 dependencies:
   - rest
 
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
 core: '8.x'
 project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228

core/modules/rest/tests/modules/rest_test_views/rest_test_views.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - rest
   - views
 
-# Information added by Drupal.org packaging script on 2017-11-03
-version: '8.4.2'
+# Information added by Drupal.org packaging script on 2018-01-03
+version: '8.4.4'
 core: '8.x'
 project: 'drupal'
-datestamp: 1509719929
+datestamp: 1515021228

core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php

@@ -31,6 +31,7 @@ trait AnonResourceTestTrait {
   /**
    * {@inheritdoc}
    */
-  protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
+  protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
+  }
 
 }

core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php

@@ -38,6 +38,7 @@ trait BasicAuthResourceTestTrait {
   /**
    * {@inheritdoc}
    */
-  protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
+  protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
+  }
 
 }

core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php

@@ -109,23 +109,18 @@ trait CookieResourceTestTrait {
       return;
     }
 
-
     unset($request_options[RequestOptions::HEADERS]['X-CSRF-Token']);
 
-
     // DX: 403 when missing X-CSRF-Token request header.
     $response = $this->request($method, $url, $request_options);
     $this->assertResourceErrorResponse(403, 'X-CSRF-Token request header is missing', $response);
 
-
     $request_options[RequestOptions::HEADERS]['X-CSRF-Token'] = 'this-is-not-the-token-you-are-looking-for';
 
-
     // DX: 403 when invalid X-CSRF-Token request header.
     $response = $this->request($method, $url, $request_options);
     $this->assertResourceErrorResponse(403, 'X-CSRF-Token request header is invalid', $response);
 
-
     $request_options[RequestOptions::HEADERS]['X-CSRF-Token'] = $this->csrfToken;
   }
 

core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php

@@ -301,17 +301,14 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url = $this->getEntityResourceUrl();
     $request_options = [];
 
-
     // DX: 404 when resource not provisioned, 403 if canonical route. HTML
     // response because missing ?_format query string.
     $response = $this->request('GET', $url, $request_options);
     $this->assertSame($has_canonical_url ? 403 : 404, $response->getStatusCode());
     $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 404 when resource not provisioned, 403 if canonical route. Non-HTML
     // response because ?_format query string is present.
     $response = $this->request('GET', $url, $request_options);
@@ -322,12 +319,10 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResourceErrorResponse(404, 'No route found for "GET ' . str_replace($this->baseUrl, '', $this->getEntityResourceUrl()->setAbsolute()->toString()) . '"', $response);
     }
 
-
     $this->provisionEntityResource();
     // Simulate the developer again forgetting the ?_format query string.
     $url->setOption('query', []);
 
-
     // DX: 406 when ?_format is missing, except when requesting a canonical HTML
     // route.
     $response = $this->request('GET', $url, $request_options);
@@ -338,10 +333,8 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assert406Response($response);
     }
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: forgetting authentication: authentication provider-specific error
     // response.
     if (static::$auth) {
@@ -365,16 +358,13 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     unset($request_options[RequestOptions::HEADERS]['REST-test-auth-global']);
     $request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions('GET'));
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('GET', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('GET'), $response);
     $this->assertArrayNotHasKey('Link', $response->getHeaders());
 
-
     $this->setUpAuthorization('GET');
 
-
     // 200 for well-formed HEAD request.
     $response = $this->request('HEAD', $url, $request_options);
     $this->assertResourceResponse(200, '', $response);
@@ -508,11 +498,9 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       // PrimitiveDataNormalizer.
       $this->rebuildAll();
 
-
       $response = $this->request('GET', $url, $request_options);
       $this->assertResourceResponse(200, FALSE, $response);
 
-
       // Again do an identical comparison, but this time transform the expected
       // normalized entity's values to strings. This ensures the BC layer for
       // bc_primitives_as_strings works as expected.
@@ -542,11 +530,9 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       // TimestampItemNormalizer.
       $this->rebuildAll();
 
-
       $response = $this->request('GET', $url, $request_options);
       $this->assertResourceResponse(200, FALSE, $response);
 
-
       // This ensures the BC layer for bc_timestamp_normalizer_unix works as
       // expected. This method should be using
       // ::formatExpectedTimestampValue() to generate the timestamp value. This
@@ -564,75 +550,59 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->rebuildAll();
     }
 
-
     // BC: rest_update_8203().
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
     $this->refreshTestStateAfterRestConfigChange();
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('GET', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('GET'), $response);
 
-
     $this->grantPermissionsToTestedRole(['restful get entity:' . static::$entityTypeId]);
 
-
     // 200 for well-formed request.
     $response = $this->request('GET', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
 
-
     $this->resourceConfigStorage->load(static::$resourceConfigId)->disable()->save();
     $this->refreshTestStateAfterRestConfigChange();
 
-
     // DX: upon disabling a resource, it's immediately no longer available.
     $this->assertResourceNotAvailable($url, $request_options);
 
-
     $this->resourceConfigStorage->load(static::$resourceConfigId)->enable()->save();
     $this->refreshTestStateAfterRestConfigChange();
 
-
     // DX: upon re-enabling a resource, immediate 200.
     $response = $this->request('GET', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
 
-
     $this->resourceConfigStorage->load(static::$resourceConfigId)->delete();
     $this->refreshTestStateAfterRestConfigChange();
 
-
     // DX: upon deleting a resource, it's immediately no longer available.
     $this->assertResourceNotAvailable($url, $request_options);
 
-
     $this->provisionEntityResource();
     $url->setOption('query', ['_format' => 'non_existing_format']);
 
-
     // DX: 406 when requesting unsupported format.
     $response = $this->request('GET', $url, $request_options);
     $this->assert406Response($response);
     $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type'));
 
-
     $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType;
 
-
     // DX: 406 when requesting unsupported format but specifying Accept header:
     // should result in a text/plain response.
     $response = $this->request('GET', $url, $request_options);
     $this->assert406Response($response);
     $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type'));
 
-
     $url = Url::fromRoute('rest.entity.' . static::$entityTypeId . '.GET.' . static::$format);
     $url->setRouteParameter(static::$entityTypeId, 987654321);
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 404 when GETting non-existing entity.
     $response = $this->request('GET', $url, $request_options);
     $path = str_replace('987654321', '{' . static::$entityTypeId . '}', $url->setAbsolute()->setOptions(['base_url' => '', 'query' => []])->toString());
@@ -714,27 +684,22 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url = $this->getEntityResourcePostUrl();
     $request_options = [];
 
-
     // DX: 404 when resource not provisioned. HTML response because missing
     // ?_format query string.
     $response = $this->request('POST', $url, $request_options);
     $this->assertSame(404, $response->getStatusCode());
     $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 404 when resource not provisioned.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(404, 'No route found for "POST ' . str_replace($this->baseUrl, '', $this->getEntityResourcePostUrl()->setAbsolute()->toString()) . '"', $response);
 
-
     $this->provisionEntityResource();
     // Simulate the developer again forgetting the ?_format query string.
     $url->setOption('query', []);
 
-
     // DX: 415 when no Content-Type request header. HTML response because
     // missing ?_format query string.
     $response = $this->request('POST', $url, $request_options);
@@ -742,34 +707,26 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     $this->assertContains('A client error happened', (string) $response->getBody());
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 415 when no Content-Type request header.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(415, 'No "Content-Type" request header specified', $response);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
 
-
     // DX: 400 when no request body.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(400, 'No entity content received.', $response);
 
-
     $request_options[RequestOptions::BODY] = $unparseable_request_body;
 
-
     // DX: 400 when unparseable request body.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(400, 'Syntax error', $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body;
 
-
     if (static::$auth) {
       // DX: forgetting authentication: authentication provider-specific error
       // response.
@@ -777,28 +734,22 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResponseWhenMissingAuthentication($response);
     }
 
-
     $request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions('POST'));
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('POST'), $response);
 
-
     $this->setUpAuthorization('POST');
 
-
     // DX: 422 when invalid entity: multiple values sent for single-value field.
     $response = $this->request('POST', $url, $request_options);
     $label_field = $this->entity->getEntityType()->hasKey('label') ? $this->entity->getEntityType()->getKey('label') : static::$labelFieldName;
     $label_field_capitalized = $this->entity->getFieldDefinition($label_field)->getLabel();
     $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\n$label_field: $label_field_capitalized: this field cannot hold more than 1 values.\n", $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_2;
 
-
     // DX: 422 when invalid entity: UUID field too long.
     // @todo Fix this in https://www.drupal.org/node/2149851.
     if ($this->entity->getEntityType()->hasKey('uuid')) {
@@ -806,35 +757,27 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: may not be longer than 128 characters.\n", $response);
     }
 
-
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_3;
 
-
     // DX: 403 when entity contains field without 'edit' access.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(403, "Access denied on creating field 'field_rest_test'.", $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body;
 
-
     // Before sending a well-formed request, allow the normalization and
     // authentication provider edge cases to also be tested.
     $this->assertNormalizationEdgeCases('POST', $url, $request_options);
     $this->assertAuthenticationEdgeCases('POST', $url, $request_options);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = 'text/xml';
 
-
     // DX: 415 when request body in existing but not allowed format.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(415, 'No route found that matches "Content-Type: text/xml"', $response);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
 
-
     // 201 for well-formed request.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceResponse(201, FALSE, $response);
@@ -866,20 +809,16 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       }
     }
 
-
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
     $this->refreshTestStateAfterRestConfigChange();
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body_2;
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('POST'), $response);
 
-
     $this->grantPermissionsToTestedRole(['restful post entity:' . static::$entityTypeId]);
 
-
     // 201 for well-formed request.
     // Delete the first created entity in case there is a uniqueness constraint.
     $this->entityStorage->load(static::$firstCreatedEntityId)->delete();
@@ -934,7 +873,6 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url = $this->getEntityResourceUrl();
     $request_options = [];
 
-
     // DX: 404 when resource not provisioned, 405 if canonical route. Plain text
     // or HTML response because missing ?_format query string.
     $response = $this->request('PATCH', $url, $request_options);
@@ -949,10 +887,8 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 404 when resource not provisioned, 405 if canonical route.
     $response = $this->request('PATCH', $url, $request_options);
     if ($has_canonical_url) {
@@ -962,46 +898,36 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResourceErrorResponse(404, 'No route found for "PATCH ' . str_replace($this->baseUrl, '', $this->getEntityResourceUrl()->setAbsolute()->toString()) . '"', $response);
     }
 
-
     $this->provisionEntityResource();
     // Simulate the developer again forgetting the ?_format query string.
     $url->setOption('query', []);
 
-
     // DX: 415 when no Content-Type request header.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertSame(415, $response->getStatusCode());
     $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     $this->assertContains('A client error happened', (string) $response->getBody());
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 415 when no Content-Type request header.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(415, 'No "Content-Type" request header specified', $response);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
 
-
     // DX: 400 when no request body.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(400, 'No entity content received.', $response);
 
-
     $request_options[RequestOptions::BODY] = $unparseable_request_body;
 
-
     // DX: 400 when unparseable request body.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(400, 'Syntax error', $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body;
 
-
     if (static::$auth) {
       // DX: forgetting authentication: authentication provider-specific error
       // response.
@@ -1009,33 +935,26 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResponseWhenMissingAuthentication($response);
     }
 
-
     $request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions('PATCH'));
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('PATCH'), $response);
 
-
     $this->setUpAuthorization('PATCH');
 
-
     // DX: 422 when invalid entity: multiple values sent for single-value field.
     $response = $this->request('PATCH', $url, $request_options);
     $label_field = $this->entity->getEntityType()->hasKey('label') ? $this->entity->getEntityType()->getKey('label') : static::$labelFieldName;
     $label_field_capitalized = $this->entity->getFieldDefinition($label_field)->getLabel();
     $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\n$label_field: $label_field_capitalized: this field cannot hold more than 1 values.\n", $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_2;
 
-
     // DX: 403 when entity contains field without 'edit' access.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(403, "Access denied on updating field 'field_rest_test'.", $response);
 
-
     // DX: 403 when sending PATCH request with read-only fields.
     // First send all fields (the "maximum normalization"). Assert the expected
     // error message for the first PATCH-protected field. Remove that field from
@@ -1055,27 +974,21 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
 
-
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body;
 
-
     // Before sending a well-formed request, allow the normalization and
     // authentication provider edge cases to also be tested.
     $this->assertNormalizationEdgeCases('PATCH', $url, $request_options);
     $this->assertAuthenticationEdgeCases('PATCH', $url, $request_options);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = 'text/xml';
 
-
     // DX: 415 when request body in existing but not allowed format.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(415, 'No route found that matches "Content-Type: text/xml"', $response);
 
-
     $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
 
-
     // 200 for well-formed request.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
@@ -1100,20 +1013,16 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // is not sent in the PATCH request.
     $this->assertSame('All the faith he had had had had no effect on the outcome of his life.', $updated_entity->get('field_rest_test')->value);
 
-
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
     $this->refreshTestStateAfterRestConfigChange();
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body_2;
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('PATCH'), $response);
 
-
     $this->grantPermissionsToTestedRole(['restful patch entity:' . static::$entityTypeId]);
 
-
     // 200 for well-formed request.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
@@ -1141,7 +1050,6 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url = $this->getEntityResourceUrl();
     $request_options = [];
 
-
     // DX: 404 when resource not provisioned, but 405 if canonical route. Plain
     // text  or HTML response because missing ?_format query string.
     $response = $this->request('DELETE', $url, $request_options);
@@ -1156,10 +1064,8 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
 
-
     $url->setOption('query', ['_format' => static::$format]);
 
-
     // DX: 404 when resource not provisioned, 405 if canonical route.
     $response = $this->request('DELETE', $url, $request_options);
     if ($has_canonical_url) {
@@ -1172,7 +1078,6 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     $this->provisionEntityResource();
 
-
     if (static::$auth) {
       // DX: forgetting authentication: authentication provider-specific error
       // response.
@@ -1180,23 +1085,18 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResponseWhenMissingAuthentication($response);
     }
 
-
     $request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions('PATCH'));
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('DELETE', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('DELETE'), $response);
 
-
     $this->setUpAuthorization('DELETE');
 
-
     // Before sending a well-formed request, allow the authentication provider's
     // edge cases to also be tested.
     $this->assertAuthenticationEdgeCases('DELETE', $url, $request_options);
 
-
     // 204 for well-formed request.
     $response = $this->request('DELETE', $url, $request_options);
     $this->assertSame(204, $response->getStatusCode());
@@ -1208,21 +1108,17 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $this->assertSame('', (string) $response->getBody());
     $this->assertFalse($response->hasHeader('X-Drupal-Cache'));
 
-
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
     $this->refreshTestStateAfterRestConfigChange();
     $this->entity = $this->createEntity();
     $url = $this->getEntityResourceUrl()->setOption('query', $url->getOption('query'));
 
-
     // DX: 403 when unauthorized.
     $response = $this->request('DELETE', $url, $request_options);
     $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('DELETE'), $response);
 
-
     $this->grantPermissionsToTestedRole(['restful delete entity:' . static::$entityTypeId]);
 
-
     // 204 for well-formed request.
     $response = $this->request('DELETE', $url, $request_options);
     $this->assertSame(204, $response->getStatusCode());
@@ -1249,17 +1145,14 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
         $normalization[$bundle_field_name] = 'bad_bundle_name';
         $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
         // DX: 422 when incorrect entity type bundle is specified.
         $response = $this->request($method, $url, $request_options);
         $this->assertResourceErrorResponse(422, '"bad_bundle_name" is not a valid bundle type for denormalization.', $response);
       }
 
-
       unset($normalization[$bundle_field_name]);
       $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
       // DX: 422 when no entity type bundle is specified.
       $response = $this->request($method, $url, $request_options);
       $this->assertResourceErrorResponse(422, sprintf('Could not determine entity type bundle: "%s" field is missing.', $bundle_field_name), $response);

core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php

@@ -144,7 +144,6 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
     // @todo Remove the array_diff_key() call in https://www.drupal.org/node/2821077.
     $original_normalization = array_diff_key($this->serializer->normalize($user, static::$format), ['created' => TRUE, 'changed' => TRUE, 'name' => TRUE]);
 
-
     // Since this test must be performed by the user that is being modified,
     // we cannot use $this->getUrl().
     $url = $user->toUrl()->setOption('query', ['_format' => static::$format]);
@@ -153,18 +152,15 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
     ];
     $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('PATCH'));
 
-
     // Test case 1: changing email.
     $normalization = $original_normalization;
     $normalization['mail'] = [['value' => 'new-email@example.com']];
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
     // DX: 422 when changing email without providing the password.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the Email.\n", $response);
 
-
     $normalization['pass'] = [['existing' => 'wrong']];
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
@@ -172,41 +168,33 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the Email.\n", $response);
 
-
     $normalization['pass'] = [['existing' => $this->account->passRaw]];
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
     // 200 for well-formed request.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
 
-
     // Test case 2: changing password.
     $normalization = $original_normalization;
     $new_password = $this->randomString();
     $normalization['pass'] = [['value' => $new_password]];
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
     // DX: 422 when changing password without providing the current password.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\npass: Your current password is missing or incorrect; it's required to change the Password.\n", $response);
 
-
     $normalization['pass'][0]['existing'] = $this->account->pass_raw;
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
     // 200 for well-formed request.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);
 
-
     // Verify that we can log in with the new password.
     $this->assertRpcLogin($user->getAccountName(), $new_password);
 
-
     // Update password in $this->account, prepare for future requests.
     $this->account->passRaw = $new_password;
     $this->initAuthentication();
@@ -215,21 +203,17 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
     ];
     $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('PATCH'));
 
-
     // Test case 3: changing name.
     $normalization = $original_normalization;
     $normalization['name'] = [['value' => 'Cooler Llama']];
     $request_options[RequestOptions::BODY] = $this->serializer->encode($normalization, static::$format);
 
-
     // DX: 403 when modifying username without required permission.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceErrorResponse(403, "Access denied on updating field 'name'.", $response);
 
-
     $this->grantPermissionsToTestedRole(['change own username']);
 
-
     // 200 for well-formed request.
     $response = $this->request('PATCH', $url, $request_options);
     $this->assertResourceResponse(200, FALSE, $response);

core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php

@@ -124,7 +124,6 @@ class StyleSerializerTest extends ViewTestBase {
 
     $this->assertIdentical($actual_json, json_encode($expected), 'The expected JSON output was found.');
 
-
     // Test that the rendered output and the preview output are the same.
     $view->destroy();
     $view->setDisplay('rest_export_1');

core/modules/rest/tests/src/Kernel/RestLinkManagerTest.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Kernel;
-
-use Drupal\Core\Url;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests that REST type and relation link managers work as expected
- * @group rest
- */
-class RestLinkManagerTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['rest', 'rest_test', 'system'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests that type hooks work as expected.
-   */
-  public function testRestLinkManagers() {
-    \Drupal::moduleHandler()->invoke('rest', 'install');
-    /* @var \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_manager */
-    $type_manager = \Drupal::service('rest.link_manager.type');
-    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
-    $link = $type_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, $base . 'rest/type/node/page');
-    // Now with optional context.
-    $link = $type_manager->getTypeUri('node', 'page', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_type');
-
-    /* @var \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_manager */
-    $relation_manager = \Drupal::service('rest.link_manager.relation');
-    $link = $relation_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, $base . 'rest/relation/node/page/field_ref');
-    // Now with optional context.
-    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_relation');
-  }
-
-  /**
-   * Tests that type hooks work as expected even without install hook.
-   */
-  public function testRestLinkManagersNoInstallHook() {
-    /* @var \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_manager */
-    $type_manager = \Drupal::service('rest.link_manager.type');
-    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
-    $link = $type_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, $base . 'rest/type/node/page');
-    // Now with optional context.
-    $link = $type_manager->getTypeUri('node', 'page', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_type');
-
-    /* @var \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_manager */
-    $relation_manager = \Drupal::service('rest.link_manager.relation');
-    $link = $relation_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, $base . 'rest/relation/node/page/field_ref');
-    // Now with optional context.
-    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_relation');
-  }
-
-  /**
-   * Tests \Drupal\rest\LinkManager\LinkManager::setLinkDomain().
-   */
-  public function testRestLinkManagersSetLinkDomain() {
-    /* @var \Drupal\rest\LinkManager\LinkManager $link_manager */
-    $link_manager = \Drupal::service('rest.link_manager');
-    $link_manager->setLinkDomain('http://example.com/');
-    $link = $link_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, 'http://example.com/rest/type/node/page');
-    $link = $link_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, 'http://example.com/rest/relation/node/page/field_ref');
-  }
-
-}