Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / metatag / metatag_views / src / Form / MetatagViewsTranslationForm.php

diff --git a/web/modules/contrib/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php b/web/modules/contrib/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
index bdc88687e6ab8036a2648d7c42d76bb0b2b61f03..73a1df6a215c9fc06be6df3a3fa3704bdd5c2fa9 100644 (file)
--- a/web/modules/contrib/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
+++ b/web/modules/contrib/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
@@ -8,10 +8,9 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\metatag\MetatagManagerInterface;
 use Drupal\metatag\MetatagTagPluginManager;
 use Drupal\metatag\MetatagToken;
-use Drupal\metatag_views\MetatagViewsValuesCleanerTrait;
-use Drupal\views\ViewEntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\language\ConfigurableLanguageManagerInterface;
+use Drupal\metatag_views\MetatagViewsValuesCleanerTrait;
 
 /**
  * Class MetatagViewsEditForm.
@@ -41,19 +40,32 @@ class MetatagViewsTranslationForm extends FormBase {
    */
   protected $viewsManager;
 
+  /**
+   * @var \Drupal\metatag\MetatagToken
+   */
   protected $tokenService;
 
+  /**
+   * @var \Drupal\metatag\MetatagTagPluginManager
+   */
   protected $tagPluginManager;
 
   /**
-   * View entity object
+   * View entity object.
    *
    * @var \Drupal\views\ViewEntityInterface
    */
   protected $view;
 
-  protected $view_id;
-  protected $display_id = 'default';
+  /**
+   * @var string
+   */
+  protected $viewId;
+
+  /**
+   * @var string
+   */
+  protected $displayId = 'default';
 
   /**
    * The language of the translation.
@@ -69,7 +81,6 @@ class MetatagViewsTranslationForm extends FormBase {
    */
   protected $sourceLanguage;
 
-
   /**
    * An array of base language data.
    *
@@ -78,7 +89,7 @@ class MetatagViewsTranslationForm extends FormBase {
   protected $baseData = [];
 
   /**
-   * Constructor.
+   * {@inheritdoc}
    */
   public function __construct(MetatagManagerInterface $metatag_manager, EntityTypeManagerInterface $entity_manager, MetatagToken $token, MetatagTagPluginManager $tagPluginManager, ConfigurableLanguageManagerInterface $language_manager) {
     $this->metatagManager = $metatag_manager;
@@ -113,7 +124,7 @@ class MetatagViewsTranslationForm extends FormBase {
    */
   protected function prepareValues() {
     $config_name = $this->view->getConfigDependencyName();
-    $config_path = 'display.' . $this->display_id . '.display_options.display_extenders.metatag_display_extender.metatags';
+    $config_path = 'display.' . $this->displayId . '.display_options.display_extenders.metatag_display_extender.metatags';
 
     $configuration = \Drupal::service('config.factory')->get($config_name);
     $this->baseData = $configuration->getOriginal($config_path, FALSE);
@@ -137,21 +148,21 @@ class MetatagViewsTranslationForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Get the parameters from request.
-    $this->view_id = \Drupal::request()->get('view_id');
-    $this->display_id = \Drupal::request()->get('display_id');
+    $this->viewId = \Drupal::request()->get('view_id');
+    $this->displayId = \Drupal::request()->get('display_id');
     $langcode = \Drupal::request()->get('langcode');
 
-    $this->view = $this->viewsManager->load($this->view_id);
+    $this->view = $this->viewsManager->load($this->viewId);
     $this->language = $this->languageManager->getLanguage($langcode);
     $this->sourceLanguage = $this->view->language();
 
-    // Get metatags from the view entity.
+    // Get meta tags from the view entity.
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'config_translation/drupal.config_translation.admin';
 
     $form['#title'] = $this->t('Edit @language translation for %view: %display metatags', [
       '%view' => $this->view->label(),
-      '%display' => $this->view->getDisplay($this->display_id)['display_title'],
+      '%display' => $this->view->getDisplay($this->displayId)['display_title'],
       '@language' => $this->language->getName(),
     ]);
 
@@ -168,7 +179,7 @@ class MetatagViewsTranslationForm extends FormBase {
   }
 
   /**
-   * Add the translation form element for metatags available in the source.
+   * Add the translation form element for meta tags available in the source.
    */
   public function form(array $element, array $translated_values) {
     $translated_values = $this->clearMetatagViewsDisallowedValues($translated_values);
@@ -209,7 +220,7 @@ class MetatagViewsTranslationForm extends FormBase {
     $translated_values = array_combine(array_keys($values), array_column($values, 'translation'));
 
     $config_name = $this->view->getConfigDependencyName();
-    $config_path = 'display.' . $this->display_id . '.display_options.display_extenders.metatag_display_extender.metatags';
+    $config_path = 'display.' . $this->displayId . '.display_options.display_extenders.metatag_display_extender.metatags';
 
     // Set configuration values based on form submission and source values.
     $base_config = $this->configFactory()->getEditable($config_name);
@@ -236,8 +247,8 @@ class MetatagViewsTranslationForm extends FormBase {
 
     // Redirect back to the views list.
     $form_state->setRedirect('metatag_views.metatags.translate_overview', [
-      'view_id' => $this->view_id,
-      'display_id' => $this->display_id,
+      'view_id' => $this->viewId,
+      'display_id' => $this->displayId,
     ]);
 
     drupal_set_message($this->t('Successfully updated @language translation.', [