.../path/src/Plugin/Field/FieldType/PathFieldItemList.php | 9 --------- .../Functional/EntityResource/Node/NodeResourceTestBase.php | 12 ------------ .../Functional/EntityResource/Term/TermResourceTestBase.php | 7 ------- 3 files changed, 28 deletions(-) diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php index 430adec..a98e718 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php @@ -4,7 +4,6 @@ use Drupal\Core\Access\AccessResult; use Drupal\Core\Field\FieldItemList; -use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Session\AccountInterface; /** @@ -73,12 +72,4 @@ protected function ensureLoaded() { } } - /** - * {@inheritdoc} - */ - public function equals(FieldItemListInterface $list_to_compare) { - $this->ensureLoaded(); - return parent::equals($list_to_compare); - } - } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php index 8474aaf..bf0ba7a 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php @@ -235,18 +235,6 @@ public function testPatchPath() { $response = $this->request('GET', $url, $this->getAuthenticationRequestOptions('GET')); $normalization = $this->serializer->decode((string) $response->getBody(), static::$format); - // @todo In https://www.drupal.org/node/2824851, we will be able to stop - // unsetting these fields from the normalization, because - // EntityResource::patch() will ignore any fields that are sent that - // match the current value (and obviously we're sending the current - // value). - unset($normalization['revision_timestamp']); - unset($normalization['revision_uid']); - unset($normalization['created']); - unset($normalization['changed']); - unset($normalization['promote']); - unset($normalization['sticky']); - // Change node's path alias. $normalization['path'][0]['alias'] .= 's-rule-the-world'; diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php index 4516385..758842c 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php @@ -205,13 +205,6 @@ public function testPatchPath() { $response = $this->request('GET', $url, $this->getAuthenticationRequestOptions('GET')); $normalization = $this->serializer->decode((string) $response->getBody(), static::$format); - // @todo In https://www.drupal.org/node/2824851, we will be able to stop - // unsetting these fields from the normalization, because - // EntityResource::patch() will ignore any fields that are sent that - // match the current value (and obviously we're sending the current - // value). - unset($normalization['changed']); - // Change term's path alias. $normalization['path'][0]['alias'] .= 's-rule-the-world';