.../JsonApiFunctionalMultilingualTest.php | 2 -- tests/src/Functional/JsonApiFunctionalTest.php | 4 ---- tests/src/Functional/RestJsonApiUnsupported.php | 2 -- tests/src/Kernel/Context/FieldResolverTest.php | 2 -- tests/src/Kernel/Controller/EntityResourceTest.php | 21 --------------------- tests/src/Kernel/Controller/EntryPointTest.php | 1 - tests/src/Kernel/EntityToJsonApiTest.php | 1 - tests/src/Kernel/Field/FileDownloadUrlTest.php | 1 - .../EntityConditionGroupNormalizerTest.php | 2 -- .../Normalizer/EntityConditionNormalizerTest.php | 2 -- .../src/Kernel/Normalizer/FilterNormalizerTest.php | 2 -- .../JsonApiDocumentTopLevelNormalizerTest.php | 9 --------- .../Kernel/Normalizer/OffsetPageNormalizerTest.php | 2 -- tests/src/Kernel/Normalizer/SortNormalizerTest.php | 2 -- tests/src/Kernel/Query/FilterTest.php | 1 - .../ResourceType/ResourceTypeRepositoryTest.php | 2 -- tests/src/Unit/Routing/JsonApiParamEnhancerTest.php | 1 - 17 files changed, 57 deletions(-) diff --git a/tests/src/Functional/JsonApiFunctionalMultilingualTest.php b/tests/src/Functional/JsonApiFunctionalMultilingualTest.php index a45ee05..8e3f626 100644 --- a/tests/src/Functional/JsonApiFunctionalMultilingualTest.php +++ b/tests/src/Functional/JsonApiFunctionalMultilingualTest.php @@ -41,8 +41,6 @@ class JsonApiFunctionalMultilingualTest extends JsonApiFunctionalTestBase { /** * Tests reading multilingual content. - * - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testReadMultilingual() { $this->createDefaultContent(5, 5, TRUE, TRUE, static::IS_MULTILINGUAL); diff --git a/tests/src/Functional/JsonApiFunctionalTest.php b/tests/src/Functional/JsonApiFunctionalTest.php index 535d582..2839cbc 100644 --- a/tests/src/Functional/JsonApiFunctionalTest.php +++ b/tests/src/Functional/JsonApiFunctionalTest.php @@ -14,8 +14,6 @@ class JsonApiFunctionalTest extends JsonApiFunctionalTestBase { /** * Test the GET method. - * - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testRead() { $this->createDefaultContent(61, 5, TRUE, TRUE, static::IS_NOT_MULTILINGUAL); @@ -404,8 +402,6 @@ class JsonApiFunctionalTest extends JsonApiFunctionalTestBase { /** * Test POST, PATCH and DELETE. - * - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testWrite() { $this->createDefaultContent(0, 3, FALSE, FALSE, static::IS_NOT_MULTILINGUAL); diff --git a/tests/src/Functional/RestJsonApiUnsupported.php b/tests/src/Functional/RestJsonApiUnsupported.php index 42999f3..8a8ca13 100644 --- a/tests/src/Functional/RestJsonApiUnsupported.php +++ b/tests/src/Functional/RestJsonApiUnsupported.php @@ -76,8 +76,6 @@ class RestJsonApiUnsupported extends ResourceTestBase { /** * Deploying a REST resource using api_json format results in 406 responses. - * - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testApiJsonNotSupportedInRest() { $this->assertSame(['json', 'xml'], $this->container->getParameter('serializer.formats')); diff --git a/tests/src/Kernel/Context/FieldResolverTest.php b/tests/src/Kernel/Context/FieldResolverTest.php index 8f8fc12..5292db7 100644 --- a/tests/src/Kernel/Context/FieldResolverTest.php +++ b/tests/src/Kernel/Context/FieldResolverTest.php @@ -145,7 +145,6 @@ class FieldResolverTest extends JsonapiKernelTestBase { /** * @covers ::resolveInternal - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testResolveInternal() { $entity_type_id = 'entity_test_with_bundle'; @@ -176,7 +175,6 @@ class FieldResolverTest extends JsonapiKernelTestBase { * @covers ::resolveInternal * * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testResolveInternalError() { $original = 'host.fail!!.deep'; diff --git a/tests/src/Kernel/Controller/EntityResourceTest.php b/tests/src/Kernel/Controller/EntityResourceTest.php index fe56358..62c41af 100644 --- a/tests/src/Kernel/Controller/EntityResourceTest.php +++ b/tests/src/Kernel/Controller/EntityResourceTest.php @@ -159,7 +159,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetIndividual() { $entity_resource = $this->buildEntityResource('node', 'article'); @@ -171,7 +170,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getIndividual * @expectedException \Drupal\jsonapi\Exception\EntityAccessDeniedHttpException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetIndividualDenied() { $role = Role::load(RoleInterface::ANONYMOUS_ID); @@ -183,7 +181,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getCollection - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetCollection() { $request = new Request([], [], [ @@ -210,7 +207,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getCollection - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetFilteredCollection() { $field_manager = $this->container->get('entity_field.manager'); @@ -263,7 +259,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getCollection - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetSortedCollection() { // Fake the request. @@ -318,7 +313,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getCollection - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetPagedCollection() { // Fake the request. @@ -374,7 +368,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getCollection - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetEmptyCollection() { $filter = new Filter(new EntityConditionGroup('AND', [new EntityCondition('uuid', 'invalid')])); @@ -402,7 +395,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getRelated - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetRelated() { // to-one relationship. @@ -445,7 +437,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::getRelationship - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGetRelationship() { // to-one relationship. @@ -472,7 +463,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::createIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testCreateIndividual() { $node = Node::create([ @@ -493,7 +483,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::createIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testCreateIndividualWithMissingRequiredData() { $node = Node::create([ @@ -510,7 +499,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::createIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testCreateIndividualConfig() { $node_type = NodeType::create([ @@ -532,7 +520,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::createIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testCreateIndividualDuplicateError() { Role::load(Role::ANONYMOUS_ID) @@ -554,7 +541,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::patchIndividual * @dataProvider patchIndividualProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testPatchIndividual($values) { $parsed_node = Node::create($values); @@ -607,7 +593,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::patchIndividual * @dataProvider patchIndividualConfigProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testPatchIndividualConfig($values) { // List of fields to be ignored. @@ -668,7 +653,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { * @covers ::patchIndividual * @dataProvider patchIndividualConfigFailedProvider * @expectedException \Drupal\Core\Config\ConfigException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testPatchIndividualFailedConfig($values) { $this->testPatchIndividualConfig($values); @@ -689,7 +673,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::deleteIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDeleteIndividual() { $node = Node::create([ @@ -717,7 +700,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::deleteIndividual - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDeleteIndividualConfig() { $node_type = NodeType::create([ @@ -746,7 +728,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::createRelationship - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testCreateRelationship() { $parsed_field_list = $this->container @@ -774,7 +755,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::patchRelationship * @dataProvider patchRelationshipProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testPatchRelationship($relationships) { $this->node->field_relationships->appendItem(['target_id' => $this->node->id()]); @@ -817,7 +797,6 @@ class EntityResourceTest extends JsonapiKernelTestBase { /** * @covers ::deleteRelationship * @dataProvider deleteRelationshipProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDeleteRelationship($deleted_rels, $kept_rels) { $this->node->field_relationships->appendItem(['target_id' => $this->node->id()]); diff --git a/tests/src/Kernel/Controller/EntryPointTest.php b/tests/src/Kernel/Controller/EntryPointTest.php index ea82ad8..dfddd82 100644 --- a/tests/src/Kernel/Controller/EntryPointTest.php +++ b/tests/src/Kernel/Controller/EntryPointTest.php @@ -26,7 +26,6 @@ class EntryPointTest extends JsonapiKernelTestBase { /** * @covers ::index - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testIndex() { $controller = new EntryPoint( diff --git a/tests/src/Kernel/EntityToJsonApiTest.php b/tests/src/Kernel/EntityToJsonApiTest.php index af61a24..91bf2ca 100644 --- a/tests/src/Kernel/EntityToJsonApiTest.php +++ b/tests/src/Kernel/EntityToJsonApiTest.php @@ -159,7 +159,6 @@ class EntityToJsonApiTest extends JsonapiKernelTestBase { /** * @covers ::serialize * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testSerialize() { $entities = [ diff --git a/tests/src/Kernel/Field/FileDownloadUrlTest.php b/tests/src/Kernel/Field/FileDownloadUrlTest.php index d48dc98..ab4bd59 100644 --- a/tests/src/Kernel/Field/FileDownloadUrlTest.php +++ b/tests/src/Kernel/Field/FileDownloadUrlTest.php @@ -56,7 +56,6 @@ class FileDownloadUrlTest extends KernelTestBase { /** * Test the URL computed field. - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testUrlField() { $url_field = $this->file->get('url'); diff --git a/tests/src/Kernel/Normalizer/EntityConditionGroupNormalizerTest.php b/tests/src/Kernel/Normalizer/EntityConditionGroupNormalizerTest.php index 8741528..41820b1 100644 --- a/tests/src/Kernel/Normalizer/EntityConditionGroupNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/EntityConditionGroupNormalizerTest.php @@ -25,7 +25,6 @@ class EntityConditionGroupNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize($case) { $normalizer = $this->container->get('serializer.normalizer.entity_condition_group.jsonapi'); @@ -43,7 +42,6 @@ class EntityConditionGroupNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @expectedException InvalidArgumentException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize_exception() { $normalizer = $this->container->get('serializer.normalizer.entity_condition_group.jsonapi'); diff --git a/tests/src/Kernel/Normalizer/EntityConditionNormalizerTest.php b/tests/src/Kernel/Normalizer/EntityConditionNormalizerTest.php index 152799a..dc9b4fc 100644 --- a/tests/src/Kernel/Normalizer/EntityConditionNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/EntityConditionNormalizerTest.php @@ -35,7 +35,6 @@ class EntityConditionNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize($case) { $normalized = $this->normalizer->denormalize($case, EntityCondition::class); @@ -62,7 +61,6 @@ class EntityConditionNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeValidationProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize_validation($input, $exception) { if ($exception) { diff --git a/tests/src/Kernel/Normalizer/FilterNormalizerTest.php b/tests/src/Kernel/Normalizer/FilterNormalizerTest.php index a4009cf..52bd97c 100644 --- a/tests/src/Kernel/Normalizer/FilterNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/FilterNormalizerTest.php @@ -43,7 +43,6 @@ class FilterNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize($normalized, $expected) { $actual = $this->normalizer->denormalize($normalized, Filter::class, NULL, ['entity_type_id' => 'foo', 'bundle' => 'bar']); @@ -66,7 +65,6 @@ class FilterNormalizerTest extends KernelTestBase { /** * @covers ::denormalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize_nested() { $normalized = [ diff --git a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php index 38a8faf..845d97f 100644 --- a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php @@ -197,7 +197,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testNormalize() { list($request, $resource_type) = $this->generateProphecies('node', 'article'); @@ -275,7 +274,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testNormalizeRelated() { list($request, $resource_type) = $this->generateProphecies('node', 'article', 'uid'); @@ -315,7 +313,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testNormalizeUuid() { list($request, $resource_type) = $this->generateProphecies('node', 'article', 'uuid'); @@ -358,7 +355,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testNormalizeException() { list($request, $resource_type) = $this->generateProphecies('node', 'article', 'id'); @@ -396,7 +392,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * @covers ::normalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testNormalizeConfig() { list($request, $resource_type) = $this->generateProphecies('node_type', 'node_type', 'id'); @@ -433,7 +428,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { * Try to POST a node and check if it exists afterwards. * * @covers ::denormalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize() { $payload = '{"type":"article", "data":{"attributes":{"title":"Testing article"}}}'; @@ -454,7 +448,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { * Try to POST a node and check if it exists afterwards. * * @covers ::denormalize - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalizeUuid() { $configurations = [ @@ -544,8 +537,6 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { /** * Try to POST a node with related resource of invalid type, as well as one * with no type. - * - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalizeInvalidTypeAndNoType() { $payload_data = [ diff --git a/tests/src/Kernel/Normalizer/OffsetPageNormalizerTest.php b/tests/src/Kernel/Normalizer/OffsetPageNormalizerTest.php index 70452d0..c86e951 100644 --- a/tests/src/Kernel/Normalizer/OffsetPageNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/OffsetPageNormalizerTest.php @@ -40,7 +40,6 @@ class OffsetPageNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize($original, $expected) { $actual = $this->normalizer->denormalize($original, OffsetPage::class); @@ -64,7 +63,6 @@ class OffsetPageNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalizeFail() { $this->normalizer->denormalize('lorem', OffsetPage::class); diff --git a/tests/src/Kernel/Normalizer/SortNormalizerTest.php b/tests/src/Kernel/Normalizer/SortNormalizerTest.php index 698e03c..b430eb0 100644 --- a/tests/src/Kernel/Normalizer/SortNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/SortNormalizerTest.php @@ -40,7 +40,6 @@ class SortNormalizerTest extends KernelTestBase { /** * @covers ::denormalize * @dataProvider denormalizeProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalize($input, $expected) { $sort = $this->normalizer->denormalize($input, Sort::class); @@ -87,7 +86,6 @@ class SortNormalizerTest extends KernelTestBase { * @covers ::denormalize * @dataProvider denormalizeFailProvider * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testDenormalizeFail($input) { $sort = $this->normalizer->denormalize($input, Sort::class); diff --git a/tests/src/Kernel/Query/FilterTest.php b/tests/src/Kernel/Query/FilterTest.php index e54196d..b6f7c73 100644 --- a/tests/src/Kernel/Query/FilterTest.php +++ b/tests/src/Kernel/Query/FilterTest.php @@ -68,7 +68,6 @@ class FilterTest extends JsonapiKernelTestBase { /** * @covers ::queryCondition - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testQueryCondition() { // Can't use a data provider because we need access to the container. diff --git a/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php b/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php index 3e1bb0e..bf7c450 100644 --- a/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php +++ b/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php @@ -55,7 +55,6 @@ class ResourceTypeRepositoryTest extends KernelTestBase { /** * @covers ::all - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testAll() { // Make sure that there are resources being created. @@ -71,7 +70,6 @@ class ResourceTypeRepositoryTest extends KernelTestBase { /** * @covers ::get * @dataProvider getProvider - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testGet($entity_type_id, $bundle, $entity_class) { // Make sure that there are resources being created. diff --git a/tests/src/Unit/Routing/JsonApiParamEnhancerTest.php b/tests/src/Unit/Routing/JsonApiParamEnhancerTest.php index 4b64746..7fac8b0 100644 --- a/tests/src/Unit/Routing/JsonApiParamEnhancerTest.php +++ b/tests/src/Unit/Routing/JsonApiParamEnhancerTest.php @@ -26,7 +26,6 @@ class JsonApiParamEnhancerTest extends UnitTestCase { /** * @covers ::applies - * @expectedDeprecation \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal\Core\Routing\EnhancerInterface. See https://www.drupal.org/node/2894934 */ public function testApplies() { list($filter_normalizer, $sort_normalizer, $page_normalizer) = $this->getMockNormalizers();