diff --git a/composer.json b/composer.json index 3736f61fbce41ab70cd780b78fd7ae1c8dca045f..73af302154a0cc256c29cf6235da53832679a92d 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "drupal/media_entity_twitter": "2.0-alpha2", "drupal/menu_block": "1.4", "drupal/menu_breadcrumb": "^1.7", - "drupal/metatag": "^1.7", + "drupal/metatag": "1.8", "drupal/migrate_devel": "1.x-dev", "drupal/migrate_plus": "4.0", "drupal/migrate_tools": "4.0", diff --git a/composer.lock b/composer.lock index 21cc15adf087bd31a5bff805bf98668b2a0700d9..3e53ce9f88e9af53c3eab7a14de5390ed3447649 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f610ca861b2413536928a19a8bdc73a9", + "content-hash": "0d2fa0dcb9c4d9c66c5e70f113f77084", "packages": [ { "name": "alchemy/zippy", @@ -4759,17 +4759,17 @@ }, { "name": "drupal/metatag", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://git.drupal.org/project/metatag", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "93decaefd053c524918ceae5b5ef05dd77de0857" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8" }, "require": { "drupal/core": "*", @@ -4791,8 +4791,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.7", - "datestamp": "1535726393", + "version": "8.x-1.8", + "datestamp": "1550692511", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4864,7 +4864,8 @@ "homepage": "https://www.drupal.org/project/migrate_devel", "support": { "source": "http://cgit.drupalcode.org/migrate_devel" - } + }, + "time": "2017-06-25T23:46:13+00:00" }, { "name": "drupal/migrate_plus", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 93a3dd808c608d6c96d9ea3879af7a01b7ad9194..5f58769ea303d8e0dacb4241773f7ce884aeae87 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -4906,18 +4906,18 @@ }, { "name": "drupal/metatag", - "version": "1.7.0", - "version_normalized": "1.7.0.0", + "version": "1.8.0", + "version_normalized": "1.8.0.0", "source": { "type": "git", "url": "https://git.drupal.org/project/metatag", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "93decaefd053c524918ceae5b5ef05dd77de0857" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8" }, "require": { "drupal/core": "*", @@ -4939,8 +4939,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.7", - "datestamp": "1535726393", + "version": "8.x-1.8", + "datestamp": "1550692511", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/web/modules/metatag/CHANGELOG.txt b/web/modules/metatag/CHANGELOG.txt index 512dc592738af3dcdcd54f0003c46610449deb3e..8955618d35b628ee58d969506ec24f17f6349b7c 100644 --- a/web/modules/metatag/CHANGELOG.txt +++ b/web/modules/metatag/CHANGELOG.txt @@ -1,3 +1,8 @@ +Metatag 8.x-1.8, 2019-02-20 +--------------------------- +By samuel.mortenson, Berdir, DamienMcKenna: Fix data property definition. + + Metatag 8.x-1.7, 2018-08-31 --------------------------- #2994979 by DamienMcKenna, dspachos, ynotpeanutbutter, oxy86, IT-Cru, kdeds, diff --git a/web/modules/metatag/metatag.info.yml b/web/modules/metatag/metatag.info.yml index 37efe692bb58460e9beb98a2ccf4614d4ad42f91..e92edaa59328a18a940ef839fc76bb55b141b489 100644 --- a/web/modules/metatag/metatag.info.yml +++ b/web/modules/metatag/metatag.info.yml @@ -13,8 +13,8 @@ test_dependencies: - restui:restui - schema_metatag:schema_web_page -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml index 0c438e82705aa78f9dfd0c5c53e66b95d1302d5f..1f79a53f00656a0715cf541571aed0d8910b52b6 100644 --- a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml +++ b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_dc/metatag_dc.info.yml b/web/modules/metatag/metatag_dc/metatag_dc.info.yml index 3123b511b6cbcd5aebf0fee3b5e57d1d18dfc797..33eaa6e0a3698677fd11ec4e29a66e7ad69cc5ac 100644 --- a/web/modules/metatag/metatag_dc/metatag_dc.info.yml +++ b/web/modules/metatag/metatag_dc/metatag_dc.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml index e9fc95e9ef7622d7a54bb9322f955a2d4a39355a..45c1213421bf15ab9b8b4f2243583c1509480a35 100644 --- a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml +++ b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_dc -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml index ed308edda68e689c7891114341f9ed811418e4c6..859e96f3dd9e62404c8bfbbfe8ab1f999347fb92 100644 --- a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml +++ b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml index af4b6caa61a0b2f01c6b8da04852725a1bfcb40c..5ebb9ac313389978f85fc086930d0322e8fe6223 100644 --- a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml +++ b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml index 7ae07312a54c0f0327efbfe8e9eb60ca2250210b..4246003b49ed49e961cffae0188980f1cd8ea36f 100644 --- a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml +++ b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml index 6a2dd43f168982869a69370ba8f5c7a8254fa930..da67659b7ca1b973f1a7678a48852315a6ee4af7 100644 --- a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml +++ b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml index fde674e1f59dfbaa1f389fad7d95f45726e7c2f2..1901aaed4243e747fcb7a477bd67216c5531e592 100644 --- a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml +++ b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml index fb1c833d5cb4d54556fc06057e1702887fdb42b2..da52a0823fd1945a4ebfef84cddec43556276d27 100644 --- a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml +++ b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml index 7755b893b4fc36a114054e8d4d4fb02f734e8d18..16ef28d0b97de1056dc26293c2fd330aa9932173 100644 --- a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml +++ b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml index 39090f3ba8fa809ad9d83d4eae69f706864ff451..2e7721e51d1f5f3f6d7a8ad5e078199caa8eb32a 100644 --- a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml +++ b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - metatag:metatag_open_graph -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml index c25fa9338cc1f01610ba9cb485739d4d08802650..4da08b5678510beeb01aed5815c6a12925b42e07 100644 --- a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml +++ b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml @@ -7,8 +7,8 @@ dependencies: - page_manager:page_manager - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml index 8364186799678976aec1a1a5cd14cfea94e762e4..3f91423255cabecedabdf29aee6b230b62b948f5 100644 --- a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml +++ b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml index 122e885cad39386076ad6b46dae69d2fdcae41a5..ba3461f194a3d9d7fe87edfe67e7a99726a5f793 100644 --- a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml +++ b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_verification/metatag_verification.info.yml b/web/modules/metatag/metatag_verification/metatag_verification.info.yml index 336c45f089ce858aa256607d37626fdc05aa3542..7d4b7e4c170cbfe2aa04222477638f3c649e395b 100644 --- a/web/modules/metatag/metatag_verification/metatag_verification.info.yml +++ b/web/modules/metatag/metatag_verification/metatag_verification.info.yml @@ -6,8 +6,8 @@ package: SEO dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/metatag_views/metatag_views.info.yml b/web/modules/metatag/metatag_views/metatag_views.info.yml index db451743ccd3580800464df41958bee268de8715..20bbe66bf74bb6713276b12290536e5c85fb328e 100644 --- a/web/modules/metatag/metatag_views/metatag_views.info.yml +++ b/web/modules/metatag/metatag_views/metatag_views.info.yml @@ -7,8 +7,8 @@ dependencies: - metatag:metatag - drupal:views -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/src/MetatagServiceProvider.php b/web/modules/metatag/src/MetatagServiceProvider.php index 811485a407bb83c2b362e6e975935e1f9fda387c..aa1ac3051b88fe454699db32f0aa77c27414f8b0 100644 --- a/web/modules/metatag/src/MetatagServiceProvider.php +++ b/web/modules/metatag/src/MetatagServiceProvider.php @@ -4,7 +4,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\DependencyInjection\ServiceProviderBase; -use Drupal\metatag\Normalizer\FieldItemNormalizer; use Drupal\metatag\Normalizer\MetatagHalNormalizer; use Drupal\metatag\Normalizer\MetatagNormalizer; use Symfony\Component\DependencyInjection\Definition; @@ -30,10 +29,6 @@ public function alter(ContainerBuilder $container) { $metatag_hal = new Definition(MetatagHalNormalizer::class); $metatag_hal->addTag('normalizer', ['priority' => 31]); $container->setDefinition('metatag.normalizer.metatag.hal', $metatag_hal); - - $metatag_field = new Definition(FieldItemNormalizer::class); - $metatag_field->addTag('normalizer', ['priority' => 30]); - $container->setDefinition('metatag.normalizer.metatag_field', $metatag_field); } } diff --git a/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php b/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php deleted file mode 100644 index c567750fe648e7e182c2ffc72bd591d5d7a14c08..0000000000000000000000000000000000000000 --- a/web/modules/metatag/src/Normalizer/FieldItemNormalizer.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php - -namespace Drupal\metatag\Normalizer; - -use Drupal\serialization\Normalizer\NormalizerBase; - -/** - * Converts the Metatag field item object structure to METATAG array structure. - */ -class FieldItemNormalizer extends NormalizerBase { - - /** - * {@inheritdoc} - */ - protected $supportedInterfaceOrClass = 'Drupal\metatag\Plugin\Field\FieldType\MetatagFieldItem'; - - /** - * {@inheritdoc} - */ - public function normalize($field_item, $format = NULL, array $context = []) { - $values = $field_item->getValue(); - - $normalized['value'] = unserialize($values['value']); - - return $normalized; - } - -} diff --git a/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php b/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php index 03c26361cd8a9890e3c345b0521718d8f7621128..4d0aff94e2bafa5777b25c2267700c1cb0038d85 100644 --- a/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php +++ b/web/modules/metatag/src/Normalizer/MetatagHalNormalizer.php @@ -19,7 +19,6 @@ public function normalize($field_item, $format = NULL, array $context = []) { $normalized = parent::normalize($field_item, $format, $context); // Mock the field array similar to the other fields. - // @see Drupal\hal\Normalizer\FieldItemNormalizer return [ 'metatag' => [$normalized], ]; diff --git a/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php b/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php index 1a6726a8040839f0dcc17790bef36581b7bc6ccc..5e23ffd7ce66aa776beb3753187144c1e1e9a983 100644 --- a/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php +++ b/web/modules/metatag/src/Plugin/Field/FieldType/MetatagFieldItem.php @@ -14,7 +14,10 @@ * label = @Translation("Meta tags"), * description = @Translation("This field stores code meta tags."), * default_widget = "metatag_firehose", - * default_formatter = "metatag_empty_formatter" + * default_formatter = "metatag_empty_formatter", + * serialized_property_names = { + * "value" + * } * ) */ class MetatagFieldItem extends FieldItemBase { diff --git a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml index dad9f064ab412b50eec5fd836f1980b07fdb9808..23c33ace198219e2d1f9441f30fc4892cafe5817 100644 --- a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml +++ b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387 diff --git a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml index 04a5a51c8f2618d74ad6eba08689e27f783bb7c4..ab69327c186f6480628184813c25376f13562552 100644 --- a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml +++ b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml @@ -6,8 +6,8 @@ package: Testing dependencies: - metatag:metatag -# Information added by Drupal.org packaging script on 2018-08-31 -version: '8.x-1.7' +# Information added by Drupal.org packaging script on 2019-02-20 +version: '8.x-1.8' core: '8.x' project: 'metatag' -datestamp: 1535726412 +datestamp: 1550683387