diff --git a/.travis.yml b/.travis.yml index 324012293..1958a5b6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ php: - 7.0 env: - VERSION=HEAD - - VERSION=3.2.5 + - VERSION=3.2.6 # The final CI slot should be used to test the update path from the oldest # available database fixture. - VERSION=3.0.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index aa7612216..4a5855e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +## 3.2.6 +* Updated Lightning Core to 3.7, which: + * Security updated Drupal core to 8.6.10 (SA-CORE-2019-003). + * Security updated Metatag to 1.8 (SA-CONTRIB-2019-021). + * Now supports attaching pictures to user accounts, and includes a Compact + display which displays the user's picture and name, both optionally linked + to the user's profile. (Issue #3026959) + * Now includes a "Long (12-hour)" date format, which formats dates and times + like "April 1, 2019 at 4:20 PM". + * Fixed a bug where Lightning's utility to convert descendant profiles to the + Drupal 8.6-compatible format would fail if the active profile was itself a + descendant profile. (Issue #2997990) + * Fixed an "undefined index" bug that could happen when processing form elements + which can have legends. (Issue #3018499) + * Namespaced all declared dependencies. (Issue #2995711) +* Updated Lightning API to 3.4, which: + * Security updated JSON API to 2.3 (SA-CONTRIB-2019-019). +* Updated Lightning Media to 3.6, which has the following changes: + * The media browser is now displayed in a modal dialog by default, which + is activated by pressing the "Add media" button. When embedding media in + the WYSIWYG editor, the media browser is unchanged (the entity browser + used for WYSIWYG has been split out into a completely separate entity + browser configuration in order to facilitate this). (GitHub #80) + ## 3.2.5 * Security updated Acquia Connector to 1.16 (SA-CONTRIB-2019-014) * Updated Consumers to 1.8. diff --git a/UPDATE.md b/UPDATE.md index 54a3d3440..fa3c5dc29 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -170,6 +170,42 @@ are currently running 2.2.0 and are trying to update to 2.2.6, you will need to follow the instructions for updating from 2.2.0 to 2.2.1, then from 2.2.1 to 2.2.2, in that order. +### 3.2.5 to 3.2.6 +* If you would like to enable support for user account pictures (avatars): + 1. Create a new image field on user accounts. In Lightning Core, this field + is called "Picture" by default and its machine name is user_picture. + 2. Set the file default-avatar.png, contained in the `images` directory + of Lightning Core, to be the default image for the field. + 2. Customize the display of the "Compact" view mode for user accounts, and + ensure that the new image field is displayed using the Thumbnail image + style. +* If you would like to display the media browser in a modal window, rather than + in an iFrame, follow these instructions: + 1. Create a clone of the media browser which will only be used when embedding + media using the WYSIWYG editor. There is no easy way to duplicate the media + browser from the administrative backend, but you can run a bit of PHP code + at the command line with Drush (or, if you have Devel installed, at the + `/devel/php` path) to do it: +``` +drush php:eval "entity_load('entity_browser', 'media_browser')->createDuplicate()->setName('ckeditor_media_browser') +>setLabel('Media browser (CKEditor)')->save();" +``` + 2. Configure the "Media browser" embed button to use the duplicate you just + created. + 3. Grant permissions to use the duplicate entity browser to the "Media + creator" and "Media manager" user roles. + 4. If you have Lightning Roles installed, you'll also need to grant access to + the duplicate by executing this PHP code (again, this can be done at the + command line with Drush, as in this example, or at `/devel/php` if you have + Devel installed): +``` +drush php:eval "Drupal::service('lightning.content_roles')->grantPermissions('creator', 'use ckeditor_media_browser entity browser pages');" +``` + 5. Edit the pre-existing media browser -- _not_ the duplicate -- to use the + Modal display plugin. Leave the "Width" and "Height" options empty to make + the modal dialog responsive, set the link text to "Add media", and disable + auto-open. Save the changes to the media browser. + ### 3.2.4 to 3.2.5 There are no manual update steps for this version. diff --git a/build-lightning.make b/build-lightning.make index fec4468ef..e45f9fedc 100644 --- a/build-lightning.make +++ b/build-lightning.make @@ -4,4 +4,4 @@ includes[] = drupal-org-core.make projects[lightning][type] = profile projects[lightning][download][type] = git projects[lightning][download][branch] = 8.x-3.x -projects[lightning][download][tag] = 8.x-3.x-dev \ No newline at end of file +projects[lightning][download][tag] = 8.x-3.206 \ No newline at end of file diff --git a/composer.json b/composer.json index ad019a365..c78e402bd 100644 --- a/composer.json +++ b/composer.json @@ -6,12 +6,13 @@ "require": { "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.0.0", - "drupal/lightning_api": "3.x-dev", - "drupal/lightning_core": "3.x-dev", - "drupal/lightning_layout": "1.x-dev", - "drupal/lightning_media": "3.x-dev", - "drupal/lightning_workflow": "3.x-dev", - "oomphinc/composer-installers-extender": "^1.1" + "drupal/lightning_api": "^3.4", + "drupal/lightning_core": "^3.7", + "drupal/lightning_layout": "^1.6", + "drupal/lightning_media": "^3.6", + "drupal/lightning_workflow": "^3.4", + "oomphinc/composer-installers-extender": "^1.1", + "drupal/ctools": "3.0" }, "require-dev": { "acquia/lightning_dev": "dev-8.x-1.x", diff --git a/composer.lock b/composer.lock index 41d580b62..92c7864bc 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": "859f8faa57f5d7c2f3e605fe0bec989f", + "content-hash": "d1eeda602fae37c54e6eff05347f75f4", "packages": [ { "name": "asm89/stack-cors", @@ -69,8 +69,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/fengyuanchen/cropper/zipball/30c58b29ee21010e17e58ebab165fbd84285c685", - "reference": "30c58b29ee21010e17e58ebab165fbd84285c685", - "shasum": null + "reference": "30c58b29ee21010e17e58ebab165fbd84285c685" }, "type": "bower-asset", "license": [ @@ -88,8 +87,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/enyo/dropzone/zipball/08b9e0a763b54a685404dea523a9c54242fbe1b9", - "reference": "08b9e0a763b54a685404dea523a9c54242fbe1b9", - "shasum": null + "reference": "08b9e0a763b54a685404dea523a9c54242fbe1b9" }, "type": "bower-asset" }, @@ -104,8 +102,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/9e8ec3d10fad04748176144f108d7355662ae75e", - "reference": "9e8ec3d10fad04748176144f108d7355662ae75e", - "shasum": null + "reference": "9e8ec3d10fad04748176144f108d7355662ae75e" }, "type": "bower-asset", "license": [ @@ -123,8 +120,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/kenwheeler/slick/zipball/0f40c9d6a02a5c08b5f4dd80fdada3a854a59bee", - "reference": "0f40c9d6a02a5c08b5f4dd80fdada3a854a59bee", - "shasum": null + "reference": "0f40c9d6a02a5c08b5f4dd80fdada3a854a59bee" }, "require": { "bower-asset/jquery": ">=1.7" @@ -1182,16 +1178,16 @@ }, { "name": "drupal/core", - "version": "8.6.x-dev", + "version": "8.6.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "a01225adc25dd2bfa96855596b0ca0488c1b8ffd" + "reference": "59568ac02948cf075ee8543e6c6d4386ad8daec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/a01225adc25dd2bfa96855596b0ca0488c1b8ffd", - "reference": "a01225adc25dd2bfa96855596b0ca0488c1b8ffd", + "url": "https://api.github.com/repos/drupal/core/zipball/59568ac02948cf075ee8543e6c6d4386ad8daec1", + "reference": "59568ac02948cf075ee8543e6c6d4386ad8daec1", "shasum": "" }, "require": { @@ -1396,6 +1392,7 @@ "merge-extra": false }, "patches_applied": { + "3032548 - ContentModerationRouteSubscriber assumes all parameters in an entity form route contain a 'type' key": "https://www.drupal.org/files/issues/2019-02-13/3032548-2.patch", "2869592 - Disabled update module shouldn't produce a status report warning": "https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch", "2885441 - EntityReferenceAutocompleteWidget should define its size setting as an integer": "https://www.drupal.org/files/issues/2885441-2.patch", "2815221 - Add quickedit to the latest-revision route": "https://www.drupal.org/files/issues/2018-09-24/2815221-109.patch", @@ -1424,7 +1421,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2019-02-06T17:07:34+00:00" + "time": "2019-02-20T18:35:01+00:00" }, { "name": "drupal/crop", @@ -1506,7 +1503,7 @@ }, "drupal": { "version": "8.x-3.0", - "datestamp": "1493401742", + "datestamp": "1549603381", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1589,7 +1586,7 @@ }, "drupal": { "version": "8.x-3.0", - "datestamp": "1493401742", + "datestamp": "1549603381", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1980,7 +1977,7 @@ }, "drupal": { "version": "8.x-2.0", - "datestamp": "1536328684", + "datestamp": "1550236984", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2011,6 +2008,10 @@ "homepage": "https://www.drupal.org/node/1943336/committers", "role": "contributor" }, + { + "name": "Drupal Media Team", + "homepage": "https://www.drupal.org/user/3260690" + }, { "name": "Primsi", "homepage": "https://www.drupal.org/user/282629" @@ -2019,6 +2020,10 @@ "name": "marcingy", "homepage": "https://www.drupal.org/user/77320" }, + { + "name": "oknate", + "homepage": "https://www.drupal.org/user/471638" + }, { "name": "samuel.mortenson", "homepage": "https://www.drupal.org/user/2582268" @@ -2260,20 +2265,20 @@ }, { "name": "drupal/jsonapi", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://git.drupal.org/project/jsonapi", - "reference": "8.x-2.1" + "reference": "8.x-2.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jsonapi-8.x-2.1.zip", - "reference": "8.x-2.1", - "shasum": "8173e0f44cd86752b055f069ce55c5bf7632e719" + "url": "https://ftp.drupal.org/files/projects/jsonapi-8.x-2.3.zip", + "reference": "8.x-2.3", + "shasum": "b5a6e263eb1c238de869b28483e411b1167a8432" }, "require": { - "drupal/core": "^8.5.4" + "drupal/core": "^8.5.11" }, "require-dev": { "drupal/schemata": "1.x-dev#8325d172e1d6880aa24073f8f751ef089282cf9a", @@ -2286,8 +2291,8 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.1", - "datestamp": "1548087544", + "version": "8.x-2.3", + "datestamp": "1550692492", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2385,19 +2390,25 @@ }, { "name": "drupal/lightning_api", - "version": "dev-3.x", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_api", - "reference": "a52c60edecb6237daf6faefad26f3d2617745f8a" + "reference": "8.x-3.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_api-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "967b4321f541476c4bec04b594fd8d2238a37992" }, "require": { "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/consumers": "1.5", "drupal/core": "~8.0", - "drupal/jsonapi": "^2.1", - "drupal/lightning_core": "2.x-dev || 3.x-dev", + "drupal/jsonapi": "^2.3", + "drupal/lightning_core": "^2.13 || ^3.7", "drupal/openapi": "^1.0-beta2", "drupal/openapi_ui_redoc": "^1.0", "drupal/openapi_ui_swagger": "^1.0", @@ -2416,11 +2427,11 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.2+5-dev", - "datestamp": "1549126680", + "version": "8.x-3.4", + "datestamp": "1550696584", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "enable-patching": true, @@ -2494,24 +2505,29 @@ "homepage": "https://www.drupal.org/project/lightning_api", "support": { "source": "http://cgit.drupalcode.org/lightning_api" - }, - "time": "2019-02-02T16:47:52+00:00" + } }, { "name": "drupal/lightning_core", - "version": "dev-3.x", + "version": "3.7.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_core", - "reference": "f4855cd50d4ed9b235d99ac24a63fc88c711848b" + "reference": "8.x-3.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_core-8.x-3.7.zip", + "reference": "8.x-3.7", + "shasum": "b1de42e89cec9037ca4d9d31a5d7cbfbb0597048" }, "require": { "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/acquia_connector": "^1.1", "drupal/contact_storage": "^1.0", - "drupal/core": "8.6.x-dev", - "drupal/metatag": "^1.0", + "drupal/core": "~8.6.10", + "drupal/metatag": "^1.8", "drupal/pathauto": "^1.3", "drupal/search_api": "^1.0", "drupal/token": "^1.0", @@ -2535,11 +2551,11 @@ "dev-8.x-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.5+10-dev", - "datestamp": "1549399980", + "version": "8.x-3.7", + "datestamp": "1550692281", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "drush": { @@ -2573,6 +2589,7 @@ ], "patches": { "drupal/core": { + "3032548 - ContentModerationRouteSubscriber assumes all parameters in an entity form route contain a 'type' key": "https://www.drupal.org/files/issues/2019-02-13/3032548-2.patch", "2869592 - Disabled update module shouldn't produce a status report warning": "https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch", "2885441 - EntityReferenceAutocompleteWidget should define its size setting as an integer": "https://www.drupal.org/files/issues/2885441-2.patch", "2815221 - Add quickedit to the latest-revision route": "https://www.drupal.org/files/issues/2018-09-24/2815221-109.patch", @@ -2629,16 +2646,21 @@ "homepage": "https://www.drupal.org/project/lightning_core", "support": { "source": "http://cgit.drupalcode.org/lightning_core" - }, - "time": "2019-02-06T19:27:24+00:00" + } }, { "name": "drupal/lightning_layout", - "version": "dev-1.x", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_layout", - "reference": "7680f8a255febfb2cb078ef3e18a4f73a2a193fc" + "reference": "8.x-1.6" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_layout-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "4a2d63dbdb912314cff7a46dd31fdc2c7c53cc0d" }, "require": { "cweagans/composer-patches": "^1.6.4", @@ -2646,7 +2668,7 @@ "drupal/core": "~8.0", "drupal/ctools": "^3.0", "drupal/entity_block": "^1.0", - "drupal/lightning_core": "1.x-dev || 2.x-dev || 3.x-dev", + "drupal/lightning_core": "^1.0-rc7 || ^2.12 || ^3.5", "drupal/panelizer": "^4.1", "drupal/panelizer_quickedit": "*", "drupal/panels": "4.3", @@ -2662,11 +2684,11 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.6+2-dev", - "datestamp": "1548784980", + "version": "8.x-1.6", + "datestamp": "1547669623", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "enable-patching": true, @@ -2748,16 +2770,21 @@ "homepage": "https://www.drupal.org/project/lightning_layout", "support": { "source": "http://cgit.drupalcode.org/lightning_layout" - }, - "time": "2019-01-29T17:59:02+00:00" + } }, { "name": "drupal/lightning_media", - "version": "dev-3.x", + "version": "3.6.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_media", - "reference": "cd3009cea7d6ffaf9972affe9a808db877a4e4bb" + "reference": "8.x-3.6" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_media-8.x-3.6.zip", + "reference": "8.x-3.6", + "shasum": "687cab8e173e24256e03aca6f8204520c0199e80" }, "require": { "bower-asset/cropper": "^2.3", @@ -2774,7 +2801,7 @@ "drupal/image_widget_crop": "^2.1", "drupal/inline_entity_form": "^1.0", "drupal/libraries": "3.0-alpha1", - "drupal/lightning_core": "3.x-dev", + "drupal/lightning_core": "^3.6", "drupal/media_entity_instagram": "2.0.0-alpha2", "drupal/media_entity_twitter": "2.0.0-alpha2", "drupal/slick_entityreference": "^1.1", @@ -2786,13 +2813,13 @@ "require-dev": { "acquia/lightning_dev": "dev-8.x-1.x", "drupal/dropzonejs": "*", + "drupal/facets": "^1.2", "drupal/libraries": "*", "drupal/media_entity_instagram": "*", "drupal/media_entity_twitter": "*", "drupal/schema_metatag": "^1.3", "drupal/slick_entityreference": "*", - "drupal/video_embed_media-video_embed_media": "*", - "enm1989/chromedriver": "^2.41" + "drupal/video_embed_media-video_embed_media": "*" }, "type": "drupal-module", "extra": { @@ -2800,11 +2827,11 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.5+1-dev", - "datestamp": "1547671380", + "version": "8.x-3.6", + "datestamp": "1550164383", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "enable-patching": true, @@ -2817,10 +2844,6 @@ "type:bower-asset", "type:npm-asset" ], - "docroot/modules/contrib/acquia/{$name}": [ - "drupal/lightning_core", - "drupal/lightning_media" - ], "docroot/modules/contrib/{$name}": [ "type:drupal-module" ], @@ -2890,23 +2913,28 @@ "homepage": "https://www.drupal.org/project/lightning_media", "support": { "source": "http://cgit.drupalcode.org/lightning_media" - }, - "time": "2019-01-16T20:42:38+00:00" + } }, { "name": "drupal/lightning_workflow", - "version": "dev-3.x", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_workflow", - "reference": "77f91bb9f0a4ed909c777ea29b2824511c63d337" + "reference": "8.x-3.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_workflow-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "09a6e3776dd5ce04675ac2de8872454638e033b8" }, "require": { "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/core": "*", "drupal/diff": "^1.0", - "drupal/lightning_core": "3.x-dev", + "drupal/lightning_core": "^3.6", "drupal/moderation_dashboard": "^1.0", "drupal/moderation_sidebar": "^1.0", "oomphinc/composer-installers-extender": "^1.1" @@ -2925,11 +2953,11 @@ "dev-8.x-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.3+1-dev", - "datestamp": "1547671980", + "version": "8.x-3.4", + "datestamp": "1550178780", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "enable-patching": true, @@ -3002,8 +3030,7 @@ "homepage": "https://www.drupal.org/project/lightning_workflow", "support": { "source": "http://cgit.drupalcode.org/lightning_workflow" - }, - "time": "2019-01-25T16:40:12+00:00" + } }, { "name": "drupal/media_entity_instagram", @@ -3130,17 +3157,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": "*", @@ -3162,8 +3189,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" @@ -4258,22 +4285,22 @@ }, { "name": "drupal/simple_oauth", - "version": "3.13.0", + "version": "3.14.0", "source": { "type": "git", "url": "https://git.drupal.org/project/simple_oauth", - "reference": "8.x-3.13" + "reference": "8.x-3.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_oauth-8.x-3.13.zip", - "reference": "8.x-3.13", - "shasum": "45de37b97529587be9a3ad579bbab94edcc6d8fe" + "url": "https://ftp.drupal.org/files/projects/simple_oauth-8.x-3.14.zip", + "reference": "8.x-3.14", + "shasum": "825f726e7f033150d4702ad773259ab7deb3fb6c" }, "require": { "drupal/consumers": "^1.2", "drupal/core": "^8.3", - "league/oauth2-server": "~6.0" + "league/oauth2-server": "^7.1" }, "type": "drupal-module", "extra": { @@ -4281,8 +4308,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.13", - "datestamp": "1546204080", + "version": "8.x-3.14", + "datestamp": "1549832280", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4312,7 +4339,7 @@ }, { "name": "drupal/simple_oauth_extras", - "version": "3.13.0", + "version": "3.14.0", "require": { "drupal/core": "~8.0", "drupal/simple_oauth": "self.version" @@ -4323,8 +4350,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.13", - "datestamp": "1546204080", + "version": "8.x-3.14", + "datestamp": "1549832280", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5199,34 +5226,37 @@ }, { "name": "league/oauth2-server", - "version": "6.1.1", + "version": "7.3.2", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "a0cabb573c7cd5ee01803daec992d6ee3677c4ae" + "reference": "b71f382cd76e3f6905dfc53ef8148b3eebe1fd41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/a0cabb573c7cd5ee01803daec992d6ee3677c4ae", - "reference": "a0cabb573c7cd5ee01803daec992d6ee3677c4ae", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/b71f382cd76e3f6905dfc53ef8148b3eebe1fd41", + "reference": "b71f382cd76e3f6905dfc53ef8148b3eebe1fd41", "shasum": "" }, "require": { "defuse/php-encryption": "^2.1", "ext-openssl": "*", - "lcobucci/jwt": "^3.1", + "lcobucci/jwt": "^3.2.2", "league/event": "^2.1", - "paragonie/random_compat": "^2.0", - "php": ">=5.6.0", - "psr/http-message": "^1.0" + "php": ">=7.0.0", + "psr/http-message": "^1.0.1" }, "replace": { "league/oauth2server": "*", "lncd/oauth2": "*" }, "require-dev": { - "phpunit/phpunit": "^4.8.38 || ^5.7.21", - "zendframework/zend-diactoros": "^1.0" + "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan-phpunit": "^0.9.4", + "phpstan/phpstan-strict-rules": "^0.9.0", + "phpunit/phpunit": "^6.3 || ^7.0", + "roave/security-advisories": "dev-master", + "zendframework/zend-diactoros": "^1.3.2" }, "type": "library", "autoload": { @@ -5244,6 +5274,12 @@ "email": "hello@alexbilbie.com", "homepage": "http://www.alexbilbie.com", "role": "Developer" + }, + { + "name": "Andy Millington", + "email": "andrew@noexceptions.io", + "homepage": "https://www.noexceptions.io", + "role": "Developer" } ], "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.", @@ -5263,7 +5299,7 @@ "secure", "server" ], - "time": "2017-12-23T23:33:42+00:00" + "time": "2018-11-21T21:42:43+00:00" }, { "name": "masterminds/html5", @@ -5907,16 +5943,16 @@ }, { "name": "swagger-api/swagger-ui", - "version": "v3.20.5", + "version": "v3.20.8", "source": { "type": "git", "url": "https://github.com/swagger-api/swagger-ui.git", - "reference": "f69624bbedb3b95eb1ef4b89d963dd3e9d99d8ba" + "reference": "85d82fc0a82cb0325ace31780ae5f174cb8bcdf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/f69624bbedb3b95eb1ef4b89d963dd3e9d99d8ba", - "reference": "f69624bbedb3b95eb1ef4b89d963dd3e9d99d8ba", + "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/85d82fc0a82cb0325ace31780ae5f174cb8bcdf3", + "reference": "85d82fc0a82cb0325ace31780ae5f174cb8bcdf3", "shasum": "" }, "type": "library", @@ -5960,7 +5996,7 @@ "swagger", "ui" ], - "time": "2019-01-12T07:08:55+00:00" + "time": "2019-02-16T02:50:26+00:00" }, { "name": "symfony-cmf/routing", @@ -8436,16 +8472,16 @@ }, { "name": "consolidation/config", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c" + "reference": "11ab7ecd19131ce084390171b9c070eedecf7dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c", + "url": "https://api.github.com/repos/consolidation/config/zipball/11ab7ecd19131ce084390171b9c070eedecf7dab", + "reference": "11ab7ecd19131ce084390171b9c070eedecf7dab", "shasum": "" }, "require": { @@ -8454,9 +8490,9 @@ "php": ">=5.4.0" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5", - "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", "symfony/yaml": "^2.8.11|^3|^4" @@ -8466,6 +8502,33 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -8486,7 +8549,7 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-10-24T17:55:35+00:00" + "time": "2019-02-16T01:18:47+00:00" }, { "name": "consolidation/log", @@ -8636,16 +8699,16 @@ }, { "name": "consolidation/robo", - "version": "1.4.3", + "version": "1.4.6", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "d0b6f516ec940add7abed4f1432d30cca5f8ae0c" + "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/d0b6f516ec940add7abed4f1432d30cca5f8ae0c", - "reference": "d0b6f516ec940add7abed4f1432d30cca5f8ae0c", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3", + "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3", "shasum": "" }, "require": { @@ -8676,7 +8739,7 @@ "natxet/cssmin": "3.0.4", "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", - "pear/archive_tar": "^1.4.2", + "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", "phpunit/php-code-coverage": "~2|~4", "squizlabs/php_codesniffer": "^2.8" @@ -8740,7 +8803,7 @@ } ], "description": "Modern task runner", - "time": "2019-01-02T21:33:28+00:00" + "time": "2019-02-17T05:32:27+00:00" }, { "name": "consolidation/self-update", @@ -10648,16 +10711,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.2.0", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a" + "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/594bcae1fc0bccd3993d2f0d61a018e26ac2865a", - "reference": "594bcae1fc0bccd3993d2f0d61a018e26ac2865a", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0", + "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0", "shasum": "" }, "require": { @@ -10695,7 +10758,7 @@ "parser", "php" ], - "time": "2019-01-12T16:31:37+00:00" + "time": "2019-02-16T20:54:15+00:00" }, { "name": "phar-io/manifest", @@ -11252,6 +11315,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2018-08-09T05:50:03+00:00" }, { @@ -12682,12 +12746,12 @@ "source": { "type": "git", "url": "https://gitlab.com/weitzman/drupal-test-traits.git", - "reference": "83a206d0b5a18f3e86c29d5887a4a83bbf3fca06" + "reference": "42aa980ee1a2f52aa3b29db2d5041ddaec47d0be" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=83a206d0b5a18f3e86c29d5887a4a83bbf3fca06", - "reference": "83a206d0b5a18f3e86c29d5887a4a83bbf3fca06", + "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=42aa980ee1a2f52aa3b29db2d5041ddaec47d0be", + "reference": "42aa980ee1a2f52aa3b29db2d5041ddaec47d0be", "shasum": "" }, "require": { @@ -12731,17 +12795,12 @@ } ], "description": "Traits for testing Drupal sites that have user content (versus unpopulated sites).", - "time": "2019-02-04T15:46:51+00:00" + "time": "2019-02-09T14:22:39+00:00" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/lightning_api": 20, - "drupal/lightning_core": 20, - "drupal/lightning_layout": 20, - "drupal/lightning_media": 20, - "drupal/lightning_workflow": 20, "acquia/lightning_dev": 20, "drupal/media_entity_generic": 20 }, diff --git a/drupal-org-core.make b/drupal-org-core.make index 58eb1bd2a..9a325d19c 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -3,7 +3,9 @@ api = 2 projects[drupal][type] = core projects[drupal][download][type] = git projects[drupal][download][url] = https://git.drupal.org/project/drupal.git -projects[drupal][download][branch] = 8.6.x +projects[drupal][download][branch] = 8.6.10 +projects[drupal][download][tag] = 8.6.10 +projects[drupal][patch][] = https://www.drupal.org/files/issues/2019-02-13/3032548-2.patch projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch projects[drupal][patch][] = https://www.drupal.org/files/issues/2885441-2.patch projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-09-24/2815221-109.patch diff --git a/drupal-org.make b/drupal-org.make index 13027e985..4e7a5f335 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -33,40 +33,25 @@ projects[image_widget_crop][version] = 2.2 projects[inline_entity_form][type] = module projects[inline_entity_form][version] = 1.0-rc1 projects[jsonapi][type] = module -projects[jsonapi][version] = 2.1 +projects[jsonapi][version] = 2.3 projects[libraries][type] = module projects[libraries][version] = 3.0-alpha1 projects[lightning_api][type] = module -projects[lightning_api][download][type] = git -projects[lightning_api][download][url] = https://git.drupal.org/project/lightning_api -projects[lightning_api][download][branch] = 3.x -projects[lightning_api][download][revision] = a52c60edecb6237daf6faefad26f3d2617745f8a +projects[lightning_api][version] = 3.4 projects[lightning_core][type] = module -projects[lightning_core][download][type] = git -projects[lightning_core][download][url] = https://git.drupal.org/project/lightning_core -projects[lightning_core][download][branch] = 3.x -projects[lightning_core][download][revision] = f4855cd50d4ed9b235d99ac24a63fc88c711848b +projects[lightning_core][version] = 3.7 projects[lightning_layout][type] = module -projects[lightning_layout][download][type] = git -projects[lightning_layout][download][url] = https://git.drupal.org/project/lightning_layout -projects[lightning_layout][download][branch] = 1.x -projects[lightning_layout][download][revision] = 7680f8a255febfb2cb078ef3e18a4f73a2a193fc +projects[lightning_layout][version] = 1.6 projects[lightning_media][type] = module -projects[lightning_media][download][type] = git -projects[lightning_media][download][url] = https://git.drupal.org/project/lightning_media -projects[lightning_media][download][branch] = 3.x -projects[lightning_media][download][revision] = cd3009cea7d6ffaf9972affe9a808db877a4e4bb +projects[lightning_media][version] = 3.6 projects[lightning_workflow][type] = module -projects[lightning_workflow][download][type] = git -projects[lightning_workflow][download][url] = https://git.drupal.org/project/lightning_workflow -projects[lightning_workflow][download][branch] = 3.x -projects[lightning_workflow][download][revision] = 77f91bb9f0a4ed909c777ea29b2824511c63d337 +projects[lightning_workflow][version] = 3.4 projects[media_entity_instagram][type] = module projects[media_entity_instagram][version] = 2.0-alpha2 projects[media_entity_twitter][type] = module projects[media_entity_twitter][version] = 2.0-alpha2 projects[metatag][type] = module -projects[metatag][version] = 1.7 +projects[metatag][version] = 1.8 projects[moderation_dashboard][type] = module projects[moderation_dashboard][version] = 1.0-beta1 projects[moderation_sidebar][type] = module @@ -97,7 +82,7 @@ projects[search_api][version] = 1.11 projects[search_api_solr][type] = module projects[search_api_solr][version] = 1.2 projects[simple_oauth][type] = module -projects[simple_oauth][version] = 3.13 +projects[simple_oauth][version] = 3.14 projects[slick][type] = module projects[slick][version] = 1.1 projects[slick_entityreference][type] = module diff --git a/lightning.info.yml b/lightning.info.yml index a2f57602a..10fef8a1d 100644 --- a/lightning.info.yml +++ b/lightning.info.yml @@ -2,7 +2,7 @@ name: Lightning core: 8.x type: profile description: 'A fast and feature-rich Drupal distribution.' -version: '8.x-3.x-dev' +version: '8.x-3.206' install: - block_content - breakpoint @@ -63,4 +63,4 @@ themes: - bartik - seven project: lightning -datestamp: '1549487700' +datestamp: '1550696865' diff --git a/modules/lightning_install/lightning_install.info.yml b/modules/lightning_install/lightning_install.info.yml index bd2c68ca1..8205b9c8e 100644 --- a/modules/lightning_install/lightning_install.info.yml +++ b/modules/lightning_install/lightning_install.info.yml @@ -4,4 +4,4 @@ type: module hidden: true package: Lightning description: 'Provides helpful under-the-hood functionality used while installing Lightning.' -version: '8.x-3.x-dev' +version: '8.x-3.206' diff --git a/tests/fixtures/3.2.6.php.gz b/tests/fixtures/3.2.6.php.gz new file mode 100644 index 000000000..13c166acb Binary files /dev/null and b/tests/fixtures/3.2.6.php.gz differ diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml index 6687af086..483bd8c02 100644 --- a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml +++ b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml @@ -4,4 +4,4 @@ type: module hidden: true dependencies: - test_ced013a5 -version: '8.x-3.x-dev' +version: '8.x-3.206' diff --git a/tests/modules/view_mode_test/view_mode_test.info.yml b/tests/modules/view_mode_test/view_mode_test.info.yml index 38001fd98..57f7f04c9 100644 --- a/tests/modules/view_mode_test/view_mode_test.info.yml +++ b/tests/modules/view_mode_test/view_mode_test.info.yml @@ -5,4 +5,4 @@ hidden: true dependencies: - lightning_core - node -version: '8.x-3.x-dev' +version: '8.x-3.206'