Commit 2cdb3587 authored by Damien McKenna's avatar Damien McKenna Committed by Damien McKenna
Browse files

Issue #3329792 by DamienMcKenna, sahil.goyal, amanshukla6158: Drupal coding standards issues.

parent 124cf0ff

CHANGELOG.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Metatag 8.x-1.x-dev, 2022-xx-xx 
  metatags with Search API integration.

#3299222 by DamienMcKenna: Mobile tags are not overwriting core's tags as

  expected.

#3329792 by DamienMcKenna, sahil.goyal, amanshukla6158: Drupal Coding Standards

  Issues.





Metatag 8.x-1.22, 2022-09-29

metatag.module

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ function metatag_entity_base_field_info(EntityTypeInterface $entity_type) { 
 *

 * @deprecated in metatag:8.x-1.23 and is removed from metatag:2.0.0. Use metatag_generate_entity_all_tags() instead.

 *

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

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

 */

function metatag_generate_entity_metatags($entity) {

  return metatag_generate_entity_all_tags($entity);

metatag_favicons/src/Plugin/metatag/Tag/LinkSizesBase.php

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ abstract class LinkSizesBase extends LinkRelBase { 
   * @return string

   *   A string in the format "XxY" for a given width and height.

   *

   * @deprecated in 8.x-1.22 and removed in 2.0.0. Use iconSize() instead.

   * @deprecated in 8.x-1.22 and is removed from 2.0.0. Use iconSize() instead.

   *

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

   */

metatag_favicons/tests/src/Functional/MetatagFaviconsTagsTest.php

+14 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Drupal\Tests\metatag_favicons\Functional;



use Drupal\Tests\metatag\Functional\MetatagTagsTestBase;

use Drupal\metatag\Entity\MetatagDefaults;



/**

 * Tests that each of the Metatag Favicons tags work correctly.
@@ -12,7 +11,12 @@ use Drupal\metatag\Entity\MetatagDefaults; 
 */

class MetatagFaviconsTagsTest extends MetatagTagsTestBase {



  public function testTagsArePresent() {return;}

  /**

   * {@inheritdoc}

   */

  public function testTagsArePresent() {

  }



  /**

   * Confirm that each tag can be saved and that the output is correct.

   *
@@ -24,7 +28,12 @@ class MetatagFaviconsTagsTest extends MetatagTagsTestBase { 
   *

   * @dataProvider tagsInputOutputProvider

   */

  public function testTagsInputOutput($tag_name) {return;}

  public function testTagsInputOutput($tag_name) {

  }



  /**

   * {@inheritdoc}

   */

  public function tagsInputOutputProvider() {

    return [];

  }
@@ -288,6 +297,7 @@ class MetatagFaviconsTagsTest extends MetatagTagsTestBase { 
   */

  public function testMaskIconLegacy() {

    $this->loginUser1();



    // Add a metatag field to the entity type test_entity.

    $this->createContentType(['type' => 'page']);

    $this->drupalGet('admin/structure/types/manage/page/fields/add-field');

metatag_views/metatag_views.module

+2 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 */



use Drupal\Core\Routing\RouteMatchInterface;

use Drupal\metatag_views\MetatagViewsCacheWrapper;

use Drupal\metatag_views\Plugin\views\display_extender\MetatagDisplayExtender;

use Drupal\views\Plugin\views\cache\CachePluginBase;

use Drupal\views\ViewEntityInterface;
@@ -25,7 +24,7 @@ use Drupal\views\Views; 
 * @return array|null

 *   The meta tags if set, null otherwise.

 */

function metatag_get_view_tags($view, $display_id = NULL, $args = []) {

function metatag_views_get_view_tags($view, $display_id = NULL, $args = []) {

  if (empty($view)) {

    return;

  }
@@ -84,7 +83,7 @@ function metatag_views_metatags_alter(array &$metatags, array &$context) { 
  }



  // Apply view overrides.

  if ($tags = metatag_get_view_tags($view, $display_id, $args)) {

  if ($tags = metatag_views_get_view_tags($view, $display_id, $args)) {

    $metatags = array_merge($metatags, $tags);

  }

}