Problem/Motivation

We added a few deprecations that were expected to be included in 8.8.4, but 8.8.4 was a security release and so these will be included in 8.8.5 instead.

Proposed resolution

Replace references to 8.8.4 with 8.8.5

Remaining tasks

Patch, review, commit

User interface changes

None

API changes

None

Data model changes

None

Release notes snippet

CommentFileSizeAuthor
#2 3120901.patch4.39 KBlongwave
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

longwave created an issue. See original summary.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave at Full Fat Things commented
Status: Active » Needs review
FileSize
3120901.patch4.39 KB
Kristen Pol’s picture

Kristen Pol
she/her
Primary language English
Location Santa Cruz, CA, USA
CreditAttribution: Kristen Pol at Hook 42 commented
Assigned: Unassigned » Kristen Pol
Kristen Pol’s picture

Kristen Pol
she/her
Primary language English
Location Santa Cruz, CA, USA
CreditAttribution: Kristen Pol at Hook 42 commented
Assigned: Kristen Pol » Unassigned
Status: Needs review » Reviewed & tested by the community

Thanks for the patch.

1) The change records show 8.8.4 so I assume those have to updated as well, yes?

  • +++ b/core/includes/update.inc
@@ -15,12 +15,12 @@
-  @trigger_error(__FUNCTION__ . '() is deprecated in Drupal 8.8.4 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100', E_USER_DEPRECATED);
+  @trigger_error(__FUNCTION__ . '() is deprecated in Drupal 8.8.5 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100', E_USER_DEPRECATED);

    Change record shows 8.8.4:

    https://www.drupal.org/node/3026100

  • +++ b/core/tests/Drupal/Tests/ExpectDeprecationTest.php
@@ -41,7 +41,7 @@ public function testExpectDeprecationInIsolation() {
+    $this->addExpectedDeprecationMessage('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.5 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024');

    Change record shows 8.8.4:

    https://www.drupal.org/node/3106024

2) Patch applied cleanly:

[mac:kristen:drupal-8.8.x-dev]$ patch -p1 < 3120901.patch 
patching file core/includes/update.inc
patching file core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
patching file core/tests/Drupal/Tests/ExpectDeprecationTest.php
patching file core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php

3) Searching for "drupal:8.8.4" in the 8.8 dev codebase after applying the patch found no results.

4) Checked out 8.8.4 tag and confirmed that the deprecation code was not there, and checked out 8.8.5 tag and confirmed it was there.

5) RTBC'ing this but not sure if the change records need to be addressed first.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott at Acro Commerce, Thunder commented
Status: Reviewed & tested by the community » Fixed

Thanks @longwave it's good to get this correct.

Committed and pushed a1ff93071e to 8.9.x and db317cfb22 to 8.8.x. Thanks!

  • alexpott committed a1ff930 on 8.9.x 
    Issue #3120901 by longwave, Kristen Pol: Update deprecations from 8.8.4...

  • alexpott committed db317cf on 8.8.x 
    Issue #3120901 by longwave, Kristen Pol: Update deprecations from 8.8.4...
Kristen Pol’s picture

Kristen Pol
she/her
Primary language English
Location Santa Cruz, CA, USA
CreditAttribution: Kristen Pol at Hook 42 commented

Should I update the change records?

NEVERMIND, I see they were updated. Sorry for the noise.

alexpott’s picture

alexpott
he/they
Primary language English
Location 🇪🇺🌍
CreditAttribution: alexpott at Acro Commerce, Thunder commented

Ah I posted

I updated the CRs - nice spot @Kristen Pol

last night but I xposted with the commit message bot :(

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.