From 28569c8e5fbb73a80bb0949eda2ec09cef7e2b81 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Thu, 9 Apr 2020 12:04:35 -0400
Subject: [PATCH] Updating drupal/video_embed_field (2.2.0 => 2.3.0)
---
composer.json | 2 +-
composer.lock | 25 ++++++++++--------
vendor/composer/installed.json | 26 ++++++++++---------
web/modules/video_embed_field/composer.json | 14 +++++++++-
.../tests/src/Functional/oEmbedUpdateTest.php | 7 +++--
.../vem_migrate_oembed.info.yml | 9 +++----
.../video_embed_media.info.yml | 9 +++----
.../video_embed_media.install | 2 +-
.../video_embed_wysiwyg.info.yml | 9 +++----
.../video_embed_field_mock_provider.info.yml | 9 +++----
.../tests/src/Kernel/KernelTestBase.php | 5 ++--
.../video_embed_field.info.yml | 11 ++++----
12 files changed, 71 insertions(+), 57 deletions(-)
diff --git a/composer.json b/composer.json
index 060f7a9919..18de7ed2e0 100644
--- a/composer.json
+++ b/composer.json
@@ -172,7 +172,7 @@
"drupal/twig_tweak": "2.4",
"drupal/twitter_block": "3.0-alpha0",
"drupal/userprotect": "1.0",
- "drupal/video_embed_field": "2.2",
+ "drupal/video_embed_field": "2.3",
"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 d61ecec2e4..887d9cf920 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": "8086d330dc9c96db5ffdc91d54b984b5",
+ "content-hash": "23e954f836631a163d4f0751ea02133a",
"packages": [
{
"name": "alchemy/zippy",
@@ -6093,7 +6093,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",
@@ -7884,23 +7885,23 @@
},
{
"name": "drupal/video_embed_field",
- "version": "2.2.0",
+ "version": "2.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/video_embed_field.git",
- "reference": "8.x-2.2"
+ "reference": "8.x-2.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.2.zip",
- "reference": "8.x-2.2",
- "shasum": "1e76eeefb27f4166d3d119e8c27469bbf12c0f06"
+ "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.3.zip",
+ "reference": "8.x-2.3",
+ "shasum": "d9b4b3bde48edf49d1aa038aae6736496558caf4"
},
"require": {
- "drupal/core": "^8.7.0"
+ "drupal/core": "^8.8 || ^9"
},
"require-dev": {
- "drupal/colorbox": "*",
+ "drupal/colorbox": "^1.0",
"drupal/media_entity": "*",
"drupal/media_entity_embeddable_video": "*",
"drupal/video_embed_media": "*"
@@ -7911,8 +7912,8 @@
"dev-2.x": "2.x-dev"
},
"drupal": {
- "version": "8.x-2.2",
- "datestamp": "1564103585",
+ "version": "8.x-2.3",
+ "datestamp": "1584489966",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -9568,6 +9569,7 @@
"email": "jakub.onderka@gmail.com"
}
],
+ "abandoned": "php-parallel-lint/php-console-color",
"time": "2018-09-29T17:23:10+00:00"
},
{
@@ -9614,6 +9616,7 @@
}
],
"description": "Highlight PHP code in terminal",
+ "abandoned": "php-parallel-lint/php-console-highlighter",
"time": "2018-09-29T18:48:56+00:00"
},
{
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 22958b8a22..3f214fccd6 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -8129,24 +8129,24 @@
},
{
"name": "drupal/video_embed_field",
- "version": "2.2.0",
- "version_normalized": "2.2.0.0",
+ "version": "2.3.0",
+ "version_normalized": "2.3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/video_embed_field.git",
- "reference": "8.x-2.2"
+ "reference": "8.x-2.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.2.zip",
- "reference": "8.x-2.2",
- "shasum": "1e76eeefb27f4166d3d119e8c27469bbf12c0f06"
+ "url": "https://ftp.drupal.org/files/projects/video_embed_field-8.x-2.3.zip",
+ "reference": "8.x-2.3",
+ "shasum": "d9b4b3bde48edf49d1aa038aae6736496558caf4"
},
"require": {
- "drupal/core": "^8.7.0"
+ "drupal/core": "^8.8 || ^9"
},
"require-dev": {
- "drupal/colorbox": "*",
+ "drupal/colorbox": "^1.0",
"drupal/media_entity": "*",
"drupal/media_entity_embeddable_video": "*",
"drupal/video_embed_media": "*"
@@ -8157,8 +8157,8 @@
"dev-2.x": "2.x-dev"
},
"drupal": {
- "version": "8.x-2.2",
- "datestamp": "1564103585",
+ "version": "8.x-2.3",
+ "datestamp": "1584489966",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -9871,7 +9871,8 @@
"name": "Jakub Onderka",
"email": "jakub.onderka@gmail.com"
}
- ]
+ ],
+ "abandoned": "php-parallel-lint/php-console-color"
},
{
"name": "jakub-onderka/php-console-highlighter",
@@ -9919,7 +9920,8 @@
"homepage": "http://www.acci.cz/"
}
],
- "description": "Highlight PHP code in terminal"
+ "description": "Highlight PHP code in terminal",
+ "abandoned": "php-parallel-lint/php-console-highlighter"
},
{
"name": "league/container",
diff --git a/web/modules/video_embed_field/composer.json b/web/modules/video_embed_field/composer.json
index ad7fdca15d..d68064ed00 100644
--- a/web/modules/video_embed_field/composer.json
+++ b/web/modules/video_embed_field/composer.json
@@ -3,5 +3,17 @@
"description": "A pluggable field type for storing videos from external video hosts such as Vimeo and YouTube.",
"type": "drupal-module",
"homepage": "https://www.drupal.org/project/video_embed_field",
- "license": "GPL-2.0+"
+ "license": "GPL-2.0+",
+ "require": {
+ "drupal/core": "^8.8 || ^9"
+ },
+ "repositories": {
+ "drupal": {
+ "type": "composer",
+ "url": "https://packages.drupal.org/8"
+ }
+ },
+ "require-dev": {
+ "drupal/colorbox": "^1.0"
+ }
}
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 6ed942555a..fdc2582521 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
@@ -31,7 +31,10 @@ public function testOEmbedUpdate() {
$sourceField = $mediaType->getSource()->getSourceFieldDefinition($mediaType);
$this->assertEqual($sourceField->getType(), 'video_embed_field');
- $formDisplay = entity_get_form_display('media', $mediaType->id(), 'default');
+ /** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
+ $display_repository = $this->container->get('entity_display.repository');
+
+ $formDisplay = $display_repository->getFormDisplay('media', $mediaType->id());
$formField = $formDisplay->getComponent($sourceField->getName());
$this->assertEqual($formField['type'], 'video_embed_field_textfield');
@@ -47,7 +50,7 @@ public function testOEmbedUpdate() {
$sourceField = $mediaType->getSource()->getSourceFieldDefinition($mediaType);
$this->assertEqual($sourceField->getType(), 'string');
- $formDisplay = entity_get_form_display('media', $mediaType->id(), 'default');
+ $formDisplay = $display_repository->getFormDisplay('media', $mediaType->id());
$formField = $formDisplay->getComponent($sourceField->getName());
$this->assertEqual($formField['type'], 'oembed_textfield');
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 b8a65a11f5..4bb0a68e67 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
@@ -2,13 +2,12 @@ name: Video Embed Media - Migrate to core oEmbed
type: module
description: 'Provides a drush command to migrate to cores oEmbed'
package: Video Embed Field
-# core: 8.x
+core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:media (>= 8.6)
- video_embed_field:video_embed_media
-# Information added by Drupal.org packaging script on 2019-07-26
-version: '8.x-2.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-03-18
+version: '8.x-2.3'
project: 'video_embed_field'
-datestamp: 1564103587
+datestamp: 1584489968
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 42dd220d8a..001d7c3ad5 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
@@ -2,13 +2,12 @@ name: Video Embed Media
type: module
description: 'Integrates video_embed_field with the Media module, creating a new media type tailored to display embedded videos. Useful for websites which are using the media suite of modules.'
package: Video Embed Field
-# core: 8.x
+core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:media (>= 8.4)
- video_embed_field:video_embed_field
-# Information added by Drupal.org packaging script on 2019-07-26
-version: '8.x-2.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-03-18
+version: '8.x-2.3'
project: 'video_embed_field'
-datestamp: 1564103587
+datestamp: 1584489968
diff --git a/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.install b/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.install
index 843637edfe..144423bc16 100644
--- a/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.install
+++ b/web/modules/video_embed_field/modules/video_embed_media/video_embed_media.install
@@ -18,7 +18,7 @@ function video_embed_media_install() {
$destination = \Drupal::config('media.settings')->get('icon_base_uri');
$file_system->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS);
- $files = file_scan_directory($icon_folder, '/.*\.(svg|png|jpg|jpeg|gif)$/');
+ $files = $file_system->scanDirectory($icon_folder, '/.*\.(svg|png|jpg|jpeg|gif)$/');
foreach ($files as $file) {
// We don't want to copy the icons when they already exist. The icons could
// be placed manually, so we don't want to replace the existing files.
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 a2cb4b778c..84e39fe66b 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
@@ -2,14 +2,13 @@ name: Video Embed WYSIWYG
type: module
description: 'Integrates video_embed_field directly into ckeditor. Useful for websites not using the media suite of modules that need WYSIWYG support.'
package: Video Embed Field
-# core: 8.x
+core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:field
- drupal:ckeditor
- video_embed_field:video_embed_field
-# Information added by Drupal.org packaging script on 2019-07-26
-version: '8.x-2.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-03-18
+version: '8.x-2.3'
project: 'video_embed_field'
-datestamp: 1564103587
+datestamp: 1584489968
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 9ebc61a57f..10c3538b9c 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,10 +3,9 @@ description: A mock provider for testing purposes only.
type: module
hidden: true
package: Testing
-# core: 8.x
+core: 8.x
-# Information added by Drupal.org packaging script on 2019-07-26
-version: '8.x-2.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-03-18
+version: '8.x-2.3'
project: 'video_embed_field'
-datestamp: 1564103587
+datestamp: 1584489968
diff --git a/web/modules/video_embed_field/tests/src/Kernel/KernelTestBase.php b/web/modules/video_embed_field/tests/src/Kernel/KernelTestBase.php
index b86d36f898..3276290f87 100644
--- a/web/modules/video_embed_field/tests/src/Kernel/KernelTestBase.php
+++ b/web/modules/video_embed_field/tests/src/Kernel/KernelTestBase.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\video_embed_field\Kernel;
use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Core\File\FileSystemInterface;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\KernelTests\KernelTestBase as CoreKernelTestBase;
@@ -32,6 +33,7 @@ abstract class KernelTestBase extends CoreKernelTestBase {
* @var array
*/
public static $modules = [
+ 'colorbox',
'user',
'system',
'field',
@@ -69,9 +71,6 @@ protected function setUp() {
'bundle' => $this->entityTypeId,
])->save();
- // Fake colorbox being enabled for the purposes of testing.
- $this->container->get('module_handler')->addModule('colorbox', NULL);
-
// Use a HTTP mock which won't attempt to download anything.
$this->container->set('http_client', new MockHttpClient());
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 acd8ed9cd0..04bdbb8ff0 100644
--- a/web/modules/video_embed_field/video_embed_field.info.yml
+++ b/web/modules/video_embed_field/video_embed_field.info.yml
@@ -2,19 +2,18 @@ name: Video Embed Field
type: module
description: 'Provides a field type for displaying videos from 3rd party providers such as YouTube and Vimeo.'
package: Video Embed Field
-# core: 8.x
+core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:field
- drupal:image
- - drupal:system (>=8.7.0)
+ - 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 2019-07-26
-version: '8.x-2.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-03-18
+version: '8.x-2.3'
project: 'video_embed_field'
-datestamp: 1564103587
+datestamp: 1584489968
--
GitLab