diff --git a/composer.lock b/composer.lock index 5a40acb8..d7a2685a 100644 --- a/composer.lock +++ b/composer.lock @@ -133,16 +133,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.336.6", + "version": "3.336.11", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0a99dab427f0a1c082775301141aeac3558691ad" + "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a99dab427f0a1c082775301141aeac3558691ad", - "reference": "0a99dab427f0a1c082775301141aeac3558691ad", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/442039c766a82f06ecfecb0ac2c610d6aaba228d", + "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d", "shasum": "" }, "require": { @@ -225,9 +225,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.336.6" + "source": "https://github.com/aws/aws-sdk-php/tree/3.336.11" }, - "time": "2024-12-28T04:16:13+00:00" + "time": "2025-01-08T19:06:59+00:00" }, { "name": "caxy/php-htmldiff", @@ -2298,16 +2298,16 @@ }, { "name": "drupal/core", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" + "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "url": "https://api.github.com/repos/drupal/core/zipball/0aeb6303b33d813a68ea78c40466715d9fcfac46", + "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46", "shasum": "" }, "require": { @@ -2456,13 +2456,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.4.0" + "source": "https://github.com/drupal/core/tree/10.4.1" }, - "time": "2024-12-17T22:18:01+00:00" + "time": "2025-01-06T23:26:38+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2506,13 +2506,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.1" }, "time": "2024-08-22T14:31:30+00:00" }, { "name": "drupal/core-project-message", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -2547,22 +2547,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/11.1.0" + "source": "https://github.com/drupal/core-project-message/tree/11.1.1" }, "time": "2023-07-24T07:55:25+00:00" }, { "name": "drupal/core-recommended", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "4c2f51834d9b74e2db66f61868ac174ee9d672a8" + "reference": "7ad1354941c10f794fa9c46cad78199f3ea88206" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/4c2f51834d9b74e2db66f61868ac174ee9d672a8", - "reference": "4c2f51834d9b74e2db66f61868ac174ee9d672a8", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/7ad1354941c10f794fa9c46cad78199f3ea88206", + "reference": "7ad1354941c10f794fa9c46cad78199f3ea88206", "shasum": "" }, "require": { @@ -2571,7 +2571,7 @@ "doctrine/annotations": "~1.14.4", "doctrine/deprecations": "~1.1.3", "doctrine/lexer": "~2.1.1", - "drupal/core": "10.4.0", + "drupal/core": "10.4.1", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.9.2", "guzzlehttp/promises": "~2.0.4", @@ -2632,9 +2632,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/10.4.0" + "source": "https://github.com/drupal/core-recommended/tree/10.4.1" }, - "time": "2024-12-17T22:18:01+00:00" + "time": "2025-01-06T23:26:38+00:00" }, { "name": "drupal/csv_serialization", @@ -3162,7 +3162,7 @@ "homepage": "https://www.drupal.org/user/2416470" }, { - "name": "TR", + "name": "tr", "homepage": "https://www.drupal.org/user/202830" } ], @@ -3637,20 +3637,20 @@ }, { "name": "drupal/file_entity", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_entity.git", - "reference": "8.x-2.0" + "reference": "8.x-2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_entity-8.x-2.0.zip", - "reference": "8.x-2.0", - "shasum": "0466ea9e2f6a87abcf2dc8b18cbde07e1b23035d" + "url": "https://ftp.drupal.org/files/projects/file_entity-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "528355921d7e2a9cc64fea12c136d28a60e39759" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "drupal/token": "^1", "php": ">=8.0" }, @@ -3661,8 +3661,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0", - "datestamp": "1721081646", + "version": "8.x-2.1", + "datestamp": "1735846124", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4441,7 +4441,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11" + "drupal/core": "^8 || ^9 || ^10 || ^11 || ^12" }, "type": "drupal-module", "extra": { @@ -7957,16 +7957,16 @@ }, { "name": "league/csv", - "version": "9.20.1", + "version": "9.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee" + "reference": "72196d11ebba22d868954cb39c0c7346207430cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/491d1e79e973a7370c7571dc0fe4a7241f4936ee", - "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/72196d11ebba22d868954cb39c0c7346207430cc", + "reference": "72196d11ebba22d868954cb39c0c7346207430cc", "shasum": "" }, "require": { @@ -8040,7 +8040,7 @@ "type": "github" } ], - "time": "2024-12-18T10:11:15+00:00" + "time": "2025-01-08T19:27:58+00:00" }, { "name": "league/oauth2-client", @@ -13642,16 +13642,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.4", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1" + "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/bc0593537a463e55cadf45fd938d23b75095b7e1", - "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/08c50d5ec4c6ced7d0271d2862dec8c1033283e6", + "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6", "shasum": "" }, "require": { @@ -13698,7 +13698,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.4" + "source": "https://github.com/composer/ca-bundle/tree/1.5.5" }, "funding": [ { @@ -13714,7 +13714,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T15:35:25+00:00" + "time": "2025-01-08T16:17:16+00:00" }, { "name": "composer/class-map-generator", @@ -14664,16 +14664,16 @@ }, { "name": "drupal/coder", - "version": "8.3.26", + "version": "8.3.27", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "fd98546ce3373aa7767240901eda47963ce64c82" + "reference": "04a4563b82c419e43cc58393a78b21c44fcc29e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/fd98546ce3373aa7767240901eda47963ce64c82", - "reference": "fd98546ce3373aa7767240901eda47963ce64c82", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/04a4563b82c419e43cc58393a78b21c44fcc29e2", + "reference": "04a4563b82c419e43cc58393a78b21c44fcc29e2", "shasum": "" }, "require": { @@ -14682,7 +14682,7 @@ "php": ">=7.2", "sirbrillig/phpcs-variable-analysis": "^2.11.7", "slevomat/coding-standard": "^8.11", - "squizlabs/php_codesniffer": "^3.9.1", + "squizlabs/php_codesniffer": "^3.11.2", "symfony/yaml": ">=3.4.0" }, "require-dev": { @@ -14711,11 +14711,11 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2024-11-28T23:14:29+00:00" + "time": "2025-01-06T09:46:24+00:00" }, { "name": "drupal/core-dev", - "version": "10.4.0", + "version": "10.4.1", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -14765,7 +14765,7 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.4.0" + "source": "https://github.com/drupal/core-dev/tree/10.4.1" }, "time": "2024-11-21T12:39:32+00:00" }, @@ -14932,16 +14932,16 @@ }, { "name": "google/protobuf", - "version": "v4.29.2", + "version": "v4.29.3", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "79aa5014efeeec3d137df5cdb0ae2fc163953945" + "reference": "ab5077c2cfdd1f415f42d11fdbdf903ba8e3d9b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/79aa5014efeeec3d137df5cdb0ae2fc163953945", - "reference": "79aa5014efeeec3d137df5cdb0ae2fc163953945", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/ab5077c2cfdd1f415f42d11fdbdf903ba8e3d9b7", + "reference": "ab5077c2cfdd1f415f42d11fdbdf903ba8e3d9b7", "shasum": "" }, "require": { @@ -14970,9 +14970,9 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.29.2" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.29.3" }, - "time": "2024-12-18T14:11:12+00:00" + "time": "2025-01-08T21:00:13+00:00" }, { "name": "justinrainbow/json-schema", @@ -15638,16 +15638,16 @@ }, { "name": "open-telemetry/api", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed" + "reference": "351a30baa79699de3de3a814c8ccc7b52ccdfb1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", - "reference": "04c85a1e41a3d59fa9bdc801a5de1df6624b95ed", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/351a30baa79699de3de3a814c8ccc7b52ccdfb1d", + "reference": "351a30baa79699de3de3a814c8ccc7b52ccdfb1d", "shasum": "" }, "require": { @@ -15704,7 +15704,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-11-16T04:32:30+00:00" + "time": "2025-01-08T23:50:34+00:00" }, { "name": "open-telemetry/context", @@ -15767,16 +15767,16 @@ }, { "name": "open-telemetry/exporter-otlp", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/exporter-otlp.git", - "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18" + "reference": "243d9657c44a06f740cf384f486afe954c2b725f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/9b6de12204f25f8ab9540b46d6e7b5151897ce18", - "reference": "9b6de12204f25f8ab9540b46d6e7b5151897ce18", + "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/243d9657c44a06f740cf384f486afe954c2b725f", + "reference": "243d9657c44a06f740cf384f486afe954c2b725f", "shasum": "" }, "require": { @@ -15827,7 +15827,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-04-30T18:28:30+00:00" + "time": "2025-01-08T23:50:03+00:00" }, { "name": "open-telemetry/gen-otlp-protobuf", @@ -15894,16 +15894,16 @@ }, { "name": "open-telemetry/sdk", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b" + "reference": "9a1c3b866239dbff291e5cc555bb7793eab08127" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/fb0ff8d8279a3776bd604791e2531dd0cc147e8b", - "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/9a1c3b866239dbff291e5cc555bb7793eab08127", + "reference": "9a1c3b866239dbff291e5cc555bb7793eab08127", "shasum": "" }, "require": { @@ -15980,7 +15980,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-10-18T21:01:35+00:00" + "time": "2025-01-08T23:50:34+00:00" }, { "name": "open-telemetry/sem-conv", @@ -16779,16 +16779,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.14", + "version": "1.12.15", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38" + "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e73868f809e68fff33be961ad4946e2e43ec9e38", - "reference": "e73868f809e68fff33be961ad4946e2e43ec9e38", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1", + "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1", "shasum": "" }, "require": { @@ -16833,7 +16833,7 @@ "type": "github" } ], - "time": "2024-12-31T07:26:13+00:00" + "time": "2025-01-05T16:40:22+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -18682,16 +18682,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.21", + "version": "v2.11.22", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "eb2b351927098c24860daa7484e290d3eed693be" + "reference": "ffb6f16c6033ec61ed84446b479a31d6529f0eb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/eb2b351927098c24860daa7484e290d3eed693be", - "reference": "eb2b351927098c24860daa7484e290d3eed693be", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/ffb6f16c6033ec61ed84446b479a31d6529f0eb7", + "reference": "ffb6f16c6033ec61ed84446b479a31d6529f0eb7", "shasum": "" }, "require": { @@ -18703,7 +18703,6 @@ "phpcsstandards/phpcsdevcs": "^1.1", "phpstan/phpstan": "^1.7", "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0 || ^10.5.32 || ^11.3.3", - "sirbrillig/phpcs-import-detection": "^1.1", "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0" }, "type": "phpcodesniffer-standard", @@ -18736,7 +18735,7 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2024-12-02T16:37:49+00:00" + "time": "2025-01-06T17:54:24+00:00" }, { "name": "slevomat/coding-standard", diff --git a/config/views.view.duplicate_of_iasc_group_content.yml b/config/views.view.duplicate_of_iasc_group_content.yml index 522e2715..2542bd6a 100644 --- a/config/views.view.duplicate_of_iasc_group_content.yml +++ b/config/views.view.duplicate_of_iasc_group_content.yml @@ -10,7 +10,7 @@ dependencies: - node _core: default_config_hash: ZSKjHkl45YTbsYHiq_H7py04GDuX95t-GOHAAb8ZFbk -id: duplicate_of_iasc_group_relationship +id: duplicate_of_iasc_group_content label: 'Duplicate of IASC Group Content' module: gnode description: 'Lists all of the nodes that have been added to a group.' diff --git a/config/views.view.iasc_group_content.yml b/config/views.view.iasc_group_content.yml index 611d3063..58312bdb 100644 --- a/config/views.view.iasc_group_content.yml +++ b/config/views.view.iasc_group_content.yml @@ -6,7 +6,7 @@ dependencies: - search_api.index.default_solr_index module: - search_api -id: iasc_group_relationship +id: iasc_group_content label: 'IASC Group Content' module: views description: '' diff --git a/html/modules/custom/iasc_content/iasc_content.module b/html/modules/custom/iasc_content/iasc_content.module index edc202f5..5af4db6d 100644 --- a/html/modules/custom/iasc_content/iasc_content.module +++ b/html/modules/custom/iasc_content/iasc_content.module @@ -1085,7 +1085,7 @@ function iasc_content_fix_entities($entity_type, $bundle, $field_name) { * Implemtents hook_views_pre_render(). */ function iasc_content_views_pre_render(ViewExecutable $view) { - if ($view->id() === 'iasc_group_relationship') { + if ($view->id() === 'iasc_group_content') { $group_id = $view->args[0]; if ($group_id) { if ($group = $group = \Drupal::entityTypeManager()->getStorage('group')->load($group_id)) { diff --git a/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php b/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php index 3cac54da..a47a9916 100644 --- a/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php +++ b/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php @@ -66,7 +66,7 @@ public function build() { $parameters = $this->routeMatch->getParameters(); $needed = FALSE; - if ($parameters->get('view_id', '') == 'iasc_group_relationship') { + if ($parameters->get('view_id', '') == 'iasc_group_content') { $needed = TRUE; $group_id = $parameters->get('group', ''); } diff --git a/local/docker-compose.yml b/local/docker-compose.yml index 0de5b96f..a8adf98a 100644 --- a/local/docker-compose.yml +++ b/local/docker-compose.yml @@ -14,7 +14,7 @@ volumes: services: mysql: - image: public.ecr.aws/unocha/mysql:10.11 + image: public.ecr.aws/unocha/mysql:11.4 hostname: $PROJECT_NAME-mysql container_name: $PROJECT_NAME-mysql environment: diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index e65f6bc2..abafee31 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -10,7 +10,7 @@ volumes: services: mysql: - image: public.ecr.aws/unocha/mysql:10.11 + image: public.ecr.aws/unocha/mysql:11.4 hostname: iasc-test-mysql container_name: iasc-test-mysql environment: