Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / hal / tests / src / Functional / EntityResource / Feed / FeedHalJsonTestBase.php

diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
index 43181323e32ecc4edbb0c7c9b7acc144794445ba..364e1072b5e278d0944706d960fc85e43d51873a 100644 (file)
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Feed/FeedHalJsonTestBase.php
+++ b/web/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 {
 }