diff --git a/composer.json b/composer.json index ace0d7b7..170d3e7a 100644 --- a/composer.json +++ b/composer.json @@ -104,8 +104,8 @@ "drupal/eu_cookie_compliance": "^1.14", "drupal/field_group": "^3.x-dev@dev", "drupal/field_permissions": "^1.0", - "drupal/flag": "4.0-beta3", - "drupal/flag_lists": "4.0.0-beta9+16-dev", + "drupal/flag": "^4.0@beta", + "drupal/flag_lists": "^4.0@RC", "drupal/flood_control": "^2.3", "drupal/gdpr": "^3.0@alpha", "drupal/genpass": "^1.x-dev", @@ -286,10 +286,6 @@ "drupal/term_reference_tree": { "Term Reference Tree: Re-implement Track List https://www.drupal.org/project/term_reference_tree/issues/3064280": "https://www.drupal.org/files/issues/2022-02-07/3064280_bring_back_tracklist-16.patch" }, - "drupal/flag_lists": { - "Call to a member function id() on null in flag_lists_flag_action_access https://www.drupal.org/project/flag_lists/issues/3230729": "./patches/hook_flag_access_id_on_null_4.patch", - "Call to a member function id() on null in flaglistspermissionshandler": "./patches/flaglist-flaglistspermissionshandler.patch" - }, "drupal/toolbar_theme": { "Automated Drupal 9 compatibility fixes https://www.drupal.org/project/toolbar_themes/issues/3149099": "https://www.drupal.org/files/issues/2020-06-06/toolbar_themes.1.x-dev.rector.patch" }, diff --git a/composer.lock b/composer.lock index 60649cb6..a5a3a873 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": "28b21d11225a03fd3e06241a5046b3af", + "content-hash": "3b86e21675bce03f8235552df2dc459d", "packages": [ { "name": "alchemy/zippy", @@ -8523,26 +8523,26 @@ }, { "name": "drupal/flag", - "version": "4.0.0-beta3", + "version": "4.0.0-beta4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag.git", - "reference": "8.x-4.0-beta3" + "reference": "8.x-4.0-beta4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta3.zip", - "reference": "8.x-4.0-beta3", - "shasum": "856a4871034955406e111aee2227e716cc8064d6" + "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta4.zip", + "reference": "8.x-4.0-beta4", + "shasum": "2779804f23685e1bb68a2a7b9517932dde3b1d4e" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.1 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-4.0-beta3", - "datestamp": "1638201553", + "version": "8.x-4.0-beta4", + "datestamp": "1670487892", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -8599,30 +8599,30 @@ }, { "name": "drupal/flag_lists", - "version": "4.0.0-beta9", + "version": "4.0.0-rc3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flag_lists.git", - "reference": "4.0.0-beta9" + "reference": "4.0.0-rc3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.0-beta9.zip", - "reference": "4.0.0-beta9", - "shasum": "db76e97a5c8d8d33026da958c2ede4151c945ccb" + "url": "https://ftp.drupal.org/files/projects/flag_lists-4.0.0-rc3.zip", + "reference": "4.0.0-rc3", + "shasum": "1fa9da3f4e1361fc65b4a3ddefbf28273df069ee" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^9 || ^10", "drupal/flag": "^4.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0-beta9", - "datestamp": "1607420074", + "version": "4.0.0-rc3", + "datestamp": "1684316705", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -17489,16 +17489,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -17539,9 +17539,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "nyholm/psr7", @@ -22532,16 +22532,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.24", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3" + "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", - "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede", + "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede", "shasum": "" }, "require": { @@ -22600,7 +22600,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.24" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.25" }, "funding": [ { @@ -22616,7 +22616,7 @@ "type": "tidelift" } ], - "time": "2023-05-25T13:05:00+00:00" + "time": "2023-06-20T20:56:26+00:00" }, { "name": "symfony/yaml", @@ -25544,7 +25544,8 @@ "drupal/config_split": 10, "drupal/content_sync": 20, "drupal/field_group": 20, - "drupal/flag_lists": 20, + "drupal/flag": 10, + "drupal/flag_lists": 5, "drupal/gdpr": 15, "drupal/genpass": 20, "drupal/graphql": 20,