updated core to 8.6.1 via composer

core/modules/hal/hal.api.php

@@ -33,7 +33,6 @@ function hook_hal_type_uri_alter(&$uri, $context = []) {
   }
 }
 
-
 /**
  * Alter the HAL relation URI.
  *

core/modules/hal/hal.info.yml

@@ -5,4 +5,4 @@ package: Web services
 version: VERSION
 core: 8.x
 dependencies:
-  - serialization
+  - drupal:serialization

core/modules/hal/hal.services.yml

@@ -1,7 +1,7 @@
 services:
   serializer.normalizer.entity_reference_item.hal:
     class: Drupal\hal\Normalizer\EntityReferenceItemNormalizer
-    arguments: ['@hal.link_manager', '@serializer.entity_resolver']
+    arguments: ['@hal.link_manager', '@serializer.entity_resolver', '@entity_type.manager']
     tags:
       - { name: normalizer, priority: 10 }
   serializer.normalizer.field_item.hal:
@@ -15,7 +15,7 @@ services:
   serializer.normalizer.file_entity.hal:
     class: Drupal\hal\Normalizer\FileEntityNormalizer
     deprecated: 'The "%service_id%" normalizer service is deprecated: it is obsolete, it only remains available for backwards compatibility.'
-    arguments: ['@entity.manager', '@http_client', '@hal.link_manager', '@module_handler', '@config.factory']
+    arguments: ['@entity.manager', '@hal.link_manager', '@module_handler', '@config.factory']
     tags:
       - { name: normalizer, priority: 20 }
   serializer.normalizer.timestamp_item.hal:

core/modules/hal/src/LinkManager/RelationLinkManager.php

@@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 class RelationLinkManager extends LinkManagerBase implements RelationLinkManagerInterface {
 
   /**
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
@@ -70,10 +70,7 @@ class RelationLinkManager extends LinkManagerBase implements RelationLinkManager
     // override the RelationLinkManager class/service to return the desired URL.
     $uri = $this->getLinkDomain($context) . "/rest/relation/$entity_type/$bundle/$field_name";
     $this->moduleHandler->alter('hal_relation_uri', $uri, $context);
-    // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
-    // hook is invoked to maintain backwards compatibility
-    // @see https://www.drupal.org/node/2830467
-    $this->moduleHandler->alter('rest_relation_uri', $uri, $context);
+    $this->moduleHandler->alterDeprecated('This hook is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Implement hook_hal_relation_uri_alter() instead.', 'rest_relation_uri', $uri, $context);
     return $uri;
   }
 

core/modules/hal/src/LinkManager/TypeLinkManager.php

@@ -14,7 +14,7 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac
   /**
    * Injected cache backend.
    *
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   * @var \Drupal\Core\Cache\CacheBackendInterface
    */
   protected $cache;
 
@@ -71,10 +71,7 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac
     // TypeLinkManager class/service to return the desired URL.
     $uri = $this->getLinkDomain($context) . "/rest/type/$entity_type/$bundle";
     $this->moduleHandler->alter('hal_type_uri', $uri, $context);
-    // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
-    // hook is invoked to maintain backwards compatibility
-    // @see https://www.drupal.org/node/2830467
-    $this->moduleHandler->alter('rest_type_uri', $uri, $context);
+    $this->moduleHandler->alterDeprecated('This hook is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Implement hook_hal_type_uri_alter() instead.', 'rest_type_uri', $uri, $context);
     return $uri;
   }
 

core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php

@@ -2,16 +2,22 @@
 
 namespace Drupal\hal\Normalizer;
 
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\hal\LinkManager\LinkManagerInterface;
 use Drupal\serialization\EntityResolver\EntityResolverInterface;
 use Drupal\serialization\EntityResolver\UuidReferenceInterface;
+use Drupal\serialization\Normalizer\EntityReferenceFieldItemNormalizerTrait;
 
 /**
  * Converts the Drupal entity reference item object to HAL array structure.
  */
 class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidReferenceInterface {
 
+  use EntityReferenceFieldItemNormalizerTrait;
+
   /**
    * The interface or class that this Normalizer supports.
    *
@@ -33,6 +39,13 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
    */
   protected $entityResolver;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Constructs an EntityReferenceItemNormalizer object.
    *
@@ -40,25 +53,28 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
    *   The hypermedia link manager.
    * @param \Drupal\serialization\EntityResolver\EntityResolverInterface $entity_Resolver
    *   The entity resolver.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface|null $entity_type_manager
+   *   The entity type manager.
    */
-  public function __construct(LinkManagerInterface $link_manager, EntityResolverInterface $entity_Resolver) {
+  public function __construct(LinkManagerInterface $link_manager, EntityResolverInterface $entity_Resolver, EntityTypeManagerInterface $entity_type_manager = NULL) {
     $this->linkManager = $link_manager;
     $this->entityResolver = $entity_Resolver;
+    $this->entityTypeManager = $entity_type_manager ?: \Drupal::service('entity_type.manager');
   }
 
   /**
    * {@inheritdoc}
    */
   public function normalize($field_item, $format = NULL, array $context = []) {
-    /** @var $field_item \Drupal\Core\Field\FieldItemInterface */
-    $target_entity = $field_item->get('entity')->getValue();
-
-    // If this is not a content entity, let the parent implementation handle it,
-    // only content entities are supported as embedded resources.
-    if (!($target_entity instanceof FieldableEntityInterface)) {
+    // If this is not a fieldable entity, let the parent implementation handle
+    // it, only fieldable entities are supported as embedded resources.
+    if (!$this->targetEntityIsFieldable($field_item)) {
       return parent::normalize($field_item, $format, $context);
     }
 
+    /** @var $field_item \Drupal\Core\Field\FieldItemInterface */
+    $target_entity = $field_item->get('entity')->getValue();
+
     // If the parent entity passed in a langcode, unset it before normalizing
     // the target entity. Otherwise, untranslatable fields of the target entity
     // will include the langcode.
@@ -91,6 +107,39 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
     ];
   }
 
+  /**
+   * Checks whether the referenced entity is of a fieldable entity type.
+   *
+   * @param \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $item
+   *   The reference field item whose target entity needs to be checked.
+   *
+   * @return bool
+   *   TRUE when the referenced entity is of a fieldable entity type.
+   */
+  protected function targetEntityIsFieldable(EntityReferenceItem $item) {
+    $target_entity = $item->get('entity')->getValue();
+
+    if ($target_entity !== NULL) {
+      return $target_entity instanceof FieldableEntityInterface;
+    }
+
+    $referencing_entity = $item->getEntity();
+    $target_entity_type_id = $item->getFieldDefinition()->getSetting('target_type');
+
+    // If the entity type is the same as the parent, we can check that. This is
+    // just a shortcut to avoid getting the entity type defintition and checking
+    // the class.
+    if ($target_entity_type_id === $referencing_entity->getEntityTypeId()) {
+      return $referencing_entity instanceof FieldableEntityInterface;
+    }
+
+    // Otherwise, we need to get the class for the type.
+    $target_entity_type = $this->entityTypeManager->getDefinition($target_entity_type_id);
+    $target_entity_type_class = $target_entity_type->getClass();
+
+    return is_a($target_entity_type_class, FieldableEntityInterface::class, TRUE);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -100,11 +149,26 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
     $target_type = $field_definition->getSetting('target_type');
     $id = $this->entityResolver->resolve($this, $data, $target_type);
     if (isset($id)) {
-      return ['target_id' => $id];
+      return ['target_id' => $id] + array_intersect_key($data, $field_item->getProperties());
     }
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function normalizedFieldValues(FieldItemInterface $field_item, $format, array $context) {
+    // Normalize root reference values here so we don't need to deal with hal's
+    // nested data structure for field items. This will be called from
+    // \Drupal\hal\Normalizer\FieldItemNormalizer::normalize. Which will only
+    // be called from this class for entities that are not fieldable.
+    $normalized = parent::normalizedFieldValues($field_item, $format, $context);
+
+    $this->normalizeRootReferenceValue($normalized, $field_item);
+
+    return $normalized;
+  }
+
   /**
    * {@inheritdoc}
    */

core/modules/hal/src/Normalizer/FieldItemNormalizer.php

@@ -92,7 +92,10 @@ class FieldItemNormalizer extends NormalizerBase {
     // We normalize each individual property, so each can do their own casting,
     // if needed.
     /** @var \Drupal\Core\TypedData\TypedDataInterface $property */
-    foreach (TypedDataInternalPropertiesHelper::getNonInternalProperties($field_item) as $property_name => $property) {
+    $field_properties = !empty($field_item->getProperties(TRUE))
+      ? TypedDataInternalPropertiesHelper::getNonInternalProperties($field_item)
+      : $field_item->getValue();
+    foreach ($field_properties as $property_name => $property) {
       $normalized[$property_name] = $this->serializer->normalize($property, $format, $context);
     }
 

core/modules/hal/src/Normalizer/FileEntityNormalizer.php

@@ -6,7 +6,6 @@ use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\hal\LinkManager\LinkManagerInterface;
-use GuzzleHttp\ClientInterface;
 
 /**
  * Converts the Drupal entity object structure to a HAL array structure.
@@ -41,8 +40,6 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
-   * @param \GuzzleHttp\ClientInterface $http_client
-   *   The HTTP Client.
    * @param \Drupal\hal\LinkManager\LinkManagerInterface $link_manager
    *   The hypermedia link manager.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
@@ -50,10 +47,9 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
    */
-  public function __construct(EntityManagerInterface $entity_manager, ClientInterface $http_client, LinkManagerInterface $link_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory) {
+  public function __construct(EntityManagerInterface $entity_manager, LinkManagerInterface $link_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory) {
     parent::__construct($link_manager, $entity_manager, $module_handler);
 
-    $this->httpClient = $http_client;
     $this->halSettings = $config_factory->get('hal.settings');
   }
 
@@ -73,16 +69,4 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
     return $data;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function denormalize($data, $class, $format = NULL, array $context = []) {
-    $file_data = (string) $this->httpClient->get($data['uri'][0]['value'])->getBody();
-
-    $path = 'temporary://' . drupal_basename($data['uri'][0]['value']);
-    $data['uri'] = file_unmanaged_save_data($file_data, $path);
-
-    return $this->entityManager->getStorage('file')->create($data);
-  }
-
 }

core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
-
-/**
- * @group hal
- */
-class ActionHalJsonAnonTest extends ActionResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
-
-/**
- * @group hal
- */
-class ActionHalJsonBasicAuthTest extends ActionResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
-
-/**
- * @group hal
- */
-class ActionHalJsonCookieTest extends ActionResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
-
-/**
- * @group hal
- */
-class BaseFieldOverrideHalJsonAnonTest extends BaseFieldOverrideResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
-
-/**
- * @group hal
- */
-class BaseFieldOverrideHalJsonBasicAuthTest extends BaseFieldOverrideResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride\BaseFieldOverrideResourceTestBase;
-
-/**
- * @group hal
- */
-class BaseFieldOverrideHalJsonCookieTest extends BaseFieldOverrideResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockHalJsonAnonTest extends BlockResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockHalJsonBasicAuthTest extends BlockResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockHalJsonCookieTest extends BlockResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonAnonTest.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContent\BlockContentResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockContentHalJsonAnonTest extends BlockContentResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => $this->baseUrl . '/block/1?_format=hal_json',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/block_content/basic',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/block_content/basic',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeTags(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class BlockContentHalJsonBasicAuthTest extends BlockContentHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContent/BlockContentHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class BlockContentHalJsonCookieTest extends BlockContentHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockContentTypeHalJsonAnonTest extends BlockContentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockContentTypeHalJsonBasicAuthTest extends BlockContentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\BlockContentType\BlockContentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class BlockContentTypeHalJsonCookieTest extends BlockContentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonAnonTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group hal
- */
-class CommentHalJsonAnonTest extends CommentHalJsonTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   *
-   * Anononymous users cannot edit their own comments.
-   *
-   * @see \Drupal\comment\CommentAccessControlHandler::checkAccess
-   *
-   * Therefore we grant them the 'administer comments' permission for the
-   * purpose of this test. Then they are able to edit their own comments, but
-   * some fields are still not editable, even with that permission.
-   *
-   * @see ::setUpAuthorization
-   */
-  protected static $patchProtectedFieldNames = [
-    'entity_id',
-    'changed',
-    'thread',
-    'entity_type',
-    'field_name',
-  ];
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class CommentHalJsonBasicAuthTest extends CommentHalJsonTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class CommentHalJsonCookieTest extends CommentHalJsonTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php

@@ -2,110 +2,15 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
 
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Comment\CommentResourceTestBase;
-use Drupal\user\Entity\User;
+@trigger_error('The ' . __NAMESPACE__ . '\CommentHalJsonTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\comment\Functional\Hal\CommentHalJsonTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class CommentHalJsonTestBase extends CommentResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    // Because \Drupal\comment\Entity\Comment::getOwner() generates an in-memory
-    // User entity without a UUID, we cannot use it.
-    $author = User::load($this->entity->getOwnerId());
-    $commented_entity = EntityTest::load(1);
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => $this->baseUrl . '/comment/1?_format=hal_json',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/comment/comment',
-        ],
-        $this->baseUrl . '/rest/relation/comment/comment/entity_id' => [
-          [
-            'href' => $this->baseUrl . '/entity_test/1?_format=hal_json',
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/comment/comment/uid' => [
-          [
-            'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-            'lang' => 'en',
-          ],
-        ],
-      ],
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/comment/comment/entity_id' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/entity_test/1?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/entity_test/bar',
-              ],
-            ],
-            'uuid' => [
-              ['value' => $commented_entity->uuid()]
-            ],
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/comment/comment/uid' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              ['value' => $author->uuid()]
-            ],
-            'lang' => 'en',
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/comment/comment',
-        ],
-      ],
-    ];
-  }
+use Drupal\Tests\comment\Functional\Hal\CommentHalJsonTestBase as CommentHalJsonTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\comment\Functional\Hal\CommentHalJsonTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class CommentHalJsonTestBase extends CommentHalJsonTestBaseReal {
 }

core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class CommentTypeHalJsonAnonTest extends CommentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class CommentTypeHalJsonBasicAuthTest extends CommentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class CommentTypeHalJsonCookieTest extends CommentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigTestHalJsonAnonTest extends ConfigTestResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigTestHalJsonBasicAuthTest extends ConfigTestResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigTestHalJsonCookieTest extends ConfigTestResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigurableLanguageHalJsonAnonTest extends ConfigurableLanguageResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigurableLanguageHalJsonBasicAuthTest extends ConfigurableLanguageResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
-
-/**
- * @group hal
- */
-class ConfigurableLanguageHalJsonCookieTest extends ConfigurableLanguageResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
-
-/**
- * @group hal
- */
-class ContactFormHalJsonAnonTest extends ContactFormResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
-
-/**
- * @group hal
- */
-class ContactFormHalJsonBasicAuthTest extends ContactFormResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContactForm/ContactFormHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContactForm\ContactFormResourceTestBase;
-
-/**
- * @group hal
- */
-class ContactFormHalJsonCookieTest extends ContactFormResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
-
-/**
- * @group hal
- */
-class ContentLanguageSettingsHalJsonAnonTest extends ContentLanguageSettingsResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
-
-/**
- * @group hal
- */
-class ContentLanguageSettingsHalJsonBasicAuthTest extends ContentLanguageSettingsResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings\ContentLanguageSettingsResourceTestBase;
-
-/**
- * @group hal
- */
-class ContentLanguageSettingsHalJsonCookieTest extends ContentLanguageSettingsResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class DateFormatHalJsonAnonTest extends DateFormatResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class DateFormatHalJsonBasicAuthTest extends DateFormatResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/DateFormat/DateFormatHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\DateFormat\DateFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class DateFormatHalJsonCookieTest extends DateFormatResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
-
-/**
- * @group hal
- */
-class EditorHalJsonAnonTest extends EditorResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
-
-/**
- * @group hal
- */
-class EditorHalJsonBasicAuthTest extends EditorResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Editor/EditorHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Editor\EditorResourceTestBase;
-
-/**
- * @group hal
- */
-class EditorHalJsonCookieTest extends EditorResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormDisplayHalJsonAnonTest extends EntityFormDisplayResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormDisplayHalJsonBasicAuthTest extends EntityFormDisplayResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormDisplay;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay\EntityFormDisplayResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormDisplayHalJsonCookieTest extends EntityFormDisplayResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormModeHalJsonAnonTest extends EntityFormModeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormModeHalJsonBasicAuthTest extends EntityFormModeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityFormMode/EntityFormModeHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityFormMode;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityFormMode\EntityFormModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityFormModeHalJsonCookieTest extends EntityFormModeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
-
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase;
-use Drupal\Tests\rest\Functional\EntityResource\FormatSpecificGetBcRouteTestTrait;
-use Drupal\user\Entity\User;
-
-/**
- * @group hal
- */
-class EntityTestHalJsonAnonTest extends EntityTestResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-  use FormatSpecificGetBcRouteTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    $author = User::load(0);
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => $this->baseUrl . '/entity_test/1?_format=hal_json',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/entity_test/entity_test',
-        ],
-        $this->baseUrl . '/rest/relation/entity_test/entity_test/user_id' => [
-          [
-            'href' => $this->baseUrl . '/user/0?_format=hal_json',
-            'lang' => 'en',
-          ],
-        ],
-      ],
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/entity_test/entity_test/user_id' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/user/0?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              ['value' => $author->uuid()]
-            ],
-            'lang' => 'en',
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/entity_test/entity_test',
-        ],
-      ],
-    ];
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityTestHalJsonBasicAuthTest extends EntityTestHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityTestHalJsonCookieTest extends EntityTestHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonInternalPropertyNormalizerTest.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * Test that internal properties are not exposed in the 'hal_json' format.
- *
- * @group hal
- */
-class EntityTestHalJsonInternalPropertyNormalizerTest extends EntityTestHalJsonAnonTest {
-
-  use AnonResourceTestTrait, HalEntityNormalizationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-    // The 'internal_value' property in test field type will not be returned in
-    // normalization because setInternal(FALSE) was not called for this
-    // property.
-    // @see \Drupal\entity_test\Plugin\Field\FieldType\InternalPropertyTestFieldItem::propertyDefinitions
-    $normalization['field_test_internal'] = [
-      [
-        'value' => 'This value shall not be internal!',
-        'non_internal_value' => 'Computed! This value shall not be internal!',
-      ],
-    ];
-    return $normalization;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    if (!FieldStorageConfig::loadByName('entity_test', 'field_test_internal')) {
-      FieldStorageConfig::create([
-        'entity_type' => 'entity_test',
-        'field_name' => 'field_test_internal',
-        'type' => 'internal_property_test',
-        'cardinality' => 1,
-        'translatable' => FALSE,
-      ])->save();
-      FieldConfig::create([
-        'entity_type' => 'entity_test',
-        'field_name' => 'field_test_internal',
-        'bundle' => 'entity_test',
-        'label' => 'Test field with internal and non-internal properties',
-      ])->save();
-    }
-
-    $entity = parent::createEntity();
-    $entity->field_test_internal = [
-      'value' => 'This value shall not be internal!',
-    ];
-    $entity->save();
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      'field_test_internal' => [
-        [
-          'value' => 'This value shall not be internal!',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['request_format']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    return Cache::mergeTags(parent::getExpectedCacheTags(), ['you_are_it', 'no_tag_backs']);
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonAnonTest.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
-
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityTestBundleHalJsonAnonTest extends EntityTestBundleResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityTestBundleHalJsonBasicAuthTest extends EntityTestBundleResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestBundle/EntityTestBundleHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestBundle;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestBundle\EntityTestBundleResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityTestBundleHalJsonCookieTest extends EntityTestBundleResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
-
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel\EntityTestLabelResourceTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * @group hal
- */
-class EntityTestLabelHalJsonAnonTest extends EntityTestLabelResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    $author = User::load(0);
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => '',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/entity_test_label/entity_test_label',
-        ],
-        $this->baseUrl . '/rest/relation/entity_test_label/entity_test_label/user_id' => [
-          [
-            'href' => $this->baseUrl . '/user/0?_format=hal_json',
-            'lang' => 'en',
-          ],
-        ],
-      ],
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/entity_test_label/entity_test_label/user_id' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/user/0?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              [
-                'value' => $author->uuid(),
-              ],
-            ],
-            'lang' => 'en',
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/entity_test_label/entity_test_label',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'url.site',
-      'user.permissions',
-    ];
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityTestLabelHalJsonBasicAuthTest extends EntityTestLabelHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityTestLabelHalJsonCookieTest extends EntityTestLabelHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewDisplay\EntityViewDisplayResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityViewDisplayHalJsonAnonTest extends EntityViewDisplayResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityViewDisplayHalJsonBasicAuthTest extends EntityViewDisplayHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewDisplay/EntityViewDisplayHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewDisplay;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class EntityViewDisplayHalJsonCookieTest extends EntityViewDisplayHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityViewModeHalJsonAnonTest extends EntityViewModeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityViewModeHalJsonBasicAuthTest extends EntityViewModeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/EntityViewMode/EntityViewModeHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\EntityViewMode;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityViewMode\EntityViewModeResourceTestBase;
-
-/**
- * @group hal
- */
-class EntityViewModeHalJsonCookieTest extends EntityViewModeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonAnonTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group hal
- */
-class FeedHalJsonAnonTest extends FeedHalJsonTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class FeedHalJsonBasicAuthTest extends FeedHalJsonTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class FeedHalJsonCookieTest extends FeedHalJsonTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php

@@ -2,59 +2,15 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Feed;
 
-use Drupal\Tests\rest\Functional\EntityResource\Feed\FeedResourceTestBase;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+@trigger_error('The ' . __NAMESPACE__ . '\FeedHalJsonTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\aggregator\Functional\Hal\FeedHalJsonTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class FeedHalJsonTestBase extends FeedResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => $this->baseUrl . '/aggregator/sources/1?_format=hal_json'
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/aggregator_feed/aggregator_feed'
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/aggregator_feed/aggregator_feed'
-        ],
-      ],
-    ];
-  }
+use Drupal\Tests\aggregator\Functional\Hal\FeedHalJsonTestBase as FeedHalJsonTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\aggregator\Functional\Hal\FeedHalJsonTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class FeedHalJsonTestBase extends FeedHalJsonTestBaseReal {
 }

core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldConfigHalJsonAnonTest extends FieldConfigResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldConfigHalJsonBasicAuthTest extends FieldConfigResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FieldConfig/FieldConfigHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldConfig;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldConfig\FieldConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldConfigHalJsonCookieTest extends FieldConfigResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldStorageConfigHalJsonAnonTest extends FieldStorageConfigResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldStorageConfigHalJsonBasicAuthTest extends FieldStorageConfigResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FieldStorageConfig/FieldStorageConfigHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FieldStorageConfig;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FieldStorageConfig\FieldStorageConfigResourceTestBase;
-
-/**
- * @group hal
- */
-class FieldStorageConfigHalJsonCookieTest extends FieldStorageConfigResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php

@@ -1,147 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\File\FileResourceTestBase;
-
-/**
- * @group hal
- */
-class FileHalJsonAnonTest extends FileResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    $url = file_create_url($this->entity->getFileUri());
-    // @see \Drupal\Tests\hal\Functional\EntityResource\File\FileHalJsonAnonTest::testGetBcUriField()
-    if ($this->config('hal.settings')->get('bc_file_uri_as_url_normalizer')) {
-      $normalization['uri'][0]['value'] = $url;
-    }
-
-    $uid = $this->author->id();
-
-    return $normalization + [
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/file/file/uid' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . "/user/$uid?_format=hal_json",
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              [
-                'value' => $this->author->uuid(),
-              ],
-            ],
-          ],
-        ],
-      ],
-      '_links' => [
-        'self' => [
-          'href' => $url,
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/file/file',
-        ],
-        $this->baseUrl . '/rest/relation/file/file/uid' => [
-          [
-            'href' => $this->baseUrl . "/user/$uid?_format=hal_json",
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/file/file',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:hal.settings']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'url.site',
-      'user.permissions',
-    ];
-  }
-
-  /**
-   * @see hal_update_8501()
-   */
-  public function testGetBcUriField() {
-    $this->config('hal.settings')->set('bc_file_uri_as_url_normalizer', TRUE)->save(TRUE);
-
-    $this->initAuthentication();
-    $url = $this->getEntityResourceUrl();
-    $url->setOption('query', ['_format' => static::$format]);
-    $request_options = $this->getAuthenticationRequestOptions('GET');
-    $this->provisionEntityResource();
-    $this->setUpAuthorization('GET');
-    $response = $this->request('GET', $url, $request_options);
-    $expected = $this->getExpectedNormalizedEntity();
-    static::recursiveKSort($expected);
-    $actual = $this->serializer->decode((string) $response->getBody(), static::$format);
-    static::recursiveKSort($actual);
-    $this->assertSame($expected, $actual);
-
-    // Explicitly assert that $file->uri->value is an absolute file URL, unlike
-    // the default normalization.
-    $this->assertSame($this->baseUrl . '/' . $this->siteDirectory . '/files/drupal.txt', $actual['uri'][0]['value']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPatch() {
-    // @todo https://www.drupal.org/node/1927648
-    $this->markTestSkipped();
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class FileHalJsonBasicAuthTest extends FileHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\File;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class FileHalJsonCookieTest extends FileHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/File/FileUploadHalJsonTestBase.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\File;
+
+@trigger_error('The ' . __NAMESPACE__ . '\FileUploadHalJsonTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\file\Functional\Hal\FileUploadHalJsonTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\Tests\file\Functional\Hal\FileUploadHalJsonTestBase as FileUploadHalJsonTestBaseReal;
+
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\file\Functional\Hal\FileUploadHalJsonTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class FileUploadHalJsonTestBase extends FileUploadHalJsonTestBaseReal {
+}

core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class FilterFormatHalJsonAnonTest extends FilterFormatResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class FilterFormatHalJsonBasicAuthTest extends FilterFormatResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
-
-/**
- * @group hal
- */
-class FilterFormatHalJsonCookieTest extends FilterFormatResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
-
-/**
- * @group hal
- */
-class ImageStyleHalJsonAnonTest extends ImageStyleResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
-
-/**
- * @group hal
- */
-class ImageStyleHalJsonBasicAuthTest extends ImageStyleResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
-
-/**
- * @group hal
- */
-class ImageStyleHalJsonCookieTest extends ImageStyleResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group hal
- */
-class ItemHalJsonAnonTest extends ItemHalJsonTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class ItemHalJsonBasicAuthTest extends ItemHalJsonTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Item;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class ItemHalJsonCookieTest extends ItemHalJsonTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php

@@ -2,99 +2,15 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Item;
 
-use Drupal\aggregator\Entity\Feed;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Item\ItemResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\ItemHalJsonTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\aggregator\Functional\Hal\ItemHalJsonTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\Tests\aggregator\Functional\Hal\ItemHalJsonTestBase as ItemHalJsonTestBaseReal;
 
 /**
- * ResourceTestBase for Item entity.
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\aggregator\Functional\Hal\ItemHalJsonTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
  */
-abstract class ItemHalJsonTestBase extends ItemResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-    $feed = Feed::load($this->entity->getFeedId());
-
-    return $normalization + [
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/aggregator_item/aggregator_item/fid' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/aggregator/sources/1?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/aggregator_feed/aggregator_feed',
-              ],
-            ],
-            'uuid' => [
-              [
-                'value' => $feed->uuid(),
-              ],
-            ],
-          ],
-        ],
-      ],
-      '_links' => [
-        'self' => [
-          'href' => '',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/aggregator_item/aggregator_item',
-        ],
-        $this->baseUrl . '/rest/relation/aggregator_item/aggregator_item/fid' => [
-          [
-            'href' => $this->baseUrl . '/aggregator/sources/' . $feed->id() . '?_format=hal_json',
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/aggregator_item/aggregator_item',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'url.site',
-      'user.permissions',
-    ];
-  }
-
+abstract class ItemHalJsonTestBase extends ItemHalJsonTestBaseReal {
 }

core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php

@@ -1,174 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\file\Entity\File;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\Media\MediaResourceTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * @group hal
- */
-class MediaHalJsonAnonTest extends MediaResourceTestBase {
-
-  use HalEntityNormalizationTrait;
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $default_normalization = parent::getExpectedNormalizedEntity();
-
-    $normalization = $this->applyHalFieldNormalization($default_normalization);
-
-    $file = File::load(1);
-    $thumbnail = File::load(2);
-    $author = User::load($this->entity->getOwnerId());
-    return $normalization + [
-      '_links' => [
-        'self' => [
-          'href' => $this->baseUrl . '/media/1?_format=hal_json',
-        ],
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/media/camelids',
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/field_media_file' => [
-          [
-            'href' => $file->url(),
-            'lang' => 'en',
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/revision_user' => [
-          [
-            'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/thumbnail' => [
-          [
-            'href' => $thumbnail->url(),
-            'lang' => 'en',
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/uid' => [
-          [
-            'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-            'lang' => 'en',
-          ],
-        ],
-      ],
-      '_embedded' => [
-        $this->baseUrl . '/rest/relation/media/camelids/field_media_file' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $file->url(),
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/file/file',
-              ],
-            ],
-            'lang' => 'en',
-            'uuid' => [
-              [
-                'value' => $file->uuid(),
-              ],
-            ],
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/revision_user' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              [
-                'value' => $author->uuid(),
-              ],
-            ],
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/thumbnail' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $thumbnail->url(),
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/file/file',
-              ],
-            ],
-            'lang' => 'en',
-            'uuid' => [
-              [
-                'value' => $thumbnail->uuid(),
-              ],
-            ],
-          ],
-        ],
-        $this->baseUrl . '/rest/relation/media/camelids/uid' => [
-          [
-            '_links' => [
-              'self' => [
-                'href' => $this->baseUrl . '/user/' . $author->id() . '?_format=hal_json',
-              ],
-              'type' => [
-                'href' => $this->baseUrl . '/rest/type/user/user',
-              ],
-            ],
-            'uuid' => [
-              [
-                'value' => $author->uuid(),
-              ],
-            ],
-            'lang' => 'en',
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return parent::getNormalizedPostEntity() + [
-      '_links' => [
-        'type' => [
-          'href' => $this->baseUrl . '/rest/type/media/camelids',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:hal.settings']);
-  }
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonBasicAuthTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group hal
- */
-class MediaHalJsonBasicAuthTest extends MediaHalJsonAnonTest {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonCookieTest.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\Media;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group hal
- */
-class MediaHalJsonCookieTest extends MediaHalJsonAnonTest {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonAnonTest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\MediaType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MediaType\MediaTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class MediaTypeHalJsonAnonTest extends MediaTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-}

core/modules/hal/tests/src/Functional/EntityResource/MediaType/MediaTypeHalJsonBasicAuthTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional\EntityResource\MediaType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\MediaType\MediaTypeResourceTestBase;
-
-/**
- * @group hal
- */
-class MediaTypeHalJsonBasicAuthTest extends MediaTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['hal', 'basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/hal+json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}