Unverified Commit a1ff9307 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3120901 by longwave, Kristen Pol: Update deprecations from 8.8.4 to 8.8.5

parent 6a830362

core/includes/update.inc

+2 −2
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
/**

 * Disables any extensions that are incompatible with the current core version.

 *

 * @deprecated in Drupal 8.8.4 and is removed from Drupal 9.0.0.

 * @deprecated in Drupal 8.8.5 and is removed from Drupal 9.0.0.

 *

 * @see https://www.drupal.org/node/3026100

 */

function update_fix_compatibility() {

  @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);

  // Fix extension objects if the update is being done via Drush 8. In non-Drush

  // environments this will already be fixed by the UpdateKernel this point.

  UpdateKernel::fixSerializedExtensionObjects(\Drupal::getContainer());

core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ protected function setUp() { 
  }



  /**

   * @expectedDeprecation update_fix_compatibility() 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

   * @expectedDeprecation update_fix_compatibility() 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

   */

  public function testFixCompatibility() {

    $extension_config = \Drupal::configFactory()->getEditable('core.extension');

core/tests/Drupal/Tests/ExpectDeprecationTest.php

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public function testExpectDeprecationInIsolation() { 
   * @see https://github.com/symfony/symfony/pull/25757

   */

  public function testDeprecatedExpectDeprecation() {

    $this->addExpectedDeprecationMessage('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024');

    $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');

    $this->expectDeprecation('Test deprecated expectDeprecation');

    @trigger_error('Test deprecated expectDeprecation', E_USER_DEPRECATED);

  }

core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php

+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ protected function addExpectedDeprecationMessage($message) { 
   * @param string $message

   *   The expected deprecation message.

   *

   * @deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use

   * @deprecated in drupal:8.8.5 and is removed from drupal:9.0.0. Use

   *   ::addExpectedDeprecationMessage() instead.

   *

   * @see https://www.drupal.org/node/3106024

   */

  protected function expectDeprecation($message) {

    if (strpos($message, 'ExpectDeprecationTrait::expectDeprecation') === FALSE) {

      @trigger_error('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024', E_USER_DEPRECATED);

      @trigger_error('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', E_USER_DEPRECATED);

    }

    $this->addExpectedDeprecationMessage($message);

  }