Commit 7d7a1a2b authored by Thalles Ferreira's avatar Thalles Ferreira Committed by Damien McKenna
Browse files

Issue #3113481 by thalles: Fix subclassing and stop overriding constructors in... 

Issue #3113481 by thalles: Fix subclassing and stop overriding constructors in metatag_views\Plugin\views\display_extender\MetatagDisplayExtender.
parent 4f4326be

CHANGELOG.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Metatag 8.x-1.x-dev, xxxx-xx-xx 
#3111900 by Hardik_Patel_12: Replace \Drupal calls with dependency injection in

  MetatagViewsTranslationController.

#3109835 by phenaproxima: Declare compatibility with Drupal 9.

#3113481 by thalles: Fix subclassing and stop overriding constructors in

  metatag_views\Plugin\views\display_extender\MetatagDisplayExtender.





Metatag 8.x-1.11, 2019-12-20

metatag_views/src/Plugin/views/display_extender/MetatagDisplayExtender.php

+6 −30
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
namespace Drupal\metatag_views\Plugin\views\display_extender;



use Drupal\Core\Form\FormStateInterface;

use Drupal\metatag\MetatagManagerInterface;

use Drupal\metatag\MetatagTagPluginManager;

use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase;

use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -36,38 +34,16 @@ class MetatagDisplayExtender extends DisplayExtenderPluginBase { 
   */

  protected $metatagTagManager;



  /**

   * Constructs the plugin.

   *

   * @param array $configuration

   *   A configuration array containing information about the plugin instance.

   * @param string $plugin_id

   *   The plugin_id for the plugin instance.

   * @param mixed $plugin_definition

   *   The plugin implementation definition.

   * @param \Drupal\metatag\MetatagTagPluginManager $metatag_plugin_manager

   *   The plugin manager for metatag tags.

   * @param \Drupal\metatag\MetatagManagerInterface $metatag_manager

   *   The metatag manager.

   */

  public function __construct(array $configuration, $plugin_id, $plugin_definition, MetatagTagPluginManager $metatag_plugin_manager, MetatagManagerInterface $metatag_manager) {

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



    $this->metatagTagManager = $metatag_plugin_manager;

    $this->metatagManager = $metatag_manager;

  }



  /**

   * {@inheritdoc}

   */

  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {

    return new static(

      $configuration,

      $plugin_id,

      $plugin_definition,

      $container->get('plugin.manager.metatag.tag'),

      $container->get('metatag.manager')

    );

    /** @var \Drupal\metatag_views\Plugin\views\display_extender\MetatagDisplayExtender */

    $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);

    $instance->metatagTagManager = $container->get('plugin.manager.metatag.tag');

    $instance->metatagManager = $container->get('metatag.manager');



    return $instance;

  }



  /**