From a9c5a3f9c1b0f67ff8a23493e2f70ce5f4bc8fea Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 15 Aug 2024 23:35:01 +0200 Subject: [PATCH] updated more modules (including graphql with a patch) --- composer.json | 4 +- composer.lock | 249 ++++++++++++------ ...fix-invalid-translation-language-dev.patch | 26 +- web/profiles/d8-starterkit-profile | 2 +- 4 files changed, 193 insertions(+), 88 deletions(-) diff --git a/composer.json b/composer.json index cbf8addf..b644aa65 100644 --- a/composer.json +++ b/composer.json @@ -101,9 +101,9 @@ "drupal/flag_lists": "^4.0@RC", "drupal/flood_control": "^2.3", "drupal/gdpr": "^3.1", - "drupal/genpass": "^1.x-dev", + "drupal/genpass": "^2.0", "drupal/google_analytics": "^4.0", - "drupal/graphql": "4.x-dev@dev", + "drupal/graphql": "^4.7", "drupal/image_delta_formatter": "^1.x-dev", "drupal/image_effects": "^3.x-dev@dev", "drupal/js_cache_buster": "^1.0", diff --git a/composer.lock b/composer.lock index e36b94f7..a6e9ab39 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": "2251ed6a30fbdac84a8b3d094e35b28c", + "content-hash": "34e9ae84574e390dfa8cb4730b02b335", "packages": [ { "name": "algolia/places", @@ -7070,26 +7070,26 @@ }, { "name": "drupal/filefield_sources", - "version": "dev-1.x", + "version": "dev-2.0.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/filefield_sources.git", - "reference": "12a9918a4e2e31ff10c127766610bfbac13d6487" + "reference": "3905bb005c2f96f7391abcd91004a81f13e83477" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.2.0 | ^10" }, "require-dev": { - "drupal/imce": "^2.3" + "drupal/imce": "^3.0" }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-2.0.x": "2.0.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha4+5-dev", - "datestamp": "1621879079", + "version": "2.0.x-dev", + "datestamp": "1714083250", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -7115,6 +7115,10 @@ "name": "David Valdez (gnuget)", "homepage": "https://www.drupal.org/u/gnuget", "role": "Maintainer" + }, + { + "name": "quicksketch", + "homepage": "https://www.drupal.org/user/35821" } ], "description": "Extends File fields to allow referencing of existing files, remote files, and server files.", @@ -7127,32 +7131,35 @@ }, { "name": "drupal/filter_perms", - "version": "dev-1.x", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/filter_perms.git", - "reference": "f9abe65da2236de801902256f8388291bc3d2c83" + "reference": "2.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/filter_perms-2.0.1.zip", + "reference": "2.0.1", + "shasum": "76949486b0a730c1fdfd9a8d773a3a96d2e0de7b" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.0 || ^10.0 || ^11" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-alpha1+2-dev", - "datestamp": "1599239698", + "version": "2.0.1", + "datestamp": "1722444219", "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" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -7164,9 +7171,13 @@ "homepage": "https://www.drupal.org/user/972" }, { - "name": "ivagold", + "name": "ivavictoria", "homepage": "https://www.drupal.org/user/3061533" }, + { + "name": "justcaldwell", + "homepage": "https://www.drupal.org/user/290069" + }, { "name": "mgbellaire", "homepage": "https://www.drupal.org/user/1831932" @@ -7179,7 +7190,8 @@ "description": "Provides role and module filters to simplify the user permissions page.", "homepage": "https://www.drupal.org/project/filter_perms", "support": { - "source": "https://git.drupalcode.org/project/filter_perms" + "source": "http://cgit.drupalcode.org/filter_perms", + "issues": "https://www.drupal.org/project/issues/filter_perms?categories=All" } }, { @@ -7260,17 +7272,17 @@ }, { "name": "drupal/flag_lists", - "version": "4.0.0-rc3", + "version": "4.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag_lists.git", - "reference": "4.0.0-rc3" + "reference": "4.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.0-rc3.zip", - "reference": "4.0.0-rc3", - "shasum": "1fa9da3f4e1361fc65b4a3ddefbf28273df069ee" + "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.2.zip", + "reference": "4.0.2", + "shasum": "708d024dd5c75fe9eea9998350004a7c0ee634f8" }, "require": { "drupal/core": "^9 || ^10", @@ -7279,11 +7291,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0-rc3", - "datestamp": "1684316705", + "version": "4.0.2", + "datestamp": "1712137036", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -7382,19 +7394,27 @@ }, { "name": "drupal/gdpr", - "version": "dev-3.x", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gdpr.git", - "reference": "415f9e163ddcc527c0fb07e88f91149790655228" + "reference": "3.1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gdpr-3.1.0.zip", + "reference": "3.1.0", + "shasum": "1e3e371178e12cee37fb4eb846751a924e7236b6" }, "require": { "drupal/checklistapi": "^2.1", - "drupal/core": "^9 || ^10", + "drupal/core": "^9 || ^10 || ^11", "drupal/entity": "^1.4", - "drupal/entity_reference_revisions": "^1.10", - "drupal/message": "^1.4", - "drupal/token": "^1.11" + "drupal/entity_reference_revisions": "^1.11", + "drupal/message": "^1.5", + "drupal/token": "^1.14", + "fakerphp/faker": "^1 || ^2", + "php": ">=8.1" }, "require-dev": { "drupal/anonymizer": "*", @@ -7406,20 +7426,16 @@ }, "suggest": { "drush/drush": "GDPR Dump requires Drush ^9 || ^10", - "ext-zip": "GDPR Tasks requires the PHP zip extension", - "fzaninotto/faker": "Required for the anonymizer submodule (which is required by multiple submodules)." + "ext-zip": "GDPR Tasks requires the PHP zip extension" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-3.x": "3.x-dev" - }, "drupal": { - "version": "3.0.0+4-dev", - "datestamp": "1715145209", + "version": "3.1.0", + "datestamp": "1721207445", "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" } } }, @@ -7498,47 +7514,47 @@ }, { "name": "drupal/genpass", - "version": "dev-1.x", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/genpass.git", - "reference": "90e69782d56f7403f6249f95f1995d136f876aba" + "reference": "2.0.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/genpass-2.0.3.zip", + "reference": "2.0.3", + "shasum": "4d736716afc9981c2d198c8225878f3ea0edf56b" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.1 || ^10" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0+1-dev", - "datestamp": "1588265433", + "version": "2.0.3", + "datestamp": "1720489719", "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" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ + { + "name": "starbow", + "homepage": "https://www.drupal.org/u/starbow", + "role": "contributor" + }, { "name": "Kris77", "homepage": "https://www.drupal.org/u/kris77", "role": "contributor" }, - { - "name": "NitinSP", - "homepage": "https://www.drupal.org/user/2198938" - }, - { - "name": "greggles", - "homepage": "https://www.drupal.org/user/36762" - }, { "name": "japanitrat", "homepage": "https://www.drupal.org/user/268715" @@ -7547,6 +7563,14 @@ "name": "joelstein", "homepage": "https://www.drupal.org/user/36598" }, + { + "name": "NitinSP", + "homepage": "https://www.drupal.org/user/2198938" + }, + { + "name": "Rajab Natshah", + "homepage": "https://www.drupal.org/user/1414312" + }, { "name": "starbow", "homepage": "https://www.drupal.org/user/33290" @@ -7555,7 +7579,7 @@ "description": "Great utility module which makes the password field optional (or hidden) on the add new user page (admin & registration). If the password field is not set during registration, the system will generate a password. You can optionally display this password at the time it's created.", "homepage": "http://drupal.org/project/genpass", "support": { - "source": "https://github.com/luksak/genpass", + "source": "https://git.drupalcode.org/project/genpass", "issues": "http://drupal.org/project/issues/genpass", "irc": "irc://irc.freenode.org/drupal-contribute" } @@ -7633,11 +7657,17 @@ }, { "name": "drupal/graphql", - "version": "dev-4.x", + "version": "4.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/graphql.git", - "reference": "dedd45ccdea0430b7820acbad4557dc443eff196" + "reference": "8.x-4.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/graphql-8.x-4.7.zip", + "reference": "8.x-4.7", + "shasum": "aec6286cf550e5625d39e451284d33dd80568419" }, "require": { "drupal/core": "^9.3 || ^10", @@ -7650,15 +7680,12 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-4.x": "4.x-dev" - }, "drupal": { - "version": "8.x-4.3+11-dev", - "datestamp": "1662992472", + "version": "8.x-4.7", + "datestamp": "1711037105", "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" } } }, @@ -7679,10 +7706,18 @@ "name": "joaogarin", "homepage": "https://www.drupal.org/user/612814" }, + { + "name": "Kingdutch", + "homepage": "https://www.drupal.org/user/1868952" + }, { "name": "klausi", "homepage": "https://www.drupal.org/user/262198" }, + { + "name": "luigisa", + "homepage": "https://www.drupal.org/user/1022312" + }, { "name": "pmelab", "homepage": "https://www.drupal.org/user/555322" @@ -13575,6 +13610,69 @@ }, "time": "2023-11-17T07:53:29+00:00" }, + { + "name": "fakerphp/faker", + "version": "v1.23.1", + "source": { + "type": "git", + "url": "https://github.com/FakerPHP/Faker.git", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "psr/container": "^1.0 || ^2.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "conflict": { + "fzaninotto/faker": "*" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "doctrine/persistence": "^1.3 || ^2.0", + "ext-intl": "*", + "phpunit/phpunit": "^9.5.26", + "symfony/phpunit-bridge": "^5.4.16" + }, + "suggest": { + "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", + "ext-curl": "Required by Faker\\Provider\\Image to download images.", + "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", + "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", + "ext-mbstring": "Required for multibyte Unicode string functionality." + }, + "type": "library", + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "support": { + "issues": "https://github.com/FakerPHP/Faker/issues", + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + }, + "time": "2024-01-02T13:46:09+00:00" + }, { "name": "fileeye/mimemap", "version": "2.1.2", @@ -22964,8 +23062,6 @@ "drupal/config_split": 10, "drupal/flag": 10, "drupal/flag_lists": 5, - "drupal/genpass": 20, - "drupal/graphql": 20, "drupal/image_delta_formatter": 20, "drupal/image_effects": 20, "drupal/login_history": 20, @@ -22998,7 +23094,6 @@ "drupal/entity_clone": 15, "drupal/field_group": 20, "drupal/filefield_sources": 20, - "drupal/filter_perms": 20, "drupal/inline_entity_form": 5, "drupal/linkit": 10, "drupal/maillog": 20, diff --git a/patches/graphql-fix-invalid-translation-language-dev.patch b/patches/graphql-fix-invalid-translation-language-dev.patch index e05d8975..ab3ea54b 100644 --- a/patches/graphql-fix-invalid-translation-language-dev.patch +++ b/patches/graphql-fix-invalid-translation-language-dev.patch @@ -1,5 +1,15 @@ +commit 9c3d84fbb3e0e2a4ad99ef593b975cde7bc2547f +Author: bach +Date: Mon Sep 19 15:41:32 2022 +0200 + + invalid translation language + + bugfix + + removed patch + diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php -index 867a28c..386b2b3 100644 +index 408af0af..b6f9d8d8 100644 --- a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php +++ b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php @@ -172,8 +172,10 @@ class EntityLoad extends DataProducerPluginBase implements ContainerFactoryPlugi @@ -16,7 +26,7 @@ index 867a28c..386b2b3 100644 // Check if the passed user (or current user if none is passed) has access diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php -index 10e2d40..e4e6ed0 100644 +index a400da19..4fb1d8d7 100644 --- a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php +++ b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php @@ -165,8 +165,10 @@ class EntityLoadByUuid extends DataProducerPluginBase implements ContainerFactor @@ -33,7 +43,7 @@ index 10e2d40..e4e6ed0 100644 // Check if the passed user (or current user if none is passed) has access diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php -index 2a0259c..27a19e5 100644 +index 2b456aad..92f2c898 100644 --- a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php +++ b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php @@ -172,8 +172,10 @@ class EntityLoadMultiple extends DataProducerPluginBase implements ContainerFact @@ -50,20 +60,20 @@ index 2a0259c..27a19e5 100644 if ($access) { diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php -index 633bdc2..3773a9b 100644 +index 1a30c65d..5d3f1268 100644 --- a/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php +++ b/src/Plugin/GraphQL/DataProducer/Entity/EntityTranslation.php -@@ -101,7 +101,7 @@ class EntityTranslation extends DataProducerPluginBase implements ContainerFacto +@@ -103,7 +103,7 @@ class EntityTranslation extends DataProducerPluginBase implements ContainerFacto * @return \Drupal\Core\Entity\EntityInterface|null */ - public function resolve(EntityInterface $entity, $language, ?bool $access, ?AccountInterface $accessUser, ?string $accessOperation) { + public function resolve(EntityInterface $entity, $language, ?bool $access, ?AccountInterface $accessUser, ?string $accessOperation, FieldContext $context) { - if ($entity instanceof TranslatableInterface && $entity->isTranslatable()) { + if ($entity instanceof TranslatableInterface && $entity->isTranslatable() && $entity->hasTranslation($language)) { $entity = $entity->getTranslation($language); $entity->addCacheContexts(["static:language:{$language}"]); // Check if the passed user (or current user if none is passed) has access diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php -index 10ea4e6..1eef22a 100644 +index e08c7bdd..46c64bbb 100644 --- a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php +++ b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php @@ -126,8 +126,10 @@ class RouteEntity extends DataProducerPluginBase implements ContainerFactoryPlug @@ -80,7 +90,7 @@ index 10ea4e6..1eef22a 100644 $access = $entity->access('view', NULL, TRUE); diff --git a/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php b/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php -index 1bcd624..8b2caf2 100644 +index 3f2229fd..b0753acf 100644 --- a/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php +++ b/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php @@ -175,8 +175,10 @@ class TaxonomyLoadTree extends DataProducerPluginBase implements ContainerFactor diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 9bb1e247..0c2da446 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 9bb1e247d4ed5bfafee52a023276dd85c51f70e9 +Subproject commit 0c2da4462c174d16fe531ce6362200ffc241e1ab