From e0c17813f8b037178a2623bdf534215eb0ef62d9 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 18 May 2020 18:55:19 -0500 Subject: [PATCH] Issue #3137455 by sja112, mondrake, longwave: AssertLegacyTrait - change links in @trigger_error deprecations to point the relevant change record --- .../Drupal/FunctionalTests/AssertLegacyTrait.php | 16 ++++++++-------- .../FunctionalTests/BrowserTestBaseTest.php | 2 +- .../Test/AssertLegacyTraitDeprecatedTest.php | 2 +- .../Tests/Core/Assert/AssertLegacyTraitTest.php | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php index aed232f785..8115a13172 100644 --- a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php +++ b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php @@ -697,10 +697,10 @@ protected function assertPattern($pattern) { * Deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use * $this->assertSession()->responseNotMatches() instead. * - * @see https://www.drupal.org/node/2864262 + * @see https://www.drupal.org/node/3129738 */ protected function assertNoPattern($pattern) { - @trigger_error('AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/2864262', E_USER_DEPRECATED); + @trigger_error('AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED); $this->assertSession()->responseNotMatches($pattern); } @@ -726,10 +726,10 @@ protected function assertCacheTag($expected_cache_tag) { * Deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use * $this->assertSession()->responseHeaderNotContains() instead. * - * @see https://www.drupal.org/node/2864029 + * @see https://www.drupal.org/node/3129738 */ protected function assertNoCacheTag($cache_tag) { - @trigger_error('AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/2864029', E_USER_DEPRECATED); + @trigger_error('AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED); $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', $cache_tag); } @@ -811,10 +811,10 @@ protected function constructFieldXpath($attribute, $value) { * Deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use * $this->getSession()->getPage()->getContent() instead. * - * @see http://drupal.org/node/2735045 + * @see https://www.drupal.org/node/3129738 */ protected function getRawContent() { - @trigger_error('AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See http://drupal.org/node/2735045', E_USER_DEPRECATED); + @trigger_error('AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED); return $this->getSession()->getPage()->getContent(); } @@ -830,10 +830,10 @@ protected function getRawContent() { * Deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use * $element->findAll('xpath', 'option') instead. * - * @see http://drupal.org/node/2735045 + * @see https://www.drupal.org/node/3129738 */ protected function getAllOptions(NodeElement $element) { - @trigger_error('AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll(\'xpath\', \'option\') instead. See http://drupal.org/node/2735045', E_USER_DEPRECATED); + @trigger_error('AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll(\'xpath\', \'option\') instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED); return $element->findAll('xpath', '//option'); } diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php index 5bf2f49eba..44da45ec36 100644 --- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php +++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php @@ -253,7 +253,7 @@ public function testTextAsserts() { * Tests legacy getRawContent(). * * @group legacy - * @expectedDeprecation AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See http://drupal.org/node/2735045 + * @expectedDeprecation AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See https://www.drupal.org/node/3129738 */ public function testGetRawContent() { $this->drupalGet('test-encoded'); diff --git a/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php b/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php index 8bcacec7a7..f01b8ccc1f 100644 --- a/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php +++ b/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php @@ -27,7 +27,7 @@ class AssertLegacyTraitDeprecatedTest extends BrowserTestBase { /** * Tests getAllOptions(). * - * @expectedDeprecation AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll('xpath', 'option') instead. See http://drupal.org/node/2735045 + * @expectedDeprecation AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll('xpath', 'option') instead. See https://www.drupal.org/node/3129738 */ public function testGetAllOptions() { $this->drupalGet('/form-test/select'); diff --git a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php index 2785c67d5e..10c61be2fb 100644 --- a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php +++ b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php @@ -156,7 +156,7 @@ public function testAssertOptionSelectedFail() { /** * @covers ::assertNoPattern - * @expectedDeprecation AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/2864262 + * @expectedDeprecation AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/3129738 */ public function testAssertNoPattern() { $this->webAssert @@ -168,7 +168,7 @@ public function testAssertNoPattern() { /** * @covers ::assertNoCacheTag - * @expectedDeprecation AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/2864029 + * @expectedDeprecation AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/3129738 */ public function testAssertNoCacheTag() { $this->webAssert -- GitLab