diff --git a/.travis.yml b/.travis.yml index 828a8cfdd..8dc04508e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ php: - 7.0 env: - VERSION=HEAD - - VERSION=3.2.1 + - VERSION=3.2.2 # 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 d6cff71e0..3af5b489e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.2.2 +* Updated Lightning Core to 3.2, which security updates Drupal core + to 8.6.2. + ## 3.2.1 * Updated Lightning Media to 3.1. * Updated Lightning Workflow to 3.1. diff --git a/UPDATE.md b/UPDATE.md index 99cb9bd30..0a778c53a 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -170,6 +170,9 @@ 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.1 to 3.2.2 +There are no manual update steps for this version. + ### 3.2.0 to 3.2.1 * Install the Media Library module (in the "Core (Experimental)" group). Then, for each media type, create a new display, called "Media library", containing diff --git a/build-lightning.make b/build-lightning.make index fec4468ef..af2006d27 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.202 \ No newline at end of file diff --git a/composer.json b/composer.json index 1bbacdfeb..84f19189b 100644 --- a/composer.json +++ b/composer.json @@ -87,11 +87,11 @@ }, "require": { "cweagans/composer-patches": "^1.6.4", - "drupal/lightning_api": "2.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", + "drupal/lightning_api": "^2.7", + "drupal/lightning_core": "^3.2", + "drupal/lightning_layout": "^1.4", + "drupal/lightning_media": "^3.1", + "drupal/lightning_workflow": "^3.1", "drupal-composer/drupal-scaffold": "^2.0.0", "oomphinc/composer-installers-extender": "^1.1" }, diff --git a/composer.lock b/composer.lock index 00e1d8001..0982e8250 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": "5e33fd333a33dd49c70f59101dfc5a8a", + "content-hash": "6b1902d78179112294b27b35b452adf5", "packages": [ { "name": "asm89/stack-cors", @@ -1192,16 +1192,16 @@ }, { "name": "drupal/core", - "version": "8.6.x-dev", + "version": "8.6.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "0da9e4e0edca4c12ab346f52e23bc1c0d8a1bc20" + "reference": "356292934802bb1aecc478e88a3cba77442d7c62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/0da9e4e0edca4c12ab346f52e23bc1c0d8a1bc20", - "reference": "0da9e4e0edca4c12ab346f52e23bc1c0d8a1bc20", + "url": "https://api.github.com/repos/drupal/core/zipball/356292934802bb1aecc478e88a3cba77442d7c62", + "reference": "356292934802bb1aecc478e88a3cba77442d7c62", "shasum": "" }, "require": { @@ -1367,7 +1367,7 @@ "jcalderonzumba/gastonjs": "^1.0.2", "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", "mikey179/vfsstream": "^1.2", - "phpspec/prophecy": "^1.7", + "phpspec/prophecy": "^1.4", "phpunit/phpunit": "^4.8.35 || ^6.5", "symfony/css-selector": "^3.4.0", "symfony/debug": "^3.4.0", @@ -1407,8 +1407,8 @@ "patches_applied": { "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", - "1356276 - Allow profiles to define a base/parent profile and load them in the correct order": "https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch", + "2815221 - Add quickedit to the latest-revision route": "https://www.drupal.org/files/issues/2018-10-17/2815221-reroll-8.6.1.patch", + "1356276 - Allow profiles to define a base/parent profile and load them in the correct order": "https://www.drupal.org/files/issues/2018-10-05/1356276-515.patch", "2914389 - Allow profiles to exclude dependencies of their parent": "https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch", "Test runs can throw exceptions due to missing .htkey file (https://www.drupal.org/project/drupal/issues/2246725#comment-12160940)": "https://www.drupal.org/files/issues/2246725-24.patch" } @@ -1434,7 +1434,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2018-10-08T16:44:31+00:00" + "time": "2018-10-17T22:19:50+00:00" }, { "name": "drupal/crop", @@ -1961,17 +1961,17 @@ }, { "name": "drupal/entity_browser", - "version": "2.0.0", + "version": "2.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupal.org/project/entity_browser", - "reference": "8.x-2.0" + "reference": "8.x-2.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.0.zip", - "reference": "8.x-2.0", - "shasum": "683a7a252c947433c7b78bb838d6d8973c13cf77" + "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.0-alpha2.zip", + "reference": "8.x-2.0-alpha2", + "shasum": "f31ad069e5c5e95db9b9410a4d71038ac0c5b370" }, "require": { "drupal/core": "~8.0" @@ -1989,11 +1989,11 @@ "dev-8.x-1.x": "8.1.x-dev" }, "drupal": { - "version": "8.x-2.0", - "datestamp": "1536328684", + "version": "8.x-2.0-alpha2", + "datestamp": "1528141081", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." } }, "patches_applied": { @@ -2387,18 +2387,24 @@ }, { "name": "drupal/lightning_api", - "version": "dev-2.x", + "version": "2.7.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_api", - "reference": "953d5d4389514940cd90e36a43b4a5bf06e1e00d" + "reference": "8.x-2.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_api-8.x-2.7.zip", + "reference": "8.x-2.7", + "shasum": "432b0d59cf1b863efe950ab0a7a66eda6d4e16b3" }, "require": { "cweagans/composer-patches": "^1.6.4", "drupal-composer/drupal-scaffold": "^2.0.0", "drupal/core": "~8.0", "drupal/jsonapi": "^1.22.0", - "drupal/lightning_core": "2.x-dev || 3.x-dev", + "drupal/lightning_core": "^2.9 || ^3.0", "drupal/openapi": "^1.0-beta2", "drupal/openapi_ui_redoc": "^1.0", "drupal/openapi_ui_swagger": "^1.0", @@ -2408,8 +2414,7 @@ }, "require-dev": { "acquia/lightning_dev": "dev-8.x-1.x", - "drupal/lightning_core": "*", - "drupal/schema_metatag": "^1.3" + "drupal/lightning_core": "*" }, "type": "drupal-module", "extra": { @@ -2417,14 +2422,17 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.7+4-dev", - "datestamp": "1538675280", + "version": "8.x-2.7", + "datestamp": "1535722380", "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, + "installer-types": [ + "bower-asset", + "npm-asset" + ], "installer-paths": { "docroot/core": [ "type:drupal-core" @@ -2444,10 +2452,7 @@ "type:drupal-theme" ] }, - "installer-types": [ - "bower-asset", - "npm-asset" - ] + "enable-patching": true }, "notification-url": "https://packages.drupal.org/8/downloads", "scripts": { @@ -2474,7 +2479,7 @@ ] }, "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -2490,23 +2495,28 @@ "homepage": "https://www.drupal.org/project/lightning_api", "support": { "source": "http://cgit.drupalcode.org/lightning_api" - }, - "time": "2018-10-04T17:41:35+00:00" + } }, { "name": "drupal/lightning_core", - "version": "dev-3.x", + "version": "3.2.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_core", - "reference": "ff6a153b1c946b1ab878edbbcda52be24d2d8c20" + "reference": "8.x-3.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_core-8.x-3.2.zip", + "reference": "8.x-3.2", + "shasum": "f818791a68e72112d5af06db8311f49108ad06df" }, "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/core": "~8.6.2", "drupal/metatag": "^1.0", "drupal/pathauto": "^1.3", "drupal/search_api": "^1.0", @@ -2530,11 +2540,11 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.1+2-dev", - "datestamp": "1537792080", + "version": "8.x-3.2", + "datestamp": "1539817084", "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" } }, "installer-types": [ @@ -2564,8 +2574,8 @@ "drupal/core": { "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", - "1356276 - Allow profiles to define a base/parent profile and load them in the correct order": "https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch", + "2815221 - Add quickedit to the latest-revision route": "https://www.drupal.org/files/issues/2018-10-17/2815221-reroll-8.6.1.patch", + "1356276 - Allow profiles to define a base/parent profile and load them in the correct order": "https://www.drupal.org/files/issues/2018-10-05/1356276-515.patch", "2914389 - Allow profiles to exclude dependencies of their parent": "https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch" } }, @@ -2621,16 +2631,21 @@ "homepage": "https://www.drupal.org/project/lightning_core", "support": { "source": "http://cgit.drupalcode.org/lightning_core" - }, - "time": "2018-09-27T15:05:44+00:00" + } }, { "name": "drupal/lightning_layout", - "version": "dev-1.x", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_layout", - "reference": "3317411b5d4e1ace1a17cbd63d6b92ec46f5c66e" + "reference": "8.x-1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_layout-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "c09c186c30c4dcd9902a141b437d69d02146ef4b" }, "require": { "cweagans/composer-patches": "^1.6.4", @@ -2638,15 +2653,14 @@ "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 || ^2.9 || ^3.0", "drupal/panelizer": "^4.1", "drupal/panelizer_quickedit": "*", "drupal/panels": "4.3", "oomphinc/composer-installers-extender": "^1.1" }, "require-dev": { - "acquia/lightning_dev": "dev-8.x-1.x", - "drupal/schema_metatag": "^1.3" + "acquia/lightning_dev": "dev-8.x-1.x" }, "type": "drupal-module", "extra": { @@ -2654,11 +2668,11 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.4+3-dev", - "datestamp": "1536172380", + "version": "8.x-1.4", + "datestamp": "1535556181", "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" } }, "installer-types": [ @@ -2735,16 +2749,21 @@ "homepage": "https://www.drupal.org/project/lightning_layout", "support": { "source": "http://cgit.drupalcode.org/lightning_layout" - }, - "time": "2018-09-05T18:29:24+00:00" + } }, { "name": "drupal/lightning_media", - "version": "dev-3.x", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_media", - "reference": "7859ab2cc8733fb8586cf757705c27a90c7765d6" + "reference": "8.x-3.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_media-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "d9287269afdfda9bef71297c0183cdad771c9ba5" }, "require": { "bower-asset/cropper": "^2.3", @@ -2756,12 +2775,12 @@ "drupal/crop": "^2.0.0-rc1", "drupal/dropzonejs": "2.0.0-alpha3", "drupal/embed": "^1.0", - "drupal/entity_browser": "2.0.0", + "drupal/entity_browser": "2.0.0-alpha2", "drupal/entity_embed": "1.0.0-beta2", "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.1", "drupal/media_entity_instagram": "2.0.0-alpha1", "drupal/media_entity_twitter": "2.0.0-alpha2", "drupal/slick_entityreference": "^1.1", @@ -2778,7 +2797,7 @@ "drupal/media_entity_twitter": "*", "drupal/schema_metatag": "^1.3", "drupal/slick_entityreference": "*", - "drupal/video_embed_media-video_embed_media": "*", + "drupal/video_embed_media": "*", "enm1989/chromedriver": "^2.41" }, "type": "drupal-module", @@ -2787,11 +2806,11 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.1+3-dev", - "datestamp": "1539091085", + "version": "8.x-3.1", + "datestamp": "1538573880", "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" } }, "installer-types": [ @@ -2871,23 +2890,28 @@ "homepage": "https://www.drupal.org/project/lightning_media", "support": { "source": "http://cgit.drupalcode.org/lightning_media" - }, - "time": "2018-10-09T16:35:09+00:00" + } }, { "name": "drupal/lightning_workflow", - "version": "dev-3.x", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupal.org/project/lightning_workflow", - "reference": "ce7d3fe10c583221afec1336929bf46dbd758799" + "reference": "8.x-3.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/lightning_workflow-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "c57eedada4b8be411fc6954c310e90ccd5b04f55" }, "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.1", "drupal/moderation_dashboard": "1.0.0-alpha1", "drupal/moderation_sidebar": "^1.0", "oomphinc/composer-installers-extender": "^1.1" @@ -2905,11 +2929,11 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.1+2-dev", - "datestamp": "1538415780", + "version": "8.x-3.1", + "datestamp": "1538155380", "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" } }, "installer-types": [ @@ -2966,7 +2990,7 @@ ] }, "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -2982,8 +3006,7 @@ "homepage": "https://www.drupal.org/project/lightning_workflow", "support": { "source": "http://cgit.drupalcode.org/lightning_workflow" - }, - "time": "2018-10-01T17:42:02+00:00" + } }, { "name": "drupal/media_entity_instagram", @@ -3009,7 +3032,7 @@ }, "drupal": { "version": "8.x-2.0-alpha1", - "datestamp": "1506671645", + "datestamp": "1537264380", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -3208,7 +3231,7 @@ "datestamp": "1537899180", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Alpha releases are not covered by Drupal security advisories." } }, "patches_applied": { @@ -7884,12 +7907,12 @@ "source": { "type": "git", "url": "https://github.com/minkphp/MinkSelenium2Driver.git", - "reference": "391cf14385d09570e9f6a7d34e4b5e1a7ebac83d" + "reference": "8684ee4e634db7abda9039ea53545f86fc1e105a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/391cf14385d09570e9f6a7d34e4b5e1a7ebac83d", - "reference": "391cf14385d09570e9f6a7d34e4b5e1a7ebac83d", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/8684ee4e634db7abda9039ea53545f86fc1e105a", + "reference": "8684ee4e634db7abda9039ea53545f86fc1e105a", "shasum": "" }, "require": { @@ -7937,7 +7960,7 @@ "testing", "webdriver" ], - "time": "2018-10-03T14:49:03+00:00" + "time": "2018-10-10T12:39:06+00:00" }, { "name": "behat/transliterator", @@ -8045,19 +8068,20 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "1.26.3", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "8e9782fb77a34a7b976e0d94f71841647558e598" + "reference": "a839bc89d385087d8a7a96a9c1c4bd470ffb627e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/8e9782fb77a34a7b976e0d94f71841647558e598", - "reference": "8e9782fb77a34a7b976e0d94f71841647558e598", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/a839bc89d385087d8a7a96a9c1c4bd470ffb627e", + "reference": "a839bc89d385087d8a7a96a9c1c4bd470ffb627e", "shasum": "" }, "require": { + "ext-json": "*", "php": ">=5.5.9", "symfony/console": "~2.7|^3", "symfony/filesystem": "~2.7|^3", @@ -8085,7 +8109,7 @@ "GPL-2.0-or-later" ], "description": "Drupal code generator", - "time": "2018-09-30T11:28:38+00:00" + "time": "2018-10-11T08:05:59+00:00" }, { "name": "consolidation/annotated-command", @@ -8244,19 +8268,20 @@ }, { "name": "consolidation/output-formatters", - "version": "3.2.1", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" + "reference": "853d2d462a191d44a25a5593d8fe2c4a1e59e382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", - "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/853d2d462a191d44a25a5593d8fe2c4a1e59e382", + "reference": "853d2d462a191d44a25a5593d8fe2c4a1e59e382", "shasum": "" }, "require": { + "dflydev/dot-access-data": "^1.1.0", "php": ">=5.4.0", "symfony/console": "^2.8|^3|^4", "symfony/finder": "^2.5|^3|^4" @@ -8295,7 +8320,7 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2018-05-25T18:02:34+00:00" + "time": "2018-10-16T01:14:51+00:00" }, { "name": "consolidation/robo", @@ -9483,53 +9508,86 @@ }, { "name": "drush/drush", - "version": "9.4.0", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e" + "reference": "17f0106706391675a281c6d212850853bdbe90f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e", - "reference": "9d46a2a67554ae8b6f6edec234a1272c3b4c6a9e", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/17f0106706391675a281c6d212850853bdbe90f9", + "reference": "17f0106706391675a281c6d212850853bdbe90f9", "shasum": "" }, "require": { - "chi-teck/drupal-code-generator": "^1.24.0", + "chi-teck/drupal-code-generator": "^1.27.0", "composer/semver": "^1.4", - "consolidation/annotated-command": "^2.8.1", + "consolidation/annotated-command": "^2.9.1", "consolidation/config": "^1.1.0", "consolidation/output-formatters": "^3.1.12", "consolidation/robo": "^1.1.5", - "consolidation/site-alias": "^1.1.2", + "consolidation/site-alias": "^1.1.5", "ext-dom": "*", "grasmash/yaml-expander": "^1.1.1", "league/container": "~2", "php": ">=5.6.0", "psr/log": "~1.0", "psy/psysh": "~0.6", - "symfony/config": "~2.2|^3", - "symfony/console": "~2.7|^3", - "symfony/event-dispatcher": "~2.7|^3", - "symfony/finder": "~2.7|^3", - "symfony/process": "~2.7|^3", - "symfony/var-dumper": "~2.7|^3|^4", - "symfony/yaml": "~2.3|^3", + "symfony/config": "^3.4", + "symfony/console": "^3.4", + "symfony/event-dispatcher": "^3.4", + "symfony/finder": "^3.4", + "symfony/process": "^3.4", + "symfony/var-dumper": "^3.4", + "symfony/yaml": "^3.4", "webflo/drupal-finder": "^1.1", "webmozart/path-util": "^2.1.0" }, "require-dev": { + "composer/installers": "^1.2", + "cweagans/composer-patches": "~1.0", + "drupal/alinks": "1.0.0", + "drupal/devel": "^1.0@RC", + "drupal/empty_theme": "1.0", "g1a/composer-test-scenarios": "^2.2.0", "lox/xhprof": "dev-master", - "phpunit/phpunit": "^4.8.36|^5.5.4", - "squizlabs/php_codesniffer": "^2.7" + "phpunit/phpunit": "^4.8.36 || ^6.1", + "squizlabs/php_codesniffer": "^2.7", + "vlucas/phpdotenv": "^2.4", + "webflo/drupal-core-strict": "8.6.x-dev" }, "bin": [ "drush" ], "type": "library", "extra": { + "installer-paths": { + "sut/core": [ + "type:drupal-core" + ], + "sut/libraries/{$name}": [ + "type:drupal-library" + ], + "sut/modules/unish/{$name}": [ + "drupal/devel" + ], + "sut/themes/unish/{$name}": [ + "drupal/empty_theme" + ], + "sut/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "sut/profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "sut/themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "sut/drush/contrib/{$name}": [ + "type:drupal-drush" + ] + }, "branch-alias": { "dev-master": "9.x-dev" } @@ -9581,7 +9639,7 @@ ], "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.", "homepage": "http://www.drush.org", - "time": "2018-09-04T17:24:36+00:00" + "time": "2018-10-17T18:37:53+00:00" }, { "name": "enm1989/chromedriver", @@ -9907,33 +9965,34 @@ }, { "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", + "version": "v0.4", "source": { "type": "git", "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", + "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", "shasum": "" }, "require": { - "jakub-onderka/php-console-color": "~0.1", - "php": ">=5.3.0" + "ext-tokenizer": "*", + "jakub-onderka/php-console-color": "~0.2", + "php": ">=5.4.0" }, "require-dev": { "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", + "jakub-onderka/php-parallel-lint": "~1.0", "jakub-onderka/php-var-dump-check": "~0.1", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, "type": "library", "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" + "psr-4": { + "JakubOnderka\\PhpConsoleHighlighter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -9947,7 +10006,8 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20T18:58:01+00:00" + "description": "Highlight PHP code in terminal", + "time": "2018-09-29T18:48:56+00:00" }, { "name": "jcalderonzumba/gastonjs", @@ -10222,16 +10282,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.0.4", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c" + "reference": "d0230c5c77a7e3cfa69446febf340978540958c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fa6ee28600d21d49b2b4e1006b48426cec8e579c", - "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0", + "reference": "d0230c5c77a7e3cfa69446febf340978540958c0", "shasum": "" }, "require": { @@ -10247,7 +10307,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -10269,7 +10329,7 @@ "parser", "php" ], - "time": "2018-09-18T07:03:24+00:00" + "time": "2018-10-10T09:24:14+00:00" }, { "name": "phar-io/manifest", @@ -10830,23 +10890,23 @@ }, { "name": "psy/psysh", - "version": "v0.9.8", + "version": "v0.9.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555" + "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", - "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", + "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1", "ext-json": "*", "ext-tokenizer": "*", - "jakub-onderka/php-console-highlighter": "0.3.*", + "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", "php": ">=5.4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", @@ -10900,7 +10960,7 @@ "interactive", "shell" ], - "time": "2018-09-05T11:40:09+00:00" + "time": "2018-10-13T15:16:03+00:00" }, { "name": "se/selenium-server-standalone", @@ -12317,11 +12377,6 @@ "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, "drupal/media_entity_generic": 20, "acquia/lightning_dev": 20 }, diff --git a/drupal-org-core.make b/drupal-org-core.make index ddbeae465..ae7ce2a2c 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -4,9 +4,10 @@ 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][tag] = 8.6.2 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 -projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch +projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-17/2815221-reroll-8.6.1.patch +projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-05/1356276-515.patch projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch projects[drupal][patch][] = https://www.drupal.org/files/issues/2246725-24.patch \ No newline at end of file diff --git a/drupal-org.make b/drupal-org.make index 007dd3bcf..dac3a1e3e 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -24,7 +24,7 @@ projects[entity_block][version] = 1.0-beta1 projects[entity_browser][type] = module projects[entity_browser][patch][] = https://www.drupal.org/files/issues/entity-browser-view-context-2865928-14.patch projects[entity_browser][patch][] = https://www.drupal.org/files/issues/2877751-27-8.x-2.x.patch -projects[entity_browser][version] = 2.0 +projects[entity_browser][version] = 2.0-alpha2 projects[entity_embed][type] = module projects[entity_embed][patch][] = https://www.drupal.org/files/issues/2832504-2.patch projects[entity_embed][version] = 1.0-beta2 @@ -37,30 +37,15 @@ projects[jsonapi][version] = 1.23 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] = 2.x -projects[lightning_api][download][revision] = 953d5d4389514940cd90e36a43b4a5bf06e1e00d +projects[lightning_api][version] = 2.7 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] = ff6a153b1c946b1ab878edbbcda52be24d2d8c20 +projects[lightning_core][version] = 3.2 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] = 3317411b5d4e1ace1a17cbd63d6b92ec46f5c66e +projects[lightning_layout][version] = 1.4 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] = 7859ab2cc8733fb8586cf757705c27a90c7765d6 +projects[lightning_media][version] = 3.1 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] = ce7d3fe10c583221afec1336929bf46dbd758799 +projects[lightning_workflow][version] = 3.1 projects[media_entity_instagram][type] = module projects[media_entity_instagram][patch][] = https://www.drupal.org/files/issues/2917454-2.patch projects[media_entity_instagram][version] = 2.0-alpha1 diff --git a/lightning.info.yml b/lightning.info.yml index 7d618e4d3..ae46f784f 100644 --- a/lightning.info.yml +++ b/lightning.info.yml @@ -2,9 +2,7 @@ name: Lightning core: 8.x type: profile description: 'A fast and feature-rich Drupal distribution.' -version: '8.x-3.x-dev' -# distribution: -# name: Lightning +version: '8.x-3.202' install: - block_content - breakpoint @@ -64,4 +62,4 @@ themes: - bartik - seven project: lightning -datestamp: '1539112129' +datestamp: '1539819269' diff --git a/modules/lightning_install/lightning_install.info.yml b/modules/lightning_install/lightning_install.info.yml index 3ab09634d..54a0136c2 100644 --- a/modules/lightning_install/lightning_install.info.yml +++ b/modules/lightning_install/lightning_install.info.yml @@ -3,4 +3,5 @@ core: 8.x type: module hidden: true package: Lightning -description: Provides helpful under-the-hood functionality used while installing Lightning. +description: 'Provides helpful under-the-hood functionality used while installing Lightning.' +version: '8.x-3.202' diff --git a/tests/fixtures/3.2.2.sql.gz b/tests/fixtures/3.2.2.sql.gz new file mode 100644 index 000000000..b70297961 Binary files /dev/null and b/tests/fixtures/3.2.2.sql.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..f722a9d17 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.202' 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..0bfa32961 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.202'