diff --git a/composer.json b/composer.json index 924ae53..5c9a6f9 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,8 @@ ], "require": { "php": ">=7.3", + "drupal/core-composer-scaffold": "^9.0", + "composer/installers": "^1.2", "drupal/amswap": "^2.0", "drupal/auto_entitylabel": "^2.x-dev", "drupal/commerce": "^2.16", @@ -31,7 +33,6 @@ "drupal/config_split": "^1.4", "drupal/console": "^1.0.2", "drupal/consumer_image_styles": "^3.0", - "drupal/core": "8.8.10", "drupal/entity_clone": "^1.0", "drupal/error_log": "^1.0", "drupal/field_permissions": "^1.0", @@ -59,7 +60,15 @@ "drupal/translate_side_by_side": "^1.x-dev", "drupal/translation_views": "^1.x-dev", "drupal/ultimate_cron": "^2.x-dev", - "drupal/views_conditional": "^1.x-dev" + "drupal/views_conditional": "^1.x-dev", + "drush/drush": "^9", + "kint-php/kint": "^3.3", + "symfony/event-dispatcher": "4.3.4 as 3.4.99", + "vlucas/phpdotenv": "^2.4", + "webflo/drupal-finder": "^1.0.0", + "webmozart/path-util": "^2.3", + "wikimedia/composer-merge-plugin": "^1.4", + "zaporylie/composer-drupal-optimizations": "^1.0" }, "require-dev": { }, diff --git a/composer.lock b/composer.lock index 230484c..6b28f96 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": "a21c3f46383b23e5d1a9ca82db31b8c3", + "content-hash": "3bd90a32d10079b637960a7d5dc1d5f2", "packages": [ { "name": "alchemy/zippy", @@ -2371,21 +2371,21 @@ }, { "name": "drupal/address", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/address.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/address-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "ded73be392ba9257fca9289719757928a8826275" + "url": "https://ftp.drupal.org/files/projects/address-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "c7e6406d88c6d6be9e8fe0091040d67012bdbf05" }, "require": { "commerceguys/addressing": "^1.0.7", - "drupal/core": "^8.7.7 || ^9" + "drupal/core": "^8.8 || ^9" }, "require-dev": { "drupal/token": "^1.0" @@ -2393,8 +2393,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1583988119", + "version": "8.x-1.9", + "datestamp": "1604422821", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2403,7 +2403,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -3973,7 +3973,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/commerce_pricelist.git", - "reference": "f8f5a277b3a02f3b490a7c9c9c86479e7f7b46ea" + "reference": "63c60db6eee9f25435bb91c82da5f1ff00280b8f" }, "require": { "drupal/commerce": "^2.16", @@ -3987,8 +3987,8 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.0-rc1+15-dev", - "datestamp": "1581597977", + "version": "8.x-2.0-rc2+3-dev", + "datestamp": "1604331494", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -3997,7 +3997,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -4026,7 +4026,7 @@ "support": { "source": "https://git.drupalcode.org/project/commerce_pricelist" }, - "time": "2020-02-13T12:45:56+00:00" + "time": "2020-11-02T15:37:54+00:00" }, { "name": "drupal/commerce_product", @@ -5169,16 +5169,16 @@ }, { "name": "drupal/core", - "version": "8.8.10", + "version": "8.9.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "3df0c753d18bc8982d819f43b47759ae50be94bc" + "reference": "ded1be08c23f19211f9a2514a72e7defb1204efc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/3df0c753d18bc8982d819f43b47759ae50be94bc", - "reference": "3df0c753d18bc8982d819f43b47759ae50be94bc", + "url": "https://api.github.com/repos/drupal/core/zipball/ded1be08c23f19211f9a2514a72e7defb1204efc", + "reference": "ded1be08c23f19211f9a2514a72e7defb1204efc", "shasum": "" }, "require": { @@ -5202,9 +5202,12 @@ "ext-tokenizer": "*", "ext-xml": "*", "guzzlehttp/guzzle": "^6.3", + "laminas/laminas-diactoros": "^1.8", + "laminas/laminas-feed": "^2.12", "masterminds/html5": "^2.1", "pear/archive_tar": "^1.4.9", "php": ">=7.0.8", + "psr/log": "^1.0", "stack/builder": "^1.0", "symfony-cmf/routing": "^1.4", "symfony/class-loader": "~3.4.0", @@ -5222,9 +5225,7 @@ "symfony/validator": "~3.4.0", "symfony/yaml": "~3.4.5", "twig/twig": "^1.38.2", - "typo3/phar-stream-wrapper": "^3.1.3", - "zendframework/zend-diactoros": "^1.8", - "zendframework/zend-feed": "^2.12" + "typo3/phar-stream-wrapper": "^3.1.3" }, "conflict": { "drupal/pathauto": "<1.6", @@ -5374,8 +5375,7 @@ } }, "patches_applied": { - "migrate_drupal getsetting on null": "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch", - "https://www.drupal.org/project/drupal/issues/2943172": "https://www.drupal.org/files/issues/2018-07-05/2943172-kernel-test-base-3.patch" + "migrate_drupal getsetting on null": "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch" } }, "autoload": { @@ -5399,7 +5399,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2020-09-16T11:22:50+00:00" + "time": "2020-10-07T19:37:20+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -9034,30 +9034,30 @@ }, { "name": "drupal/profile", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/profile.git", - "reference": "8.x-1.1" + "reference": "8.x-1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/profile-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "b8f6aca4f432228e614dca0a50cb187e936e4825" + "url": "https://ftp.drupal.org/files/projects/profile-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "5ea5167ed6cc5b47761ea497fe20bae0fbea1cf2" }, "require": { - "drupal/core": "^8.7.7 || ^9", + "drupal/core": "^8.8 || ^9", "drupal/entity": "^1.0-rc2" }, "require-dev": { - "drupal/token": "^1.0" + "drupal/token": "^1.7" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1582134004", + "version": "8.x-1.2", + "datestamp": "1604422701", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9066,7 +9066,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -10740,7 +10740,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_conditional.git", - "reference": "98cc303f042f863ea1e2d762288fbaabd384551f" + "reference": "1fbbe2863d6581e83af91bc8603a6278cc749d52" }, "require": { "drupal/core": "^8 || ^9" @@ -10794,7 +10794,7 @@ "source": "http://cgit.drupalcode.org/views_conditional", "issues": "https://www.drupal.org/project/issues/views_conditional" }, - "time": "2020-10-14T14:57:19+00:00" + "time": "2020-10-29T02:44:39+00:00" }, { "name": "drupal/views_ef_fieldset", @@ -11359,16 +11359,16 @@ }, { "name": "giggsey/libphonenumber-for-php", - "version": "8.12.11", + "version": "8.12.12", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php.git", - "reference": "a3e8c9c832b3c40d69b477b2a96b252d03fbf274" + "reference": "f3802f572c5fff322a2ccd8d2d792c147ed9e3c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/a3e8c9c832b3c40d69b477b2a96b252d03fbf274", - "reference": "a3e8c9c832b3c40d69b477b2a96b252d03fbf274", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/f3802f572c5fff322a2ccd8d2d792c147ed9e3c4", + "reference": "f3802f572c5fff322a2ccd8d2d792c147ed9e3c4", "shasum": "" }, "require": { @@ -11382,7 +11382,7 @@ "pear/versioncontrol_git": "^0.5", "phing/phing": "^2.7", "php-coveralls/php-coveralls": "^1.0|^2.0", - "phpunit/phpunit": "^4.8.36|^5.0", + "phpunit/phpunit": "^4.8.36|^5.0|^7.0", "symfony/console": "^2.8|^3.0" }, "type": "library", @@ -11423,7 +11423,7 @@ "phonenumber", "validation" ], - "time": "2020-10-09T15:01:50+00:00" + "time": "2020-10-29T09:27:40+00:00" }, { "name": "giggsey/locale", @@ -11931,6 +11931,203 @@ ], "time": "2019-10-17T18:05:24+00:00" }, + { + "name": "laminas/laminas-diactoros", + "version": "1.8.7p2", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-diactoros.git", + "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa", + "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa", + "shasum": "" + }, + "require": { + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^5.6 || ^7.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "replace": { + "zendframework/zend-diactoros": "~1.8.7.0" + }, + "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", + "laminas/laminas-coding-standard": "~1.0", + "php-http/psr7-integration-tests": "dev-master", + "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-release-1.8": "1.8.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php", + "src/functions/create_uploaded_file.legacy.php", + "src/functions/marshal_headers_from_sapi.legacy.php", + "src/functions/marshal_method_from_sapi.legacy.php", + "src/functions/marshal_protocol_version_from_sapi.legacy.php", + "src/functions/marshal_uri_from_sapi.legacy.php", + "src/functions/normalize_server.legacy.php", + "src/functions/normalize_uploaded_files.legacy.php", + "src/functions/parse_cookie_header.legacy.php" + ], + "psr-4": { + "Laminas\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://laminas.dev", + "keywords": [ + "http", + "laminas", + "psr", + "psr-7" + ], + "time": "2020-03-23T15:28:28+00:00" + }, + { + "name": "laminas/laminas-escaper", + "version": "2.6.1", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-escaper.git", + "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70", + "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70", + "shasum": "" + }, + "require": { + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^5.6 || ^7.0" + }, + "replace": { + "zendframework/zend-escaper": "self.version" + }, + "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laminas\\Escaper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs", + "homepage": "https://laminas.dev", + "keywords": [ + "escaper", + "laminas" + ], + "time": "2019-12-31T16:43:30+00:00" + }, + { + "name": "laminas/laminas-feed", + "version": "2.12.3", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-feed.git", + "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3c91415633cb1be6f9d78683d69b7dcbfe6b4012", + "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "laminas/laminas-escaper": "^2.5.2", + "laminas/laminas-stdlib": "^3.2.1", + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^5.6 || ^7.0" + }, + "replace": { + "zendframework/zend-feed": "^2.12.0" + }, + "require-dev": { + "laminas/laminas-cache": "^2.7.2", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-db": "^2.8.2", + "laminas/laminas-http": "^2.7", + "laminas/laminas-servicemanager": "^2.7.8 || ^3.3", + "laminas/laminas-validator": "^2.10.1", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20", + "psr/http-message": "^1.0.1" + }, + "suggest": { + "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests", + "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub", + "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader", + "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations", + "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent", + "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.12.x-dev", + "dev-develop": "2.13.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laminas\\Feed\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides functionality for consuming RSS and Atom feeds", + "homepage": "https://laminas.dev", + "keywords": [ + "feed", + "laminas" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2020-08-18T13:45:04+00:00" + }, { "name": "laminas/laminas-stdlib", "version": "3.3.0", @@ -16722,179 +16919,6 @@ ], "description": "Composer plugin to improve composer performance for Drupal projects", "time": "2020-10-22T13:26:00+00:00" - }, - { - "name": "zendframework/zend-diactoros", - "version": "1.8.7", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b", - "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-dom": "*", - "ext-libxml": "*", - "php-http/psr7-integration-tests": "dev-master", - "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", - "zendframework/zend-coding-standard": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-release-1.8": "1.8.x-dev" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php" - ], - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "abandoned": "laminas/laminas-diactoros", - "time": "2019-08-06T17:53:53+00:00" - }, - { - "name": "zendframework/zend-escaper", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/3801caa21b0ca6aca57fa1c42b08d35c395ebd5f", - "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "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": "2.6.x-dev", - "dev-develop": "2.7.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Escaper\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs", - "keywords": [ - "ZendFramework", - "escaper", - "zf" - ], - "abandoned": "laminas/laminas-escaper", - "time": "2019-09-05T20:03:20+00:00" - }, - { - "name": "zendframework/zend-feed", - "version": "2.12.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-feed.git", - "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733", - "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-libxml": "*", - "php": "^5.6 || ^7.0", - "zendframework/zend-escaper": "^2.5.2", - "zendframework/zend-stdlib": "^3.2.1" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "psr/http-message": "^1.0.1", - "zendframework/zend-cache": "^2.7.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-db": "^2.8.2", - "zendframework/zend-http": "^2.7", - "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", - "zendframework/zend-validator": "^2.10.1" - }, - "suggest": { - "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", - "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", - "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", - "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", - "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", - "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.12.x-dev", - "dev-develop": "2.13.x-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Feed\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides functionality for consuming RSS and Atom feeds", - "keywords": [ - "ZendFramework", - "feed", - "zf" - ], - "abandoned": "laminas/laminas-feed", - "time": "2019-03-05T20:08:49+00:00" } ], "packages-dev": [], diff --git a/web/.htaccess b/web/.htaccess index 9a73a3d..6f9123d 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -27,16 +27,9 @@ AddEncoding gzip svgz # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be # changed at runtime. -# PHP 5, Apache 1 and 2. - +# PHP 7, Apache 1 and 2. + php_value assert.active 0 - php_flag session.auto_start off - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_flag mbstring.encoding_translation off - # PHP 5.6 has deprecated $HTTP_RAW_POST_DATA and produces warnings if this is - # not set. - php_value always_populate_raw_post_data -1 # Requires mod_expires to be enabled. @@ -167,9 +160,9 @@ AddEncoding gzip svgz RewriteCond %{REQUEST_FILENAME}\.gz -s RewriteRule ^(.*)\.js $1\.js\.gz [QSA] - # Serve correct content types, and prevent mod_deflate double gzip. - RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1] - RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1] + # Serve correct content types, and prevent double compression. + RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1] + RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1,E=no-brotli:1] # Serve correct encoding type. diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 589e3d8..1ffeb20 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 589e3d8dd5437d5d625eadf7427f263536e46cbb +Subproject commit 1ffeb20a1ca2ffe092d883018ed0c2497b46d624 diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php index 1c8dbee..c5e2b4a 100644 --- a/web/sites/default/default.settings.php +++ b/web/sites/default/default.settings.php @@ -105,6 +105,16 @@ $databases = []; * webserver. For most other drivers, you must specify a * username, password, host, and database name. * + * Drupal core implements drivers for mysql, pgsql, and sqlite. Other drivers + * can be provided by contributed or custom modules. To use a contributed or + * custom driver, the "namespace" property must be set to the namespace of the + * driver. The code in this namespace must be autoloadable prior to connecting + * to the database, and therefore, prior to when module root namespaces are + * added to the autoloader. To add the driver's namespace to the autoloader, + * set the "autoload" property to the PSR-4 base directory of the driver's + * namespace. This is optional for projects managed with Composer if the + * driver's namespace is in Composer's autoloader. + * * Transaction support is enabled by default for all drivers that support it, * including MySQL. To explicitly disable it, set the 'transactions' key to * FALSE. @@ -224,6 +234,20 @@ $databases = []; * 'database' => '/path/to/databasefilename', * ]; * @endcode + * + * Sample Database configuration format for a driver in a contributed module: + * @code + * $databases['default']['default'] = [ + * 'driver' => 'mydriver', + * 'namespace' => 'Drupal\mymodule\Driver\Database\mydriver', + * 'autoload' => 'modules/mymodule/src/Driver/Database/mydriver/', + * 'database' => 'databasename', + * 'username' => 'sqlusername', + * 'password' => 'sqlpassword', + * 'host' => 'localhost', + * 'prefix' => '', + * ]; + * @endcode */ /** @@ -741,13 +765,29 @@ $settings['entity_update_batch_size'] = 50; */ $settings['entity_update_backup'] = TRUE; +/** + * Node migration type. + * + * This is used to force the migration system to use the classic node migrations + * instead of the default complete node migrations. The migration system will + * use the classic node migration only if there are existing migrate_map tables + * for the classic node migrations and they contain data. These tables may not + * exist if you are developing custom migrations and do not want to use the + * complete node migrations. Set this to TRUE to force the use of the classic + * node migrations. + */ +$settings['migrate_node_migrate_type_classic'] = FALSE; + /** * Load local development override configuration, if available. * - * Use settings.local.php to override variables on secondary (staging, - * development, etc) installations of this site. Typically used to disable - * caching, JavaScript/CSS compression, re-routing of outgoing emails, and - * other things that should not happen on development and testing sites. + * Create a settings.local.php file to override variables on secondary (staging, + * development, etc.) installations of this site. + * + * Typical uses of settings.local.php include: + * - Disabling caching. + * - Disabling JavaScript/CSS compression. + * - Rerouting outgoing emails. * * Keep this code block at the end of this file to take full effect. */ diff --git a/web/sites/example.settings.local.php b/web/sites/example.settings.local.php index 520cb4a..f91b9af 100644 --- a/web/sites/example.settings.local.php +++ b/web/sites/example.settings.local.php @@ -131,15 +131,15 @@ $settings['rebuild_access'] = TRUE; $settings['skip_permissions_hardening'] = TRUE; /** - * Exclude modules from configuration synchronisation. + * Exclude modules from configuration synchronization. * * On config export sync, no config or dependent config of any excluded module * is exported. On config import sync, any config of any installed excluded * module is ignored. In the exported configuration, it will be as if the * excluded module had never been installed. When syncing configuration, if an * excluded module is already installed, it will not be uninstalled by the - * configuration synchronisation, and dependent configuration will remain - * intact. This affects only configuration synchronisation; single import and + * configuration synchronization, and dependent configuration will remain + * intact. This affects only configuration synchronization; single import and * export of configuration are not affected. * * Drupal does not validate or sanity check the list of excluded modules. For @@ -148,7 +148,7 @@ $settings['skip_permissions_hardening'] = TRUE; * anymore. * * This is an advanced feature and using it means opting out of some of the - * guarantees the configuration synchronisation provides. It is not recommended + * guarantees the configuration synchronization provides. It is not recommended * to use this feature with modules that affect Drupal in a major way such as * the language or field module. */