Commit 02a261ea authored by catch's avatar catch
Browse files

Issue #3258014 by alexpott: Fix plugin deprecations 

(cherry picked from commit c5bd67a8)
parent 0c3e9feb

core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php

+10 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


namespace Drupal\migrate_drupal\Plugin\migrate\field;



@trigger_error('The ' . __NAMESPACE__ . '\NodeReference is deprecated in drupal:9.1.0 and will be removed from drupal:10.0.0. Instead use \Drupal\migrate_drupal\Plugin\migrate\field\d6\NodeReference. See https://www.drupal.org/node/3159537.', E_USER_DEPRECATED);



use Drupal\migrate_drupal\Plugin\migrate\field\d6\NodeReference as NonLegacyNodeReference;



/**
@@ -13,4 +11,14 @@ 
 * @see https://www.drupal.org/node/3159537

 */

class NodeReference extends NonLegacyNodeReference {



  /**

   * {@inheritdoc}

   */

  public function __construct(array $configuration, $plugin_id, $plugin_definition) {

    @trigger_error('The ' . __NAMESPACE__ . '\NodeReference is deprecated in drupal:9.1.0 and will be removed from drupal:10.0.0. Instead use \Drupal\migrate_drupal\Plugin\migrate\field\d6\NodeReference. See https://www.drupal.org/node/3159537.', E_USER_DEPRECATED);



    parent::__construct($configuration, $plugin_id, $plugin_definition);

  }



}

core/modules/taxonomy/src/Plugin/views/argument_validator/Term.php

+11 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


namespace Drupal\taxonomy\Plugin\views\argument_validator;



@trigger_error('The ' . __NAMESPACE__ . '\Term is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use \Drupal\views\Plugin\views\argument_validator\Entity instead. See https://www.drupal.org/node/3221870', E_USER_DEPRECATED);



use Drupal\Core\Entity\EntityTypeBundleInfoInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\views\Plugin\views\argument_validator\Entity;



/**
@@ -16,4 +16,13 @@ 
 */

class Term extends Entity {



  /**

   * {@inheritdoc}

   */

  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info) {

    @trigger_error('The ' . __NAMESPACE__ . '\Term is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use \Drupal\views\Plugin\views\argument_validator\Entity instead. See https://www.drupal.org/node/3221870', E_USER_DEPRECATED);



    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_type_bundle_info);

  }



}