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 / Comment / CommentHalJsonTestBase.php

diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
index 3deb0eaba50ba14cd9cdf4a28321f2f93d028e0b..648ab6deb65f3b6eaa5d34dc7ca8ee7bca4fa112 100644 (file)
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
+++ b/web/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 {
 }