From 4313f133af54f68a39c1db08abac8f287c877bbb Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 15 May 2024 06:21:22 +0000 Subject: [PATCH] Update configuration --- composer.lock | 145 +++++++++++++------------ conf/cmi/editoria11y.configuration.yml | 3 - phpcs.xml.dist | 12 ++ 3 files changed, 89 insertions(+), 71 deletions(-) delete mode 100644 conf/cmi/editoria11y.configuration.yml create mode 100644 phpcs.xml.dist diff --git a/composer.lock b/composer.lock index 41e7a0ed..9ee4ce78 100644 --- a/composer.lock +++ b/composer.lock @@ -1916,6 +1916,14 @@ { "name": "saltednut", "homepage": "https://www.drupal.org/user/252788" + }, + { + "name": "vipin.mittal18", + "homepage": "https://www.drupal.org/user/319716" + }, + { + "name": "vishalkhode", + "homepage": "https://www.drupal.org/user/2439156" } ], "description": "Rewrites existing configuration on module installation via using a 'rewrite' folder in the config directory.", @@ -2694,20 +2702,20 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.12", + "version": "2.1.16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.12" + "reference": "2.1.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.12.zip", - "reference": "2.1.12", - "shasum": "2a3e32c25eebdcdb3c64144b01d7dd4ce2945fec" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.16.zip", + "reference": "2.1.16", + "shasum": "660ae0feeade810aac9d67cb8d00b14f5a5403ad" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "conflict": { "drupal/csp": "<1.24" @@ -2715,8 +2723,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.12", - "datestamp": "1713880633", + "version": "2.1.16", + "datestamp": "1715359756", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3202,17 +3210,17 @@ }, { "name": "drupal/external_entities", - "version": "2.0.0-alpha6", + "version": "2.0.0-beta1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/external_entities.git", - "reference": "8.x-2.0-alpha6" + "reference": "8.x-2.0-beta1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha6.zip", - "reference": "8.x-2.0-alpha6", - "shasum": "3c11cc7ac7a4130131a188f6c6fba33937ca5244" + "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-beta1.zip", + "reference": "8.x-2.0-beta1", + "shasum": "6aea914a6037e354e422d44955eebca878e27059" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", @@ -3224,11 +3232,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-alpha6", - "datestamp": "1684406076", + "version": "8.x-2.0-beta1", + "datestamp": "1706886572", "security-coverage": { "status": "not-covered", - "message": "Alpha releases are not covered by Drupal security advisories." + "message": "Beta releases are not covered by Drupal security advisories." } } }, @@ -3978,12 +3986,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "08fe754581afe4ba8d1d7324b193108f476dd548" + "reference": "7e697414bd03431053cc8d83a8d900452f48ab0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/08fe754581afe4ba8d1d7324b193108f476dd548", - "reference": "08fe754581afe4ba8d1d7324b193108f476dd548", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/7e697414bd03431053cc8d83a8d900452f48ab0c", + "reference": "7e697414bd03431053cc8d83a8d900452f48ab0c", "shasum": "" }, "require": { @@ -4055,7 +4063,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-03-20T07:54:25+00:00" + "time": "2024-05-15T04:33:29+00:00" }, { "name": "drupal/helfi_navigation", @@ -4093,16 +4101,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.52", + "version": "4.3.53", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "18406aaefc6b9a32342d1ca6fb17b7f84a2f738e" + "reference": "e8b115ed3bbb806d65056e66f30da3393bb9dfce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/18406aaefc6b9a32342d1ca6fb17b7f84a2f738e", - "reference": "18406aaefc6b9a32342d1ca6fb17b7f84a2f738e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e8b115ed3bbb806d65056e66f30da3393bb9dfce", + "reference": "e8b115ed3bbb806d65056e66f30da3393bb9dfce", "shasum": "" }, "require": { @@ -4124,7 +4132,7 @@ "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", "drupal/eu_cookie_compliance": "^1.24", - "drupal/external_entities": "2.0.0-alpha6", + "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", "drupal/gin_toolbar": "^1.0@rc", @@ -4189,7 +4197,7 @@ "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952] Convert line breaks into HTML filter generates duplicate br tags after a line ending (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-02-29/3083786-br-generates-duplicate-tags.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-05-14/3083786-duplicate-br-tags-2024-05-14-no-tests.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4219,10 +4227,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.52", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.53", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-04-25T07:37:52+00:00" + "time": "2024-05-15T06:17:07+00:00" }, { "name": "drupal/helfi_proxy", @@ -4701,17 +4709,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.3", + "version": "6.1.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.3" + "reference": "6.1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.3.zip", - "reference": "6.1.3", - "shasum": "469a5e38269ed5e707998000ee4701ab4922e561" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip", + "reference": "6.1.4", + "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b" }, "require": { "drupal/core": "^10.1" @@ -4723,8 +4731,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.3", - "datestamp": "1710519126", + "version": "6.1.4", + "datestamp": "1715203830", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5577,17 +5585,17 @@ }, { "name": "drupal/raven", - "version": "5.0.11", + "version": "5.0.12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.11" + "reference": "5.0.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.11.zip", - "reference": "5.0.11", - "shasum": "ef441bbeb2f58e2efe57cc0fc3343e14c4944b4b" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.12.zip", + "reference": "5.0.12", + "shasum": "926b7da3e38b0ac378075d1b0538dc36dfea8b0a" }, "require": { "drupal/core": "^10.1", @@ -5602,8 +5610,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.11", - "datestamp": "1713227351", + "version": "5.0.12", + "datestamp": "1715284635", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10055,20 +10063,20 @@ }, { "name": "psr/http-factory", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "type": "library", @@ -10092,7 +10100,7 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -10104,9 +10112,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:10:41+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -13593,16 +13601,16 @@ }, { "name": "twig/twig", - "version": "v3.9.3", + "version": "v3.10.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" + "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7aaed0b8311a557cc8c4047a71fd03153a00e755", + "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755", "shasum": "" }, "require": { @@ -13656,7 +13664,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.3" + "source": "https://github.com/twigphp/Twig/tree/v3.10.2" }, "funding": [ { @@ -13668,7 +13676,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T11:59:33+00:00" + "time": "2024-05-14T06:04:16+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -13759,30 +13767,31 @@ }, { "name": "webflo/drupal-finder", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webflo/drupal-finder.git", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee" + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/c8e5dbe65caef285fec8057a4c718a0d4138d1ee", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee", + "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", "shasum": "" }, "require": { - "ext-json": "*" + "composer-runtime-api": "^2.2", + "php": ">=8.1" }, "require-dev": { "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^10.4" }, "type": "library", "autoload": { - "classmap": [ - "src/DrupalFinder.php" - ] + "psr-4": { + "DrupalFinder\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -13794,12 +13803,12 @@ "email": "florian@webflo.org" } ], - "description": "Helper class to locate a Drupal installation from a given path.", + "description": "Helper class to locate a Drupal installation.", "support": { "issues": "https://github.com/webflo/drupal-finder/issues", - "source": "https://github.com/webflo/drupal-finder/tree/1.2.2" + "source": "https://github.com/webflo/drupal-finder/tree/1.3.0" }, - "time": "2020-10-27T09:42:17+00:00" + "time": "2024-05-08T21:22:39+00:00" }, { "name": "webmozart/assert", diff --git a/conf/cmi/editoria11y.configuration.yml b/conf/cmi/editoria11y.configuration.yml deleted file mode 100644 index 5e278f6d..00000000 --- a/conf/cmi/editoria11y.configuration.yml +++ /dev/null @@ -1,3 +0,0 @@ -ed11y_theme: lightTheme -disable_sync: false -preserve_params: 'search,keys,page,language,language_content_entity' diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 00000000..cff028e4 --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,12 @@ + + + + *.css + *.js + + + + + + +