Commit a3384c8f authored by Damien McKenna's avatar Damien McKenna Committed by Damien McKenna
Browse files

Issue #3305751 by DamienMcKenna: Fix coding standards issues.

parent 3c38e526

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Metatag 8.x-1.x-dev, 2022-xx-xx 
  unserializing the meta tag data.

#3309850 by DamienMcKenna: Skip token processing if there are no tokens in the

  value.

#3305751 by DamienMcKenna: Fix coding standards issues.





Metatag 8.x-1.21, 2022-07-16

metatag.install

+1 −0
Changes for metatag.install: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ function metatag_update_8109(&$sandbox) { 
        $bundle = $field->getTargetBundle();



        // Determine the table and "value" field names.

        // @todo The class path to getTableMapping() seems to be invalid?

        $table_mapping = Drupal::entityTypeManager()

          ->getStorage($field->getTargetEntityTypeId())

          ->getTableMapping();

metatag.module

+5 −51
Changes for metatag.module: 5 added lines, 51 removed lines.
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ function metatag_help($route_name, RouteMatchInterface $route_match) { 
 * Implements hook_form_FORM_ID_alter() for 'field_storage_config_edit_form'.

 */

function metatag_form_field_storage_config_edit_form_alter(&$form, FormStateInterface $form_state) {

  // @todo Does this actually work?

  if ($form_state->getFormObject()->getEntity()->getType() == 'metatag') {

    // Hide the cardinality field.

    $form['cardinality_container']['#access'] = FALSE;
@@ -84,6 +85,7 @@ function metatag_form_field_storage_config_edit_form_alter(&$form, FormStateInte 
 * any values to be saved.

 */

function metatag_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state) {

  // @todo Does this actually work?

  if ($form_state->getFormObject()->getEntity()->getType() == 'metatag') {

    // Hide the required and default value fields.

    $form['required']['#access'] = FALSE;
@@ -446,7 +448,7 @@ function metatag_preprocess_html(&$variables) { 
    return NULL;

  }



  $metatag_attachments = &drupal_static('metatag_attachments');

  $metatag_attachments = &drupal_static('metatag_attachments', NULL);

  if (is_null($metatag_attachments)) {

    $metatag_attachments = metatag_get_tags_from_route();

  }
@@ -531,12 +533,13 @@ function metatag_get_default_tags($entity = NULL) { 
  $global_metatag_manager = \Drupal::entityTypeManager()->getStorage('metatag_defaults');

  /** @var \Drupal\metatag\MetatagManager $metatag_manager */

  $metatag_manager = \Drupal::service('metatag.manager');

  /** @var \Drupal\Core\Language\LanguageManagerInterface */

  $language_manager = \Drupal::languageManager();



  // Load config based on language.

  $current_language = NULL;

  if ($entity !== NULL) {

    /** @var \Drupal\Core\Language\LanguageManagerInterface $language_manager */

    $language_manager = \Drupal::languageManager();

    $current_language = $language_manager->getConfigOverrideLanguage();

    $language_manager->setConfigOverrideLanguage($entity->language());

  }
@@ -615,55 +618,6 @@ function metatag_entity_base_field_info(EntityTypeInterface $entity_type) { 
  return $fields;

}



/**

 * Implements hook_entity_diff_options().

 */

function metatag_entity_diff_options($entity_type) {

  if (metatag_entity_supports_metatags($entity_type)) {

    $options = [

      'metatag' => new TranslatableMarkup('Metatags'),

    ];

    return $options;

  }

}



/**

 * Implements hook_entity_diff().

 */

function metatag_entity_diff($old_entity, $new_entity, $context) {

  $result = [];

  $entity_type = $context['entity_type'];

  $options = variable_get('diff_additional_options_' . $entity_type, []);

  if (!empty($options['metatag']) && metatag_entity_supports_metatags($entity_type)) {

    // Find meta tags that are set on either the new or old entity.

    $tags = [];

    foreach (['old' => $old_entity, 'new' => $new_entity] as $entity_key => $entity) {

      $language = metatag_entity_get_language($entity_type, $entity);

      if (isset($entity->metatags[$language])) {

        foreach ($entity->metatags[$language] as $key => $value) {

          $tags[$key][$entity_key] = $value['value'];

        }

      }

    }



    $init_weight = 100;

    foreach ($tags as $key => $values) {

      $id = ucwords('Meta ' . $key);

      // @todo Find the default values and show these if not set.

      $result[$id] = [

        '#name' => $id,

        '#old' => [empty($values['old']) ? '' : $values['old']],

        '#new' => [empty($values['new']) ? '' : $values['new']],

        '#weight' => $init_weight++,

        '#settings' => [

          'show_header' => TRUE,

        ],

      ];

    }

  }

  return $result;

}



/**

 * Turn the meta tags for an entity into a human readable structure.

 *

metatag.post_update.php

+1 −0
Changes for metatag.post_update.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ function metatag_post_update_convert_author_data(&$sandbox) { 
        $bundle = $field->getTargetBundle();



        // Determine the table and "value" field names.

        // @todo The class path to getTableMapping() seems to be invalid?

        $table_mapping = Drupal::entityTypeManager()

          ->getStorage($field->getTargetEntityTypeId())

          ->getTableMapping();

metatag.tokens.inc

+2 −2
Changes for metatag.tokens.inc: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ function metatag_tokens($type, $tokens, array $data, array $options, BubbleableM 


  switch ($type) {

    case 'current-page':

      /** @var \Drupal\token\TokenInterface $token_service */

      /** @var \Drupal\Core\Utility\Token $token_service */

      $token_service = \Drupal::token();

      $metatag_tokens = $token_service->findWithPrefix($tokens, 'metatag');

      if (!empty($metatag_tokens) && metatag_is_current_route_supported()) {
@@ -158,7 +158,7 @@ function metatag_tokens($type, $tokens, array $data, array $options, BubbleableM 
        }



        if (!empty($metatag_fields)) {

          /** @var \Drupal\token\TokenInterface $token_service */

          /** @var \Drupal\Core\Utility\Token $token_service */

          $token_service = \Drupal::token();

          $metatag_tokens = [];

          foreach ($metatag_fields as $metatag_field) {