From d321bd9cae3a01ce39ad50162e11e206d0eaae13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Fri, 20 Mar 2020 14:28:52 -0400 Subject: [PATCH] Update composer lock + Drupal scaffolding files with 8.8 Ref #109 --- composer.lock | 332 ++++++++++++++++--------------------------------- web/.htaccess | 2 +- web/web.config | 2 +- 3 files changed, 110 insertions(+), 226 deletions(-) diff --git a/composer.lock b/composer.lock index c066ac2..e524bd8 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": "cc64f21a77703ab4b0ffe17413e50037", + "content-hash": "ed5c4c8d99c6ccbef89c060d948b58b6", "packages": [ { "name": "asm89/stack-cors", @@ -58,42 +58,6 @@ ], "time": "2019-12-24T22:41:47+00:00" }, - { - "name": "brumann/polyfill-unserialize", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/dbrumann/polyfill-unserialize.git", - "reference": "8ed1cd343ddc134a7ef649aca0aa0fe2a1b45008" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dbrumann/polyfill-unserialize/zipball/8ed1cd343ddc134a7ef649aca0aa0fe2a1b45008", - "reference": "8ed1cd343ddc134a7ef649aca0aa0fe2a1b45008", - "shasum": "" - }, - "require": { - "php": "^5.3|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Brumann\\Polyfill\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Denis Brumann", - "email": "denis.brumann@sensiolabs.de" - } - ], - "description": "Backports unserialize options introduced in PHP 7.0 to older PHP versions.", - "time": "2019-07-14T23:16:24+00:00" - }, { "name": "chi-teck/drupal-code-generator", "version": "1.31.0", @@ -2026,7 +1990,7 @@ }, "drupal": { "version": "8.x-1.8", - "datestamp": "1582913039", + "datestamp": "1583988119", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2595,70 +2559,6 @@ "source": "https://git.drupalcode.org/project/ckeditorheight" } }, - { - "name": "drupal/claro", - "version": "1.0.0-beta1", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/claro.git", - "reference": "8.x-1.0-beta1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/claro-8.x-1.0-beta1.zip", - "reference": "8.x-1.0-beta1", - "shasum": "4037cdaabf47990ab6b0df009c62381e108483e0" - }, - "require": { - "drupal/core": "~8.0" - }, - "type": "drupal-theme", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, - "drupal": { - "version": "8.x-1.0-beta1", - "datestamp": "1571034184", - "security-coverage": { - "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." - } - }, - "patches_applied": { - "Broken Dropdown prevents Save": "https://www.drupal.org/files/issues/2019-09-18/broken-dropbutton-3079128.patch" - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "ckrina", - "homepage": "https://www.drupal.org/user/1206650" - }, - { - "name": "huzooka", - "homepage": "https://www.drupal.org/user/281301" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "saschaeggi", - "homepage": "https://www.drupal.org/user/1999056" - } - ], - "description": "A clean, accessible, and powerful Drupal administration theme.", - "homepage": "https://www.drupal.org/project/claro", - "support": { - "source": "https://git.drupalcode.org/project/claro", - "docs": "https://www.drupal.org/docs/8/modules/claro", - "issues": "https://www.drupal.org/project/issues/claro" - } - }, { "name": "drupal/classitup", "version": "dev-8.x-1.x", @@ -3138,7 +3038,7 @@ ], "authors": [ { - "name": "axel.rutz", + "name": "geek-merlin", "homepage": "https://www.drupal.org/user/229048" }, { @@ -3517,23 +3417,23 @@ }, { "name": "drupal/core", - "version": "8.7.12", + "version": "8.8.4", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "412ac47f5a17a718617a844504db15208ff61245" + "reference": "34e59fcf702c1b3c497bbd6e92e68e546c5d15b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/412ac47f5a17a718617a844504db15208ff61245", - "reference": "412ac47f5a17a718617a844504db15208ff61245", + "url": "https://api.github.com/repos/drupal/core/zipball/34e59fcf702c1b3c497bbd6e92e68e546c5d15b8", + "reference": "34e59fcf702c1b3c497bbd6e92e68e546c5d15b8", "shasum": "" }, "require": { "asm89/stack-cors": "^1.1", "composer/semver": "^1.0", - "doctrine/annotations": "^1.2", - "doctrine/common": "^2.5", + "doctrine/annotations": "^1.4", + "doctrine/common": "^2.7", "easyrdf/easyrdf": "^0.9", "egulias/email-validator": "^2.0", "ext-date": "*", @@ -3549,11 +3449,10 @@ "ext-spl": "*", "ext-tokenizer": "*", "ext-xml": "*", - "guzzlehttp/guzzle": "^6.2.1", + "guzzlehttp/guzzle": "^6.3", "masterminds/html5": "^2.1", - "paragonie/random_compat": "^1.0|^2.0|^9.99.99", "pear/archive_tar": "^1.4.9", - "php": "^5.5.9|>=7.0.8", + "php": ">=7.0.8", "stack/builder": "^1.0", "symfony-cmf/routing": "^1.4", "symfony/class-loader": "~3.4.0", @@ -3571,13 +3470,13 @@ "symfony/validator": "~3.4.0", "symfony/yaml": "~3.4.5", "twig/twig": "^1.38.2", - "typo3/phar-stream-wrapper": "^2.1.1", - "zendframework/zend-diactoros": "^1.1", - "zendframework/zend-feed": "^2.4" + "typo3/phar-stream-wrapper": "^3.1.3", + "zendframework/zend-diactoros": "^1.8", + "zendframework/zend-feed": "^2.12" }, "conflict": { - "drush/drush": "<8.1.10", - "symfony/dom-crawler": ">=4" + "drupal/pathauto": "<1.6", + "drush/drush": "<8.1.10" }, "replace": { "drupal/action": "self.version", @@ -3593,6 +3492,7 @@ "drupal/book": "self.version", "drupal/breakpoint": "self.version", "drupal/ckeditor": "self.version", + "drupal/claro": "self.version", "drupal/classy": "self.version", "drupal/color": "self.version", "drupal/comment": "self.version", @@ -3612,6 +3512,7 @@ "drupal/core-discovery": "self.version", "drupal/core-event-dispatcher": "self.version", "drupal/core-file-cache": "self.version", + "drupal/core-file-security": "self.version", "drupal/core-filesystem": "self.version", "drupal/core-gettext": "self.version", "drupal/core-graph": "self.version", @@ -3639,6 +3540,7 @@ "drupal/forum": "self.version", "drupal/hal": "self.version", "drupal/help": "self.version", + "drupal/help_topics": "self.version", "drupal/history": "self.version", "drupal/image": "self.version", "drupal/inline_form_errors": "self.version", @@ -3661,6 +3563,7 @@ "drupal/options": "self.version", "drupal/page_cache": "self.version", "drupal/path": "self.version", + "drupal/path_alias": "self.version", "drupal/quickedit": "self.version", "drupal/rdf": "self.version", "drupal/responsive_image": "self.version", @@ -3689,56 +3592,36 @@ "drupal/workflows": "self.version", "drupal/workspaces": "self.version" }, - "require-dev": { - "behat/mink": "1.7.x-dev", - "behat/mink-goutte-driver": "^1.2", - "behat/mink-selenium2-driver": "1.3.x-dev", - "drupal/coder": "^8.3.1", - "jcalderonzumba/gastonjs": "^1.0.2", - "jcalderonzumba/mink-phantomjs-driver": "^0.3.1", - "justinrainbow/json-schema": "^5.2", - "mikey179/vfsstream": "^1.2", - "phpspec/prophecy": "^1.7", - "phpunit/phpunit": "^4.8.35 || ^6.5", - "symfony/css-selector": "^3.4.0", - "symfony/debug": "^3.4.0", - "symfony/phpunit-bridge": "^3.4.3" - }, "type": "drupal-core", "extra": { - "merge-plugin": { - "require": [ - "core/lib/Drupal/Component/Annotation/composer.json", - "core/lib/Drupal/Component/Assertion/composer.json", - "core/lib/Drupal/Component/Bridge/composer.json", - "core/lib/Drupal/Component/ClassFinder/composer.json", - "core/lib/Drupal/Component/Datetime/composer.json", - "core/lib/Drupal/Component/DependencyInjection/composer.json", - "core/lib/Drupal/Component/Diff/composer.json", - "core/lib/Drupal/Component/Discovery/composer.json", - "core/lib/Drupal/Component/EventDispatcher/composer.json", - "core/lib/Drupal/Component/FileCache/composer.json", - "core/lib/Drupal/Component/FileSystem/composer.json", - "core/lib/Drupal/Component/Gettext/composer.json", - "core/lib/Drupal/Component/Graph/composer.json", - "core/lib/Drupal/Component/HttpFoundation/composer.json", - "core/lib/Drupal/Component/PhpStorage/composer.json", - "core/lib/Drupal/Component/Plugin/composer.json", - "core/lib/Drupal/Component/ProxyBuilder/composer.json", - "core/lib/Drupal/Component/Render/composer.json", - "core/lib/Drupal/Component/Serialization/composer.json", - "core/lib/Drupal/Component/Transliteration/composer.json", - "core/lib/Drupal/Component/Utility/composer.json", - "core/lib/Drupal/Component/Uuid/composer.json", - "core/lib/Drupal/Component/Version/composer.json" - ], - "recurse": false, - "replace": false, - "merge-extra": false + "drupal-scaffold": { + "file-mapping": { + "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig", + "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes", + "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc", + "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore", + "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json", + "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php", + "[web-root]/.htaccess": "assets/scaffold/files/htaccess", + "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore", + "[web-root]/index.php": "assets/scaffold/files/index.php", + "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt", + "[web-root]/README.txt": "assets/scaffold/files/drupal.README.txt", + "[web-root]/robots.txt": "assets/scaffold/files/robots.txt", + "[web-root]/update.php": "assets/scaffold/files/update.php", + "[web-root]/web.config": "assets/scaffold/files/web.config", + "[web-root]/sites/README.txt": "assets/scaffold/files/sites.README.txt", + "[web-root]/sites/development.services.yml": "assets/scaffold/files/development.services.yml", + "[web-root]/sites/example.settings.local.php": "assets/scaffold/files/example.settings.local.php", + "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php", + "[web-root]/sites/default/default.services.yml": "assets/scaffold/files/default.services.yml", + "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php", + "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt", + "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt", + "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt" + } }, - "patches_applied": { - "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch" - } + "patches_applied": [] }, "autoload": { "psr-4": { @@ -3761,7 +3644,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2020-03-18T16:27:19+00:00" + "time": "2020-03-18T16:26:33+00:00" }, { "name": "drupal/crop", @@ -4501,22 +4384,22 @@ }, { "name": "drupal/drutopia_core", - "version": "1.0.0-beta3", + "version": "1.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/drutopia_core.git", - "reference": "8.x-1.0-beta3" + "reference": "8.x-1.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/drutopia_core-8.x-1.0-beta3.zip", - "reference": "8.x-1.0-beta3", - "shasum": "4cba6ea64c485fcfbabc04335e059b0a646c83eb" + "url": "https://ftp.drupal.org/files/projects/drutopia_core-8.x-1.0-rc1.zip", + "reference": "8.x-1.0-rc1", + "shasum": "ec4b9d5a504f2c2aea861b941957141300be4170" }, "require": { "drupal/config_actions": "^1.0", "drupal/config_perms": "^2.0-beta1", - "drupal/core": "^8.6", + "drupal/core": "^8.8", "drupal/crop": "^1.5", "drupal/default_content": "^1.0-alpha8", "drupal/ds": "^3.1", @@ -4536,8 +4419,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-beta3", - "datestamp": "1559250481", + "version": "8.x-1.0-rc1", + "datestamp": "1584728135", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -4549,9 +4432,6 @@ }, "drupal/facets": { "Hide facets when it is configured to hide the block without losing support for bigpipe and ajax facets": "https://www.drupal.org/files/issues/2019-04-08/facets-empty-block-2984465-26.patch" - }, - "drupal/search_api": { - "Notice: Undefined index: total When we enable the module in the installation step": "https://www.drupal.org/files/issues/2931562-13--undefined_total_in_task_manager_batch_finish.patch" } }, "patches_applied": { @@ -7204,12 +7084,12 @@ "homepage": "https://www.drupal.org/user/369147" }, { - "name": "gcb", - "homepage": "https://www.drupal.org/user/1682976" + "name": "brendanthinkshout", + "homepage": "https://www.drupal.org/user/3578399" }, { - "name": "julia.leah.ford", - "homepage": "https://www.drupal.org/user/3590443" + "name": "gcb", + "homepage": "https://www.drupal.org/user/1682976" }, { "name": "levelos", @@ -7219,22 +7099,6 @@ "name": "mshaver", "homepage": "https://www.drupal.org/user/39079" }, - { - "name": "nrackleff", - "homepage": "https://www.drupal.org/user/463332" - }, - { - "name": "rjacobsen0", - "homepage": "https://www.drupal.org/user/3578420" - }, - { - "name": "ruscoe", - "homepage": "https://www.drupal.org/user/2722087" - }, - { - "name": "samuel.mortenson", - "homepage": "https://www.drupal.org/user/2582268" - }, { "name": "tauno", "homepage": "https://www.drupal.org/user/105595" @@ -8500,8 +8364,7 @@ "services": { "drush.services.yml": "^9" } - }, - "patches_applied": [] + } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ @@ -8931,23 +8794,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": "*" @@ -8958,8 +8821,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" @@ -9305,16 +9168,16 @@ }, { "name": "drutopia/drutopia", - "version": "1.0-beta3", + "version": "dev-8.x-1.x", "source": { "type": "git", "url": "https://github.com/drutopia/drutopia.git", - "reference": "67de2873e9a48f02257bb17e8d4f0dea052bae2a" + "reference": "605c93022026d52f61f32a96d991c33e599c54cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drutopia/drutopia/zipball/67de2873e9a48f02257bb17e8d4f0dea052bae2a", - "reference": "67de2873e9a48f02257bb17e8d4f0dea052bae2a", + "url": "https://api.github.com/repos/drutopia/drutopia/zipball/605c93022026d52f61f32a96d991c33e599c54cd", + "reference": "605c93022026d52f61f32a96d991c33e599c54cd", "shasum": "" }, "require": { @@ -9328,7 +9191,7 @@ "drupal/config_actions_provider": "^1.0-rc1", "drupal/config_sync": "^2.0-beta5", "drupal/config_update": "^1.6", - "drupal/core": "^8.7.2", + "drupal/core": "^8.8", "drupal/default_content": "^1.0-alpha8", "drupal/drutopia_action": "^1.0-beta3", "drupal/drutopia_article": "^1.0-beta3", @@ -9375,6 +9238,23 @@ }, "type": "drupal-profile", "extra": { + "installer-paths": { + "web/core": [ + "type:drupal-core" + ], + "web/profiles/{$name}": [ + "type:drupal-profile" + ], + "web/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "web/themes/{$name}": [ + "type:drupal-theme" + ], + "drush/contrib/{$name}": [ + "type:drupal-drush" + ] + }, "patches": { "drupal/ds": { "Parent theme template inheritance bug": "https://www.drupal.org/files/issues/parent_profile_template-2895316-3.patch" @@ -9401,10 +9281,10 @@ ], "description": "Drutopia's base distribution provides an enhanced starting place for building sites for grassroots organizations and other purposes.", "support": { - "source": "https://github.com/drutopia/drutopia/tree/8.x-1.0-beta3", + "source": "https://github.com/drutopia/drutopia/tree/8.x-1.x", "issues": "https://github.com/drutopia/drutopia/issues" }, - "time": "2019-08-26T20:57:59+00:00" + "time": "2020-03-20T17:14:11+00:00" }, { "name": "easyrdf/easyrdf", @@ -12512,31 +12392,35 @@ }, { "name": "typo3/phar-stream-wrapper", - "version": "v2.1.4", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/TYPO3/phar-stream-wrapper.git", - "reference": "ade693720ad562224281f8984319b7337cfae99e" + "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/ade693720ad562224281f8984319b7337cfae99e", - "reference": "ade693720ad562224281f8984319b7337cfae99e", + "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04", + "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04", "shasum": "" }, "require": { - "brumann/polyfill-unserialize": "^1.0", "ext-json": "*", - "php": "^5.3.3|^7.0" + "php": "^7.0" }, "require-dev": { "ext-xdebug": "*", - "phpunit/phpunit": "^4.8.36" + "phpunit/phpunit": "^6.5" }, "suggest": { "ext-fileinfo": "For PHP builtin file type guessing, otherwise uses internal processing" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "v3.x-dev" + } + }, "autoload": { "psr-4": { "TYPO3\\PharStreamWrapper\\": "src/" @@ -12554,7 +12438,7 @@ "security", "stream-wrapper" ], - "time": "2019-12-10T11:53:54+00:00" + "time": "2019-12-10T11:53:27+00:00" }, { "name": "webflo/drupal-finder", @@ -12934,7 +12818,6 @@ ], "minimum-stability": "dev", "stability-flags": { - "drupal/claro": 15, "drupal/classitup": 20, "drupal/comment_notify": 20, "drupal/config_actions": 20, @@ -12946,7 +12829,8 @@ "drupal/menu_link_config": 15, "drupal/prod_check": 15, "drupal/subpathauto": 5, - "drupal/twigsuggest": 20 + "drupal/twigsuggest": 20, + "drutopia/drutopia": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/web/.htaccess b/web/.htaccess index 83cb71a..9a73a3d 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -3,7 +3,7 @@ # # Protect files and directories from prying eyes. - + Require all denied diff --git a/web/web.config b/web/web.config index 3fc5b10..8dff0b2 100644 --- a/web/web.config +++ b/web/web.config @@ -22,7 +22,7 @@ - +