diff --git a/composer.json b/composer.json
index a5f42a493c9d3a9083f9e1d0203db2f8bbcfd689..fcdc5f8e2e4f5155ce7c241c553b77c199ccb29f 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
"dimsemenov/magnific-popup": "1.1",
"drupal-composer/drupal-scaffold": "2.5.4",
"drupal/address": "1.1",
- "drupal/addtocalendar": "3.1",
+ "drupal/addtocalendar": "3.2",
"drupal/admin_toolbar": "2.2",
"drupal/administerusersbyrole": "3.0",
"drupal/allowed_formats": "1.2",
@@ -159,7 +159,7 @@
"drupal/scheduler": "1.1",
"drupal/search_api": "1.1",
"drupal/search_api_db": "1.1",
- "drupal/simple_gmap": "2.0",
+ "drupal/simple_gmap": "3.0",
"drupal/simple_megamenu": "1.0-beta3",
"drupal/simple_sitemap": "3.6",
"drupal/simplesamlphp_auth": "3.1",
@@ -167,12 +167,12 @@
"drupal/social_media": "1.8",
"drupal/social_media_links": "2.6",
"drupal/superfish": "1.2",
- "drupal/svg_image": "1.13",
+ "drupal/svg_image": "1.14",
"drupal/token": "1.5",
"drupal/twig_tweak": "2.5",
"drupal/twitter_block": "3.0-alpha0",
"drupal/userprotect": "1.0",
- "drupal/video_embed_field": "2.3",
+ "drupal/video_embed_field": "2.4",
"drupal/view_unpublished": "1.0-alpha1",
"drupal/views_accordion": "1.1",
"drupal/views_ajax_history": "1.2",
diff --git a/composer.lock b/composer.lock
index b2df2fd7c7a063c7ddddf8d2da916b1728baad2d..6a9667cf32dca3765254ebcd1b3cf7d91daa9389 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "807a55f9c8496dc8ac9059ce43ee7a4f",
+ "content-hash": "f108b03d13affee27b523a0310a3f20f",
"packages": [
{
"name": "alchemy/zippy",
@@ -2047,29 +2047,26 @@
},
{
"name": "drupal/addtocalendar",
- "version": "3.1.0",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/addtocalendar.git",
- "reference": "8.x-3.1"
+ "reference": "8.x-3.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/addtocalendar-8.x-3.1.zip",
- "reference": "8.x-3.1",
- "shasum": "c384df6017790173908ee7566e2af22ab5234b9d"
+ "url": "https://ftp.drupal.org/files/projects/addtocalendar-8.x-3.2.zip",
+ "reference": "8.x-3.2",
+ "shasum": "b739326d98008f4091f71e0d5d21b5baa93a5dec"
},
"require": {
- "drupal/core": "*"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-3.x": "3.x-dev"
- },
"drupal": {
- "version": "8.x-3.1",
- "datestamp": "1511952790",
+ "version": "8.x-3.2",
+ "datestamp": "1591246880",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2112,7 +2109,7 @@
"description": "Add to calendar button to be used for event page.",
"homepage": "https://www.drupal.org/project/addtocalendar",
"support": {
- "source": "http://cgit.drupalcode.org/addtocalendar"
+ "source": "https://git.drupalcode.org/project/addtocalendar"
}
},
{
@@ -7139,17 +7136,17 @@
},
{
"name": "drupal/simple_gmap",
- "version": "2.0.0",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/simple_gmap.git",
- "reference": "8.x-2.0"
+ "reference": "3.0.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/simple_gmap-8.x-2.0.zip",
- "reference": "8.x-2.0",
- "shasum": "d218842c311795cded1a75bc93595e95a9e5d701"
+ "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.0.zip",
+ "reference": "3.0.0",
+ "shasum": "ad74aaec5a1eec64cc72a8d4a272564c53ee7594"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -7159,12 +7156,9 @@
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- },
"drupal": {
- "version": "8.x-2.0",
- "datestamp": "1579517588",
+ "version": "3.0.0",
+ "datestamp": "1591439940",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7589,30 +7583,27 @@
},
{
"name": "drupal/svg_image",
- "version": "1.13.0",
+ "version": "1.14.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/svg_image.git",
- "reference": "8.x-1.13"
+ "reference": "8.x-1.14"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.13.zip",
- "reference": "8.x-1.13",
- "shasum": "3b60ab47802bfaa046da54d7179e47889b41a845"
+ "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.14.zip",
+ "reference": "8.x-1.14",
+ "shasum": "0a6ca8104995a8cf4a1fff3e9e04e1fecf734b11"
},
"require": {
- "drupal/core": "*",
+ "drupal/core": "^8 || ^9",
"enshrined/svg-sanitize": ">=0.9 <1.0"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.13",
- "datestamp": "1585379082",
+ "version": "8.x-1.14",
+ "datestamp": "1591251834",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7884,35 +7875,30 @@
},
{
"name": "drupal/video_embed_field",
- "version": "2.3.0",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/video_embed_field.git",
- "reference": "8.x-2.3"
+ "reference": "8.x-2.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.3.zip",
- "reference": "8.x-2.3",
- "shasum": "d9b4b3bde48edf49d1aa038aae6736496558caf4"
+ "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.4.zip",
+ "reference": "8.x-2.4",
+ "shasum": "96b14bb93c1bb6a07b84315a4f87367870f8b574"
},
"require": {
"drupal/core": "^8.8 || ^9"
},
"require-dev": {
"drupal/colorbox": "^1.0",
- "drupal/media_entity": "*",
- "drupal/media_entity_embeddable_video": "*",
"drupal/video_embed_media": "*"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- },
"drupal": {
- "version": "8.x-2.3",
- "datestamp": "1584489966",
+ "version": "8.x-2.4",
+ "datestamp": "1587686284",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index abf2dd8aa33345b0353093f0a1edf4a78a6e2398..bcbbfd79f6484783955494128a8e0244f5c0478f 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2110,30 +2110,27 @@
},
{
"name": "drupal/addtocalendar",
- "version": "3.1.0",
- "version_normalized": "3.1.0.0",
+ "version": "3.2.0",
+ "version_normalized": "3.2.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/addtocalendar.git",
- "reference": "8.x-3.1"
+ "reference": "8.x-3.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/addtocalendar-8.x-3.1.zip",
- "reference": "8.x-3.1",
- "shasum": "c384df6017790173908ee7566e2af22ab5234b9d"
+ "url": "https://ftp.drupal.org/files/projects/addtocalendar-8.x-3.2.zip",
+ "reference": "8.x-3.2",
+ "shasum": "b739326d98008f4091f71e0d5d21b5baa93a5dec"
},
"require": {
- "drupal/core": "*"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-3.x": "3.x-dev"
- },
"drupal": {
- "version": "8.x-3.1",
- "datestamp": "1511952790",
+ "version": "8.x-3.2",
+ "datestamp": "1591246880",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2177,7 +2174,7 @@
"description": "Add to calendar button to be used for event page.",
"homepage": "https://www.drupal.org/project/addtocalendar",
"support": {
- "source": "http://cgit.drupalcode.org/addtocalendar"
+ "source": "https://git.drupalcode.org/project/addtocalendar"
}
},
{
@@ -7357,18 +7354,18 @@
},
{
"name": "drupal/simple_gmap",
- "version": "2.0.0",
- "version_normalized": "2.0.0.0",
+ "version": "3.0.0",
+ "version_normalized": "3.0.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/simple_gmap.git",
- "reference": "8.x-2.0"
+ "reference": "3.0.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/simple_gmap-8.x-2.0.zip",
- "reference": "8.x-2.0",
- "shasum": "d218842c311795cded1a75bc93595e95a9e5d701"
+ "url": "https://ftp.drupal.org/files/projects/simple_gmap-3.0.0.zip",
+ "reference": "3.0.0",
+ "shasum": "ad74aaec5a1eec64cc72a8d4a272564c53ee7594"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -7378,12 +7375,9 @@
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- },
"drupal": {
- "version": "8.x-2.0",
- "datestamp": "1579517588",
+ "version": "3.0.0",
+ "datestamp": "1591439940",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7823,31 +7817,28 @@
},
{
"name": "drupal/svg_image",
- "version": "1.13.0",
- "version_normalized": "1.13.0.0",
+ "version": "1.14.0",
+ "version_normalized": "1.14.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/svg_image.git",
- "reference": "8.x-1.13"
+ "reference": "8.x-1.14"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.13.zip",
- "reference": "8.x-1.13",
- "shasum": "3b60ab47802bfaa046da54d7179e47889b41a845"
+ "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.14.zip",
+ "reference": "8.x-1.14",
+ "shasum": "0a6ca8104995a8cf4a1fff3e9e04e1fecf734b11"
},
"require": {
- "drupal/core": "*",
+ "drupal/core": "^8 || ^9",
"enshrined/svg-sanitize": ">=0.9 <1.0"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.13",
- "datestamp": "1585379082",
+ "version": "8.x-1.14",
+ "datestamp": "1591251834",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8128,36 +8119,31 @@
},
{
"name": "drupal/video_embed_field",
- "version": "2.3.0",
- "version_normalized": "2.3.0.0",
+ "version": "2.4.0",
+ "version_normalized": "2.4.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/video_embed_field.git",
- "reference": "8.x-2.3"
+ "reference": "8.x-2.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.3.zip",
- "reference": "8.x-2.3",
- "shasum": "d9b4b3bde48edf49d1aa038aae6736496558caf4"
+ "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.4.zip",
+ "reference": "8.x-2.4",
+ "shasum": "96b14bb93c1bb6a07b84315a4f87367870f8b574"
},
"require": {
"drupal/core": "^8.8 || ^9"
},
"require-dev": {
"drupal/colorbox": "^1.0",
- "drupal/media_entity": "*",
- "drupal/media_entity_embeddable_video": "*",
"drupal/video_embed_media": "*"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- },
"drupal": {
- "version": "8.x-2.3",
- "datestamp": "1584489966",
+ "version": "8.x-2.4",
+ "datestamp": "1587686284",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/web/modules/addtocalendar/addtocalendar.info.yml b/web/modules/addtocalendar/addtocalendar.info.yml
index b55c03665c3cc88aac86a72bca3e45593c6efaca..4e787fcecfef405a729655d9a9d829c93039dcde 100644
--- a/web/modules/addtocalendar/addtocalendar.info.yml
+++ b/web/modules/addtocalendar/addtocalendar.info.yml
@@ -2,12 +2,12 @@ name: Add To Calendar
type: module
description: 'Add to calendar button to be used for event page.'
# version: VERSION
-# core: 8.x
+core: 8.x
+core_version_requirement: ^8 || ^9
dependencies:
- - datetime
+ - drupal:datetime
-# Information added by Drupal.org packaging script on 2017-11-29
-version: '8.x-3.1'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-06-04
+version: '8.x-3.2'
project: 'addtocalendar'
-datestamp: 1511952793
+datestamp: 1591246882
diff --git a/web/modules/addtocalendar/addtocalendar.libraries.yml b/web/modules/addtocalendar/addtocalendar.libraries.yml
index e57d6ea544c12c31c23d29ee11271df0e460b5eb..476bcc27edaaa541d9e8c0b54b23e6ac7d97c79e 100644
--- a/web/modules/addtocalendar/addtocalendar.libraries.yml
+++ b/web/modules/addtocalendar/addtocalendar.libraries.yml
@@ -4,6 +4,7 @@ base:
'//addtocalendar.com/atc/1.5/atc-base.css': {type: external}
js:
'//addtocalendar.com/atc/1.5/atc.min.js': { type: external, minified: true }
+ 'js/addtocalendar.js': {}
glow_orange:
css:
diff --git a/web/modules/addtocalendar/addtocalendar.services.yml b/web/modules/addtocalendar/addtocalendar.services.yml
index 07f2a302dec487eed7a39d123b4aab61c2df072c..ca410e290b846ff2bbe3b7c5c51873bcdb07f5d7 100644
--- a/web/modules/addtocalendar/addtocalendar.services.yml
+++ b/web/modules/addtocalendar/addtocalendar.services.yml
@@ -1,5 +1,5 @@
services:
addtocalendar.apiwidget:
class: Drupal\addtocalendar\AddToCalendarApiWidget
- arguments: []
+ arguments: ['@config.factory']
diff --git a/web/modules/addtocalendar/includes/addtocalendar.build.inc b/web/modules/addtocalendar/includes/addtocalendar.build.inc
index f178a6356ba3bf76943a209ec1441949a16cf15a..7ff78a5a946216f397bb197704f0388962f48ddc 100644
--- a/web/modules/addtocalendar/includes/addtocalendar.build.inc
+++ b/web/modules/addtocalendar/includes/addtocalendar.build.inc
@@ -108,7 +108,8 @@ function _addtocalendar_preprocess_field(&$variables) {
$class_value = strip_tags($entity->{$field}->end_value);
}
else {
- $class_value = strip_tags(render($entity->get($field)->view(['label' => 'hidden'])));
+ $view = $entity->get($field)->view(['label' => 'hidden']);
+ $class_value = strip_tags(render($view));
}
break;
}
diff --git a/web/modules/addtocalendar/includes/addtocalendar.form.inc b/web/modules/addtocalendar/includes/addtocalendar.form.inc
index 36e5cf3ea5a9055920e18960da8f3982104def05..c4c578896eef2127a84dd62eacc86e247e386632 100644
--- a/web/modules/addtocalendar/includes/addtocalendar.form.inc
+++ b/web/modules/addtocalendar/includes/addtocalendar.form.inc
@@ -42,7 +42,7 @@ function _addtocalendar_build_form($settings, $field_definition) {
'blue' => t('Blue'),
'glow_orange' => t('Glow Orange'),
],
- '#default_value' => !empty($settings['addtocalendar_settings']['style']) ? $settings['addtocalendar_settings']['style'] : 'blue',
+ '#default_value' => !empty($settings['addtocalendar_settings']['style']) ? $settings['addtocalendar_settings']['style'] : 0,
];
$element['addtocalendar_settings']['display_text'] = [
diff --git a/web/modules/addtocalendar/js/addtocalendar.js b/web/modules/addtocalendar/js/addtocalendar.js
new file mode 100644
index 0000000000000000000000000000000000000000..2023c8fb7bee1becbba5310fa1f4af58a60c7219
--- /dev/null
+++ b/web/modules/addtocalendar/js/addtocalendar.js
@@ -0,0 +1,11 @@
+(function ($) {
+
+ 'use strict';
+
+ Drupal.behaviors.addtocalendar = {
+ attach: function (context, settings) {
+ addtocalendar.load();
+ }
+ };
+
+})(jQuery);
diff --git a/web/modules/addtocalendar/src/AddToCalendarApiWidget.php b/web/modules/addtocalendar/src/AddToCalendarApiWidget.php
index 1807ea72aa2828f2621fd56c7d6a43ddebb58ba0..e7b8997315d26da771af5b1fbeb758a4a2468978 100644
--- a/web/modules/addtocalendar/src/AddToCalendarApiWidget.php
+++ b/web/modules/addtocalendar/src/AddToCalendarApiWidget.php
@@ -2,6 +2,7 @@
namespace Drupal\addtocalendar;
+use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Datetime\DrupalDateTime;
/**
@@ -14,17 +15,96 @@ class AddToCalendarApiWidget {
*
* @var string
*/
+
+ /**
+ * The config factory service.
+ *
+ * @var \Drupal\Core\Config\ConfigFactoryInterface
+ */
+ protected $configFactory;
+
+ /**
+ * Style.
+ *
+ * @var string
+ */
protected $atcStyle;
+
+ /**
+ * DisplayText.
+ *
+ * @var string
+ */
protected $atcDisplayText;
+
+ /**
+ * Title.
+ *
+ * @var string
+ */
protected $atcTitle;
+
+ /**
+ * Description.
+ *
+ * @var string
+ */
protected $atcDescription;
+
+ /**
+ * Location.
+ *
+ * @var string
+ */
protected $atcLocation;
+
+ /**
+ * Organizer.
+ *
+ * @var string
+ */
protected $atcOrganizer;
+
+ /**
+ * Orangizer Email.
+ *
+ * @var string
+ */
protected $atcOrganizerEmail;
+
+ /**
+ * Start Date.
+ *
+ * @var string
+ */
protected $atcDateStart;
+
+ /**
+ * End Date.
+ *
+ * @var string
+ */
protected $atcDateEnd;
+
+ /**
+ * Privacy.
+ *
+ * @var string
+ */
protected $atcPrivacy;
+
+ /**
+ * DataSecure.
+ *
+ * @var string
+ */
protected $atcDataSecure;
+
+ /**
+ * Timezone.
+ *
+ * @var string
+ */
protected $timeZone;
/**
@@ -37,7 +117,7 @@ class AddToCalendarApiWidget {
/**
* Constructs a new AddToCalendarApiWidget object.
*/
- public function __construct() {
+ public function __construct(ConfigFactoryInterface $config_factory) {
$this->atcStyle = 'blue';
$this->atcDisplayText = 'Add to calendar';
@@ -45,7 +125,8 @@ public function __construct() {
$this->atcDescription = 'Some event description';
$this->atcLocation = 'Some event location';
// Fetching site name and site email id.
- $config = \Drupal::config('system.site');
+ $this->configFactory = $config_factory;
+ $config = $this->configFactory->getEditable('system.site');
$site_name = $config->get('name');
$site_mail = $config->get('mail');
@@ -55,21 +136,21 @@ public function __construct() {
$this->atcDateEnd = 'now';
$this->atcPrivacy = 'public';
$this->atcDataSecure = 'auto';
- $data_calendars = array('iCalendar',
+ $data_calendars = ['iCalendar',
'Google Calendar',
'Outlook',
'Outlook Online',
'Yahoo! Calendar',
- );
+ ];
$this->atcDataCalendars = $data_calendars;
- $this->timeZone = drupal_get_user_timezone();
+ $this->timeZone = date_default_timezone_get();
}
/**
* Use this function to set values for the widget.
*/
- public function setWidgetValues($config_values = array()) {
+ public function setWidgetValues($config_values = []) {
foreach ($config_values as $key => $value) {
$this->$key = $value;
}
@@ -89,7 +170,7 @@ public function generateWidget() {
// Start building the renderable array.
$build['addtocalendar'] = [];
- $display_text = t('%text', array('%text' => $this->atcDisplayText));
+ $display_text = t('%text', ['%text' => $this->atcDisplayText]);
$build['addtocalendar_button'] = [
'#type' => 'html_tag',
'#tag' => 'a',
diff --git a/web/modules/addtocalendar/src/Plugin/Field/FieldFormatter/AddToCalendar.php b/web/modules/addtocalendar/src/Plugin/Field/FieldFormatter/AddToCalendar.php
index 490077b810d3139c938b6fa8a9a0b33be5a10381..bee4325f96858819ac94e13951b76e39679e1e7f 100644
--- a/web/modules/addtocalendar/src/Plugin/Field/FieldFormatter/AddToCalendar.php
+++ b/web/modules/addtocalendar/src/Plugin/Field/FieldFormatter/AddToCalendar.php
@@ -6,6 +6,11 @@
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\addtocalendar\AddToCalendarApiWidget;
+use Drupal\Core\Utility\Token;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Plugin implementation of the 'add_to_calendar' formatter.
@@ -18,7 +23,67 @@
* }
* )
*/
-class AddToCalendar extends FormatterBase {
+class AddToCalendar extends FormatterBase implements ContainerFactoryPluginInterface {
+
+
+ /**
+ * The entity manager service.
+ *
+ * @var \Drupal\addtocalendar\AddToCalendarApiWidget
+ */
+ protected $addToCalendarApiWidget;
+
+ /**
+ * The token service.
+ *
+ * @var \Drupal\Core\Utility\Token
+ */
+ protected $token;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return new static(
+ $plugin_id,
+ $plugin_definition,
+ $configuration['field_definition'],
+ $configuration['settings'],
+ $configuration['label'],
+ $configuration['view_mode'],
+ $configuration['third_party_settings'],
+ $container->get('addtocalendar.apiwidget'),
+ $container->get('token')
+ );
+ }
+
+ /**
+ * Construct an AddToCalendar object.
+ *
+ * @param string $plugin_id
+ * The plugin_id for the plugin instance.
+ * @param mixed $plugin_definition
+ * The plugin implementation definition.
+ * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+ * Defines an interface for entity field definitions.
+ * @param array $settings
+ * The formatter settings.
+ * @param string $label
+ * The formatter label display setting.
+ * @param string $view_mode
+ * The view mode.
+ * @param array $third_party_settings
+ * Any third party settings.
+ * @param \Drupal\addtocalendar\AddToCalendarApiWidget $add_to_calendar_api_widget
+ * AddToCalendarApi Widget service.
+ * @param \Drupal\Core\Utility\Token $token
+ * Token service.
+ */
+ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AddToCalendarApiWidget $add_to_calendar_api_widget, Token $token) {
+ parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+ $this->addToCalendarApiWidget = $add_to_calendar_api_widget;
+ $this->token = $token;
+ }
/**
* {@inheritdoc}
@@ -77,7 +142,7 @@ protected function viewValue(FieldItemInterface $item) {
$entity_type = $entity->getEntityTypeId();
$settings = $this->fieldDefinition->getSettings();
- $service = \Drupal::service('addtocalendar.apiwidget');
+ $service = $this->addToCalendarApiWidget;
$config_values = [
'atcStyle' => $settings['addtocalendar_settings']['style'],
'atcDisplayText' => $this->fieldDefinition->getSetting('on_label'),
@@ -92,7 +157,7 @@ protected function viewValue(FieldItemInterface $item) {
'atcDataSecure' => $settings['addtocalendar_settings']['data_secure'],
];
if ($settings['addtocalendar_settings']['data_calendars']) {
- $data_calendars = array();
+ $data_calendars = [];
foreach ($settings['addtocalendar_settings']['data_calendars'] as $key => $set) {
if ($set) {
$data_calendars[$key] = $key;
@@ -116,7 +181,7 @@ protected function viewValue(FieldItemInterface $item) {
*
* @param array $field_setting
* The field setting array.
- * @param $entity
+ * @param object $entity
* The entity from which the value is to be returned.
* @param array $options
* Provide various options usable to override the data value being return
@@ -126,10 +191,10 @@ protected function viewValue(FieldItemInterface $item) {
* @return string
* The textual output generated.
*/
- public function getProperValue(array $field_setting, $entity, array $options = array()) {
+ public function getProperValue(array $field_setting, $entity, array $options = []) {
$entity_type = $entity->getEntityTypeId();
// Create token service.
- $token_service = \Drupal::token();
+ $token_service = $this->token;
$token_options = [
'langcode' => $entity->language()->getId(),
'callback' => '',
diff --git a/web/modules/simple_gmap/simple_gmap.info.yml b/web/modules/simple_gmap/simple_gmap.info.yml
index 75589b0f00f9ece1a6cb7bc6cf7380689446207d..ea6115c80cbe5817a862ec8372b4ba987fc557e6 100644
--- a/web/modules/simple_gmap/simple_gmap.info.yml
+++ b/web/modules/simple_gmap/simple_gmap.info.yml
@@ -10,7 +10,7 @@ dependencies:
test_dependencies:
- address
-# Information added by Drupal.org packaging script on 2020-01-20
-version: '8.x-2.0'
+# Information added by Drupal.org packaging script on 2020-06-06
+version: '3.0.0'
project: 'simple_gmap'
-datestamp: 1579517590
+datestamp: 1591439944
diff --git a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml b/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml
index d62d5378cad67a6ead7b0c0c39d1a13b22e7dea6..701537a01ffca5f54f51c865b6793fbcb2dcb3d0 100644
--- a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml
+++ b/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/simple_gmap_stress_test.info.yml
@@ -7,7 +7,7 @@ core_version_requirement: ^8 || ^9
dependencies:
- simple_gmap
-# Information added by Drupal.org packaging script on 2020-01-20
-version: '8.x-2.0'
+# Information added by Drupal.org packaging script on 2020-06-06
+version: '3.0.0'
project: 'simple_gmap'
-datestamp: 1579517590
+datestamp: 1591439944
diff --git a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/stress_test.info.yml b/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/stress_test.info.yml
deleted file mode 100644
index 6240b24f58273c742f802ae0429484d12597ddbf..0000000000000000000000000000000000000000
--- a/web/modules/simple_gmap/tests/module/simple_gmap_stress_test/stress_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: simple_gmap_stress_test
-type: module
-description: 'Provides a stress_test content entity.'
-package: Custom
-core: 8.x
-dependencies:
- - simple_gmap
-
-# Information added by Drupal.org packaging script on 2020-01-20
-version: '8.x-2.0'
-project: 'simple_gmap'
-datestamp: 1579517590
diff --git a/web/modules/svg_image/README.md b/web/modules/svg_image/README.md
index 6578bc88d950255289c910e6fd86dd44d4c52aa5..468f54c81355aacaf68235728677dcf7ca625f8a 100644
--- a/web/modules/svg_image/README.md
+++ b/web/modules/svg_image/README.md
@@ -33,9 +33,8 @@ Module was tested on Drupal versions:
* 8.5.x
## INSTALLATION
-Install as you would normally install a contributed Drupal module. See:
-https://drupal.org/documentation/install/modules-themes/modules-7 for further
-information.
+Install as you would normally install a contributed Drupal module. Visit:
+https://www.drupal.org/docs/extending-drupal/installing-drupal-modules for further information.
## CONFIGURATION
All configuration is available via Image field settings.
diff --git a/web/modules/svg_image/modules/svg_image_responsive/src/Plugin/Field/FieldFormatter/SvgResponsiveImageFormatter.php b/web/modules/svg_image/modules/svg_image_responsive/src/Plugin/Field/FieldFormatter/SvgResponsiveImageFormatter.php
old mode 100644
new mode 100755
diff --git a/web/modules/svg_image/modules/svg_image_responsive/svg_image_responsive.info.yml b/web/modules/svg_image/modules/svg_image_responsive/svg_image_responsive.info.yml
index 98dad562c96659609ec6a8e5c35c28d2fb6a0a1c..b3ddc7ffc866ae92bfd7292b159dc21ffda846f8 100644
--- a/web/modules/svg_image/modules/svg_image_responsive/svg_image_responsive.info.yml
+++ b/web/modules/svg_image/modules/svg_image_responsive/svg_image_responsive.info.yml
@@ -1,6 +1,7 @@
name: SVG Image Responsive
description: Overrides the responsive image formatter to support SVG files.
core: 8.x
+core_version_requirement: ^8 || ^9
type: module
package: Media
@@ -8,7 +9,7 @@ dependencies:
- svg_image:svg_image
- drupal:responsive_image
-# Information added by Drupal.org packaging script on 2020-03-28
-version: '8.x-1.13'
+# Information added by Drupal.org packaging script on 2020-06-04
+version: '8.x-1.14'
project: 'svg_image'
-datestamp: 1585379084
+datestamp: 1591251835
diff --git a/web/modules/svg_image/src/Plugin/Field/FieldFormatter/SvgImageFormatter.php b/web/modules/svg_image/src/Plugin/Field/FieldFormatter/SvgImageFormatter.php
old mode 100644
new mode 100755
diff --git a/web/modules/svg_image/src/Plugin/Field/FieldWidget/SvgImageWidget.php b/web/modules/svg_image/src/Plugin/Field/FieldWidget/SvgImageWidget.php
old mode 100644
new mode 100755
diff --git a/web/modules/svg_image/svg_image.info.yml b/web/modules/svg_image/svg_image.info.yml
index a1a1b84e94e87868a8c978c107473b978d18fa63..1ab3af2a09389fce8b7f1b789e0c42327973c0d9 100644
--- a/web/modules/svg_image/svg_image.info.yml
+++ b/web/modules/svg_image/svg_image.info.yml
@@ -3,11 +3,12 @@ description: Overrides the standard image formatter and widget to support SVG fi
core: 8.x
type: module
package: Media
+core_version_requirement: ^8 || ^9
dependencies:
- drupal:image
-# Information added by Drupal.org packaging script on 2020-03-28
-version: '8.x-1.13'
+# Information added by Drupal.org packaging script on 2020-06-04
+version: '8.x-1.14'
project: 'svg_image'
-datestamp: 1585379084
+datestamp: 1591251835
diff --git a/web/modules/svg_image/svg_image.install b/web/modules/svg_image/svg_image.install
index 8551bf0d3e54b7d6f2b7a70963a061a8672f5379..af4369a592a7fbc461ab5ce6476f6bb9cf675ee0 100644
--- a/web/modules/svg_image/svg_image.install
+++ b/web/modules/svg_image/svg_image.install
@@ -68,6 +68,6 @@ function svg_image_uninstall() {
'SVG was removed from the allowed extensions list in fields: @field_list.',
['@field_list' => implode(', ', $changedFields)]
);
- drupal_set_message($message, 'warning');
+ \Drupal::messenger()->addWarning($message);
}
}
diff --git a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/src/Commands/VemCommands.php b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/src/Commands/VemCommands.php
index 0608d5908735feead21f27cc79c6ee5438d933ed..865d61c684b6d30b44015964f076ee5611970f6c 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/src/Commands/VemCommands.php
+++ b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/src/Commands/VemCommands.php
@@ -26,7 +26,7 @@ class VemCommands extends DrushCommands {
protected $migrator;
/**
- * SamplerCommands constructor.
+ * VemCommands constructor.
*
* @param \Drupal\vem_migrate_oembed\VemMigrate $migrator
* The migrate service.
@@ -37,14 +37,17 @@ public function __construct(VemMigrate $migrator) {
}
/**
- * Migrates from video_embed_media to core media.
+ * Migrates from VEF to core media.
*
- * @throws \Drupal\Core\Entity\EntityStorageException
+ * @usage drush vemmo
+ * Migrates from VEF to core media.
*
* @command vem:migrate_oembed
+ * @aliases vemmo
*/
public function migrate() {
$this->migrator->migrate();
+ $this->io()->success(\dt('Migration complete.'));
}
}
diff --git a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/tests/src/Functional/oEmbedUpdateTest.php b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/tests/src/Functional/oEmbedUpdateTest.php
index fdc2582521de8215d531bcb7db5b25fb752f9644..5f8aecdb2f24ab2370b7ecfc18cde8d6531dc815 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/tests/src/Functional/oEmbedUpdateTest.php
+++ b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/tests/src/Functional/oEmbedUpdateTest.php
@@ -15,6 +15,11 @@ class oEmbedUpdateTest extends BrowserTestBase {
use MediaTypeCreationTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.drush.inc b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.drush.inc
index 69bf2112e62b38f2b84ae39e119cc5b1035325e8..44895d1c88c6ee6b24fd4322b168a4afab19ad3d 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.drush.inc
+++ b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.drush.inc
@@ -9,13 +9,12 @@
* Implements hook_drush_command().
*/
function vem_migrate_oembed_drush_command() {
-
- $items['video-embed-media-migrate-oembed'] = [
- 'description' => 'Migrate from VEF to oEmbed in core.',
+ $items['vem_migrate_oembed'] = [
+ 'description' => 'Migrates from VEF to core media.',
'aliases' => ['vemmo'],
'core' => ['8+'],
'examples' => [
- "drush vemmo" => "Migrate from VEF to oEmbed in core",
+ "drush vemmo" => "Migrates from VEF to core media.",
],
];
@@ -25,9 +24,9 @@ function vem_migrate_oembed_drush_command() {
/**
* Callback for drush commmand "video-embed-media-migrate-oembed" (vemmo).
*/
-function drush_vem_migrate_oembed_video_embed_media_migrate_oembed() {
-
+function drush_vem_migrate_oembed_vem_migrate_oembed() {
/** @var \Drupal\vem_migrate_oembed\VemMigrate $migrate */
$migrate = \Drupal::service('vem_migrate_oembed.migrate');
$migrate->migrate();
+ \drush_print(\dt('Migration complete.'));
}
diff --git a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.info.yml b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.info.yml
index 4bb0a68e678e49adcc29fdba15a2e031350f1634..97f2526523d168c999436e2cb1f0e9e525889aa7 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.info.yml
+++ b/web/modules/video_embed_field/modules/video_embed_media/modules/vem_migrate_oembed/vem_migrate_oembed.info.yml
@@ -7,7 +7,7 @@ dependencies:
- drupal:media (>= 8.6)
- video_embed_field:video_embed_media
-# Information added by Drupal.org packaging script on 2020-03-18
-version: '8.x-2.3'
+# Information added by Drupal.org packaging script on 2020-04-23
+version: '8.x-2.4'
project: 'video_embed_field'
-datestamp: 1584489968
+datestamp: 1587686287
diff --git a/web/modules/video_embed_field/modules/video_embed_media/tests/src/Functional/BundleTest.php b/web/modules/video_embed_field/modules/video_embed_media/tests/src/Functional/BundleTest.php
index 7f958a2f56454854f2b8d31d7fe4c137f51e112b..833cf5bd0c32179d29eb2c050f2b8d6bbf69a812 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/tests/src/Functional/BundleTest.php
+++ b/web/modules/video_embed_field/modules/video_embed_media/tests/src/Functional/BundleTest.php
@@ -14,6 +14,11 @@ class BundleTest extends MediaFunctionalTestBase {
use AdminUserTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* Modules to install.
*
@@ -24,13 +29,6 @@ class BundleTest extends MediaFunctionalTestBase {
'video_embed_media',
];
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
- }
-
/**
* Test the dialog form.
*/
@@ -38,7 +36,7 @@ public function testMediaBundleCreation() {
$this->drupalLogin($this->adminUser);
// Create bundle and modify form display.
- $media_type = $this->createMediaType('video_embed_field', ['bundle' => 'video_bundle']);
+ $media_type = $this->createMediaType('video_embed_field', ['id' => 'video_bundle']);
$source = $media_type->getSource();
$source_field = $source->getSourceFieldDefinition($media_type);
if ($source_field->isDisplayConfigurable('form')) {
diff --git a/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.info.yml b/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.info.yml
index 001d7c3ad55155de3241b2c0fd6d998d4f7ed46c..6f6fd480f9a2574df5abc80c96cfad859b5f602d 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.info.yml
+++ b/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.info.yml
@@ -7,7 +7,7 @@ dependencies:
- drupal:media (>= 8.4)
- video_embed_field:video_embed_field
-# Information added by Drupal.org packaging script on 2020-03-18
-version: '8.x-2.3'
+# Information added by Drupal.org packaging script on 2020-04-23
+version: '8.x-2.4'
project: 'video_embed_field'
-datestamp: 1584489968
+datestamp: 1587686287
diff --git a/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/Functional/TextFormatConfigurationTest.php b/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/Functional/TextFormatConfigurationTest.php
index 3f565f22cfd611c175397a98ac0e9c400a0e1927..6eb18e0898acd879bcbf74a3c8d915b1cdd35e74 100644
--- a/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/Functional/TextFormatConfigurationTest.php
+++ b/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/Functional/TextFormatConfigurationTest.php
@@ -14,6 +14,11 @@ class TextFormatConfigurationTest extends BrowserTestBase {
use AdminUserTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/FunctionalJavascript/EmbedDialogTest.php b/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/FunctionalJavascript/EmbedDialogTest.php
index 4be4bc6f4ace5cf4f2e8fb650c82c40b8ad483ff..0056748b4b2e5da8adb0360ab46a3af3c806f8c3 100644
--- a/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/FunctionalJavascript/EmbedDialogTest.php
+++ b/web/modules/video_embed_field/modules/video_embed_wysiwyg/tests/src/FunctionalJavascript/EmbedDialogTest.php
@@ -14,6 +14,11 @@ class EmbedDialogTest extends WebDriverTestBase {
use ContentTypeCreationTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* Modules to install.
*
diff --git a/web/modules/video_embed_field/modules/video_embed_wysiwyg/video_embed_wysiwyg.info.yml b/web/modules/video_embed_field/modules/video_embed_wysiwyg/video_embed_wysiwyg.info.yml
index 84e39fe66b45136e7298f5b8e0c2441e5cdcc636..b3faea29fa521c23e922c9e2bbb62d0290b606ac 100644
--- a/web/modules/video_embed_field/modules/video_embed_wysiwyg/video_embed_wysiwyg.info.yml
+++ b/web/modules/video_embed_field/modules/video_embed_wysiwyg/video_embed_wysiwyg.info.yml
@@ -8,7 +8,7 @@ dependencies:
- drupal:ckeditor
- video_embed_field:video_embed_field
-# Information added by Drupal.org packaging script on 2020-03-18
-version: '8.x-2.3'
+# Information added by Drupal.org packaging script on 2020-04-23
+version: '8.x-2.4'
project: 'video_embed_field'
-datestamp: 1584489968
+datestamp: 1587686287
diff --git a/web/modules/video_embed_field/src/Plugin/Field/FieldFormatter/Thumbnail.php b/web/modules/video_embed_field/src/Plugin/Field/FieldFormatter/Thumbnail.php
index 543db3f89338a19b0a58836f0f457a187ab52239..e14da15aec73e3eada835581af9cd5ab7e24ddf1 100644
--- a/web/modules/video_embed_field/src/Plugin/Field/FieldFormatter/Thumbnail.php
+++ b/web/modules/video_embed_field/src/Plugin/Field/FieldFormatter/Thumbnail.php
@@ -89,7 +89,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration['view_mode'],
$configuration['third_party_settings'],
$container->get('video_embed_field.provider_manager'),
- $container->get('entity.manager')->getStorage('image_style')
+ $container->get('entity_type.manager')->getStorage('image_style')
);
}
diff --git a/web/modules/video_embed_field/src/Plugin/migrate/cckfield/EmvideoField.php b/web/modules/video_embed_field/src/Plugin/migrate/field/EmvideoField.php
similarity index 93%
rename from web/modules/video_embed_field/src/Plugin/migrate/cckfield/EmvideoField.php
rename to web/modules/video_embed_field/src/Plugin/migrate/field/EmvideoField.php
index 37491c10fae78ce07261e2cd64d5741086b34cc5..afa41940c95ff628ee26489ef1717dc61b76aaa5 100644
--- a/web/modules/video_embed_field/src/Plugin/migrate/cckfield/EmvideoField.php
+++ b/web/modules/video_embed_field/src/Plugin/migrate/field/EmvideoField.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\video_embed_field\Plugin\migrate\cckfield;
+namespace Drupal\video_embed_field\Plugin\migrate\field;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
@@ -9,7 +9,7 @@
/**
* Plugin to migrate from the Drupal 6 emfield module.
*
- * @MigrateCckField(
+ * @MigrateField(
* id = "emvideo",
* core = {6},
* source_module = "emfield",
diff --git a/web/modules/video_embed_field/src/Plugin/migrate/cckfield/VideoEmbedField.php b/web/modules/video_embed_field/src/Plugin/migrate/field/VideoEmbedField.php
similarity index 94%
rename from web/modules/video_embed_field/src/Plugin/migrate/cckfield/VideoEmbedField.php
rename to web/modules/video_embed_field/src/Plugin/migrate/field/VideoEmbedField.php
index 97e0f216b814942cbd3fae76a3182f02698cfbd7..2ce54d061402376c0ea749ce34737970c6bb16d9 100644
--- a/web/modules/video_embed_field/src/Plugin/migrate/cckfield/VideoEmbedField.php
+++ b/web/modules/video_embed_field/src/Plugin/migrate/field/VideoEmbedField.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\video_embed_field\Plugin\migrate\cckfield;
+namespace Drupal\video_embed_field\Plugin\migrate\field;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
@@ -9,7 +9,7 @@
/**
* Plugin to migrate from the Drupal 7 video_embed_field module.
*
- * @MigrateCckField(
+ * @MigrateField(
* id = "video_embed_field",
* core = {7},
* source_module = "video_embed_field",
diff --git a/web/modules/video_embed_field/tests/modules/video_embed_field_mock_provider/video_embed_field_mock_provider.info.yml b/web/modules/video_embed_field/tests/modules/video_embed_field_mock_provider/video_embed_field_mock_provider.info.yml
index 10c3538b9cad1c42ed24d57c754d55f0e8b0b482..ced80a9b34e1184c7802ef3c587546fa3e8b6a11 100644
--- a/web/modules/video_embed_field/tests/modules/video_embed_field_mock_provider/video_embed_field_mock_provider.info.yml
+++ b/web/modules/video_embed_field/tests/modules/video_embed_field_mock_provider/video_embed_field_mock_provider.info.yml
@@ -3,9 +3,8 @@ description: A mock provider for testing purposes only.
type: module
hidden: true
package: Testing
-core: 8.x
-# Information added by Drupal.org packaging script on 2020-03-18
-version: '8.x-2.3'
+# Information added by Drupal.org packaging script on 2020-04-23
+version: '8.x-2.4'
project: 'video_embed_field'
-datestamp: 1584489968
+datestamp: 1587686287
diff --git a/web/modules/video_embed_field/tests/src/Functional/AutoplayPermissionTest.php b/web/modules/video_embed_field/tests/src/Functional/AutoplayPermissionTest.php
index 281c976b11826601e68f1a740df9dfdb770868de..e66e03879214e2bffd13ee17ed228cd39cba1bec 100644
--- a/web/modules/video_embed_field/tests/src/Functional/AutoplayPermissionTest.php
+++ b/web/modules/video_embed_field/tests/src/Functional/AutoplayPermissionTest.php
@@ -12,6 +12,11 @@ class AutoplayPermissionTest extends BrowserTestBase {
use EntityDisplaySetupTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
public static $modules = [
'video_embed_field',
'node',
diff --git a/web/modules/video_embed_field/tests/src/Functional/FieldConfigurationTest.php b/web/modules/video_embed_field/tests/src/Functional/FieldConfigurationTest.php
index 786e36aa3954e2cfc23fed9a24d1ed7a30a953af..25a4e4a0beee298dbc4faac34d0c8c64bd19418f 100644
--- a/web/modules/video_embed_field/tests/src/Functional/FieldConfigurationTest.php
+++ b/web/modules/video_embed_field/tests/src/Functional/FieldConfigurationTest.php
@@ -14,6 +14,11 @@ class FieldConfigurationTest extends BrowserTestBase {
use EntityDisplaySetupTrait;
use AdminUserTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/tests/src/Functional/FormatterConfigurationTest.php b/web/modules/video_embed_field/tests/src/Functional/FormatterConfigurationTest.php
index 985c005d9f6de4ad7edf91e50ee8c97a05514fa4..016d5ba2511e251ab9b851c90620864e9f6ffcef 100644
--- a/web/modules/video_embed_field/tests/src/Functional/FormatterConfigurationTest.php
+++ b/web/modules/video_embed_field/tests/src/Functional/FormatterConfigurationTest.php
@@ -15,6 +15,11 @@ class FormatterConfigurationTest extends BrowserTestBase {
use AdminUserTrait;
use EntityDisplaySetupTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/tests/src/Functional/InstallationTest.php b/web/modules/video_embed_field/tests/src/Functional/InstallationTest.php
index 18f1f912076144788e7089bbaa8c730fb5d8e41c..735e741da7bb66caa45f801f51b12bbdeafc48a1 100644
--- a/web/modules/video_embed_field/tests/src/Functional/InstallationTest.php
+++ b/web/modules/video_embed_field/tests/src/Functional/InstallationTest.php
@@ -13,6 +13,11 @@ class InstallationTest extends BrowserTestBase {
use AdminUserTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/tests/src/Functional/WidgetTest.php b/web/modules/video_embed_field/tests/src/Functional/WidgetTest.php
index 798aa7579b7867d453e8527b03d4f2715b79f818..3b0be3f5907b6b36d13e666c5a71d24e734270f3 100644
--- a/web/modules/video_embed_field/tests/src/Functional/WidgetTest.php
+++ b/web/modules/video_embed_field/tests/src/Functional/WidgetTest.php
@@ -15,6 +15,11 @@ class WidgetTest extends BrowserTestBase {
use EntityDisplaySetupTrait;
use AdminUserTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/tests/src/FunctionalJavascript/ColorboxFormatterTest.php b/web/modules/video_embed_field/tests/src/FunctionalJavascript/ColorboxFormatterTest.php
index 87c26bbbf96049043f5a3827334dc976e824b2c1..3c6acabac106d95f5d1cc5eac72bf267a4defe06 100644
--- a/web/modules/video_embed_field/tests/src/FunctionalJavascript/ColorboxFormatterTest.php
+++ b/web/modules/video_embed_field/tests/src/FunctionalJavascript/ColorboxFormatterTest.php
@@ -14,6 +14,11 @@ class ColorboxFormatterTest extends WebDriverTestBase {
use EntityDisplaySetupTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/tests/src/FunctionalJavascript/LazyLoadFormatterTest.php b/web/modules/video_embed_field/tests/src/FunctionalJavascript/LazyLoadFormatterTest.php
index b1de102b85850a5d98668dab445d8c4a2d114730..f01db68cdd39ab0d8574355d673262a8e680e8bc 100644
--- a/web/modules/video_embed_field/tests/src/FunctionalJavascript/LazyLoadFormatterTest.php
+++ b/web/modules/video_embed_field/tests/src/FunctionalJavascript/LazyLoadFormatterTest.php
@@ -14,6 +14,11 @@ class LazyLoadFormatterTest extends WebDriverTestBase {
use EntityDisplaySetupTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* {@inheritdoc}
*/
diff --git a/web/modules/video_embed_field/video_embed_field.info.yml b/web/modules/video_embed_field/video_embed_field.info.yml
index 04bdbb8ff0fd6c120342bf973571d4a28f90a183..35254ab046685ccd50c206b42c14faaccfafbc03 100644
--- a/web/modules/video_embed_field/video_embed_field.info.yml
+++ b/web/modules/video_embed_field/video_embed_field.info.yml
@@ -9,11 +9,9 @@ dependencies:
- drupal:system
test_dependencies:
- - media_entity:media_entity
- - media_entity_embeddable_video:media_entity_embeddable_video
- colorbox:colorbox
-# Information added by Drupal.org packaging script on 2020-03-18
-version: '8.x-2.3'
+# Information added by Drupal.org packaging script on 2020-04-23
+version: '8.x-2.4'
project: 'video_embed_field'
-datestamp: 1584489968
+datestamp: 1587686287