From e4fe8f0467b5d26b1a6adfb338b1c9de4e4de443 Mon Sep 17 00:00:00 2001 From: Fureigh Date: Fri, 4 May 2018 10:22:23 -0700 Subject: [PATCH] Restore Brightcove API dependency This was added in #78 as part of Brightcove integration but appears to have fallen out of composer.json somewhere along the way. For further implementation context, see https://pronovix.com/blog/brightcove-video-connect-drupal-8-part-2-installation-configuration. --- composer.json | 9 +++ composer.lock | 207 +++++++++++++++++++++++++------------------------- 2 files changed, 113 insertions(+), 103 deletions(-) diff --git a/composer.json b/composer.json index 368469c..3112956 100644 --- a/composer.json +++ b/composer.json @@ -73,6 +73,15 @@ ] }, "extra": { + "merge-plugin": { + "include": [ + "web/core/composer.json", + "web/modules/contrib/brightcove/composer.json" + ], + "recurse": false, + "replace": false, + "merge-extra": false + }, "installer-paths": { "web/core": ["type:drupal-core"], "web/libraries/{$name}": ["type:drupal-library"], diff --git a/composer.lock b/composer.lock index 641bf9a..7fee73e 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": "9c274b6077552f4d4e0457fa53843d0e", + "content-hash": "f7401ee9d1309ed235926ace403e3330", "packages": [ { "name": "alchemy/zippy", @@ -124,16 +124,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.55.3", + "version": "3.55.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e" + "reference": "fcafbbdaa58ca2b1db62fd6dc626c01125f8eee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/28a1828814ce34d056492fa494f1e4bbaddaf33e", - "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fcafbbdaa58ca2b1db62fd6dc626c01125f8eee9", + "reference": "fcafbbdaa58ca2b1db62fd6dc626c01125f8eee9", "shasum": "" }, "require": { @@ -200,7 +200,7 @@ "s3", "sdk" ], - "time": "2018-04-26T21:09:13+00:00" + "time": "2018-05-03T22:24:42+00:00" }, { "name": "brightcove/api", @@ -3267,17 +3267,17 @@ }, { "name": "drupal/s3fs", - "version": "3.0.0-alpha9", + "version": "3.0.0-alpha10", "source": { "type": "git", "url": "https://git.drupal.org/project/s3fs", - "reference": "8.x-3.0-alpha9" + "reference": "8.x-3.0-alpha10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.0-alpha9.zip", - "reference": "8.x-3.0-alpha9", - "shasum": "85b564788483506a4a29244af41ee30601ad983c" + "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.0-alpha10.zip", + "reference": "8.x-3.0-alpha10", + "shasum": "8542958a4e2e5468d5167d2c8cb93c5071881ecc" }, "require": { "aws/aws-sdk-php": "^3.18", @@ -3289,8 +3289,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.0-alpha9", - "datestamp": "1523006284", + "version": "8.x-3.0-alpha10", + "datestamp": "1525449183", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -5032,7 +5032,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -5088,7 +5088,7 @@ }, { "name": "symfony/config", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -5151,16 +5151,16 @@ }, { "name": "symfony/console", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf" + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", + "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf", + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf", "shasum": "" }, "require": { @@ -5181,7 +5181,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -5216,11 +5216,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" + "time": "2018-04-30T01:22:56+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -5273,16 +5273,16 @@ }, { "name": "symfony/debug", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7" + "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", - "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7", + "url": "https://api.github.com/repos/symfony/debug/zipball/1b95888cfd996484527cb41e8952d9a5eaf7454f", + "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f", "shasum": "" }, "require": { @@ -5325,20 +5325,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" + "time": "2018-04-30T16:53:52+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611" + "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24a68710c6ddc1e3d159a110cef94cedfcf3c611", - "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", + "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3", "shasum": "" }, "require": { @@ -5396,11 +5396,11 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-03-29T11:25:31+00:00" + "time": "2018-04-29T14:04:08+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -5456,7 +5456,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -5519,7 +5519,7 @@ }, { "name": "symfony/filesystem", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -5568,7 +5568,7 @@ }, { "name": "symfony/finder", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -5617,16 +5617,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e" + "reference": "edc43b1a50402bb06b5111eb86b275c87a93e373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e", - "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/edc43b1a50402bb06b5111eb86b275c87a93e373", + "reference": "edc43b1a50402bb06b5111eb86b275c87a93e373", "shasum": "" }, "require": { @@ -5667,20 +5667,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:22:50+00:00" + "time": "2018-04-30T01:05:13+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4" + "reference": "280fcedbcb3dabcc467a9c1734054af61928fe4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3cc2d4374aa9590c09277ad68657671cf49dbbf4", - "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/280fcedbcb3dabcc467a9c1734054af61928fe4f", + "reference": "280fcedbcb3dabcc467a9c1734054af61928fe4f", "shasum": "" }, "require": { @@ -5755,20 +5755,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-04-06T15:19:48+00:00" + "time": "2018-04-30T19:27:02+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "bd515d8f392730c833bc1ba993a4f598da64fa5b" + "reference": "7cb8436a814d5b0fcf292810ee26f8b0cb47584d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bd515d8f392730c833bc1ba993a4f598da64fa5b", - "reference": "bd515d8f392730c833bc1ba993a4f598da64fa5b", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/7cb8436a814d5b0fcf292810ee26f8b0cb47584d", + "reference": "7cb8436a814d5b0fcf292810ee26f8b0cb47584d", "shasum": "" }, "require": { @@ -5780,7 +5780,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -5814,20 +5814,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -5839,7 +5839,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -5873,20 +5873,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", "shasum": "" }, "require": { @@ -5896,7 +5896,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -5932,11 +5932,11 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -6045,16 +6045,16 @@ }, { "name": "symfony/routing", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c" + "reference": "9deb375986f5d1f37283d8386716d26985a0f4b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/50f333b707bef9f6972ad04e6df3ec8875c9a67c", - "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c", + "url": "https://api.github.com/repos/symfony/routing/zipball/9deb375986f5d1f37283d8386716d26985a0f4b6", + "reference": "9deb375986f5d1f37283d8386716d26985a0f4b6", "shasum": "" }, "require": { @@ -6119,11 +6119,11 @@ "uri", "url" ], - "time": "2018-04-04T13:22:16+00:00" + "time": "2018-04-12T09:01:03+00:00" }, { "name": "symfony/serializer", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", @@ -6201,16 +6201,16 @@ }, { "name": "symfony/translation", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57" + "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/80e19eaf12cbb546ac40384e5c55c36306823e57", - "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57", + "url": "https://api.github.com/repos/symfony/translation/zipball/d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", + "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c", "shasum": "" }, "require": { @@ -6231,7 +6231,7 @@ "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, @@ -6265,20 +6265,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-02-22T06:28:18+00:00" + "time": "2018-04-30T01:22:56+00:00" }, { "name": "symfony/validator", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7" + "reference": "d562929598e5f3cb3947937c9ccfb18d977a16b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7", - "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7", + "url": "https://api.github.com/repos/symfony/validator/zipball/d562929598e5f3cb3947937c9ccfb18d977a16b3", + "reference": "d562929598e5f3cb3947937c9ccfb18d977a16b3", "shasum": "" }, "require": { @@ -6349,20 +6349,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:25+00:00" + "time": "2018-04-20T10:02:27+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb" + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/951643091b39a6fd40fce56cd16e21e12bef3feb", - "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73", + "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73", "shasum": "" }, "require": { @@ -6418,20 +6418,20 @@ "debug", "dump" ], - "time": "2018-04-03T20:34:11+00:00" + "time": "2018-04-26T12:42:15+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.8", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0" + "reference": "033cfa61ef06ee0847e056e530201842b6e926c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0", - "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3", + "reference": "033cfa61ef06ee0847e056e530201842b6e926c3", "shasum": "" }, "require": { @@ -6476,7 +6476,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:14:20+00:00" + "time": "2018-04-08T08:21:29+00:00" }, { "name": "twig/twig", @@ -6836,31 +6836,31 @@ }, { "name": "zendframework/zend-stdlib", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc" + "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc", - "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cd164b4a18b5d1aeb69be2c26db035b5ed6925ae", + "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae", "shasum": "" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "~4.0", + "phpbench/phpbench": "^0.13", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" } }, "autoload": { @@ -6872,12 +6872,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-stdlib", + "description": "SPL extensions, array utilities, error handlers, and more", "keywords": [ + "ZendFramework", "stdlib", - "zf2" + "zf" ], - "time": "2018-04-12T16:05:42+00:00" + "time": "2018-04-30T13:50:40+00:00" } ], "packages-dev": [],