Commit 2b212d6b authored by catch's avatar catch
Browse files

Issue #3387827 by quietone: Fix change record link added in #3231341 

(cherry picked from commit 6efb70cd)
parent 574e31cf

core/.deprecation-ignore.txt

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 


# Skip deprecations for EditorMediaDialog, EditorImageDialog and EditorLinkDialog triggered by

# \Drupal\Core\Entity\EntityResolverManager::setRouteOptions().

%Drupal\\media\\Form\\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%

%Drupal\\editor\\Form\\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%

%Drupal\\editor\\Form\\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%

%Drupal\\media\\Form\\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%

%Drupal\\editor\\Form\\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%

%Drupal\\editor\\Form\\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%



# Symfony 7.

%Method "Symfony\\Contracts\\Service\\ResetInterface::reset\(\)" might add "void" as a native return type declaration in the future. Do the same in implementation "Drupal\\Component\\DependencyInjection\\Container" now to avoid errors or add an explicit @return annotation to suppress this message.%

core/modules/editor/src/Form/EditorImageDialog.php

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no

 * replacement.

 *

 * @see https://www.drupal.org/project/drupal/issues/3291493

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

 *

 * @internal

 */
@@ -40,7 +40,7 @@ class EditorImageDialog extends FormBase { 
   *   The file storage service.

   */

  public function __construct(EntityStorageInterface $file_storage) {

    @trigger_error(__NAMESPACE__ . '\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493', E_USER_DEPRECATED);

    @trigger_error(__NAMESPACE__ . '\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493', E_USER_DEPRECATED);

    $this->fileStorage = $file_storage;

  }

core/modules/editor/src/Form/EditorLinkDialog.php

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no

 * replacement.

 *

 * @see https://www.drupal.org/project/drupal/issues/3291493

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

 *

 * @internal

 */
@@ -26,7 +26,7 @@ class EditorLinkDialog extends FormBase { 
   * Constructs a form object for link dialog.

   */

  public function __construct() {

    @trigger_error(__NAMESPACE__ . '\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493', E_USER_DEPRECATED);

    @trigger_error(__NAMESPACE__ . '\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493', E_USER_DEPRECATED);

  }



  /**

core/modules/editor/tests/src/Kernel/EditorDeprecationTest.php

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class EditorDeprecationTest extends KernelTestBase { 
   * @see EditorLinkDialog

   */

  public function testEditorLinkDialog(): void {

    $this->expectDeprecation('Drupal\editor\Form\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493');

    $this->expectDeprecation('Drupal\editor\Form\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493');

    new EditorLinkDialog();

  }
@@ -35,7 +35,7 @@ public function testEditorLinkDialog(): void { 
   * @see EditorImageDialog

   */

  public function testEditorImageDialog(): void {

    $this->expectDeprecation('Drupal\editor\Form\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493');

    $this->expectDeprecation('Drupal\editor\Form\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493');

    new EditorImageDialog($this->createMock('\Drupal\file\FileStorage'));

  }

core/modules/media/src/Form/EditorMediaDialog.php

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 * @deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no

 * replacement.

 *

 * @see https://www.drupal.org/project/drupal/issues/3291493

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

 *

 * @internal

 *   This is an internal part of the media system in Drupal core and may be
@@ -58,7 +58,7 @@ class EditorMediaDialog extends FormBase { 
   *   The entity display repository.

   */

  public function __construct(EntityRepositoryInterface $entity_repository, EntityDisplayRepositoryInterface $entity_display_repository) {

    @trigger_error(__NAMESPACE__ . '\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493', E_USER_DEPRECATED);

    @trigger_error(__NAMESPACE__ . '\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493', E_USER_DEPRECATED);

    $this->entityRepository = $entity_repository;

    $this->entityDisplayRepository = $entity_display_repository;

  }