X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fhal%2Ftests%2Fsrc%2FFunctional%2FEntityResource%2FItem%2FItemHalJsonTestBase.php;fp=web%2Fcore%2Fmodules%2Fhal%2Ftests%2Fsrc%2FFunctional%2FEntityResource%2FItem%2FItemHalJsonTestBase.php;h=6febd3d6c669646d67e6d053c38fd167851c95c2;hp=24157e5979047ec75baa69e1186a47cc174d8a69;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
index 24157e597..6febd3d6c 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
+++ b/web/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 {
 }