From c24dc4a1f5ab696dbc68737987fb5772cc2138fe Mon Sep 17 00:00:00 2001 From: actions-bot Date: Thu, 19 Oct 2023 13:15:15 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 1 + composer.lock | 205 +++++++++++++++++++++++----------- docker-compose.yml | 4 +- tools/make/project/install.mk | 5 + 4 files changed, 147 insertions(+), 68 deletions(-) create mode 100644 .platform/schema diff --git a/.platform/schema b/.platform/schema new file mode 100644 index 000000000..d8263ee98 --- /dev/null +++ b/.platform/schema @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/composer.lock b/composer.lock index 19b1de1f9..da3c8a6dd 100644 --- a/composer.lock +++ b/composer.lock @@ -766,16 +766,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86" + "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/f65524e9ecd2bd0021c4b18710005caaa6dcbd86", - "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58", + "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58", "shasum": "" }, "require": { @@ -814,9 +814,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.3.1" + "source": "https://github.com/consolidation/output-formatters/tree/4.3.2" }, - "time": "2023-05-20T03:23:06+00:00" + "time": "2023-07-06T04:45:41+00:00" }, { "name": "consolidation/robo", @@ -3931,16 +3931,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.17", + "version": "5.6.22", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2" + "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/227d2cc22318ad706d4c75417478423ea6c35ce2", - "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d28f8bf7135f1e0e59c4679c977fbafafbe3add5", + "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5", "shasum": "" }, "require": { @@ -3958,10 +3958,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.17", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.22", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-11T13:04:35+00:00" + "time": "2023-10-19T13:07:34+00:00" }, { "name": "drupal/hdbt_admin", @@ -4050,16 +4050,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.7", + "version": "2.5.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "8f39f1d33757ca36623b4e223138357e39d388c6" + "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/8f39f1d33757ca36623b4e223138357e39d388c6", - "reference": "8f39f1d33757ca36623b4e223138357e39d388c6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/c8ed69e045bae960fff5b71179d09f62ea53651a", + "reference": "c8ed69e045bae960fff5b71179d09f62ea53651a", "shasum": "" }, "require": { @@ -4085,10 +4085,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-10-05T13:06:46+00:00" + "time": "2023-10-18T05:44:50+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4135,16 +4135,41 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc" + "reference": "4b78f15679d99b14dec7a62e593c2c8001f15cfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/8dfd9dda99f0934070119547e7f950d3f90a9ebc", - "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/4b78f15679d99b14dec7a62e593c2c8001f15cfa", + "reference": "4b78f15679d99b14dec7a62e593c2c8001f15cfa", "shasum": "" }, + "require": { + "drush/drush": "^10 || ^11 || ^12" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "drupal/coder": "^8.3", + "phpspec/prophecy-phpunit": "^2", + "phpunit/phpunit": "^9.6" + }, "default-branch": true, "type": "drupal-drush", + "autoload": { + "psr-4": { + "DrupalTools\\": "src" + }, + "files": [ + "src/Update/migrations.php" + ] + }, + "autoload-dev": { + "psr-4": { + "DrupalToolsTest\\": "tests/fixtures" + }, + "files": [ + "tests/fixtures/migration_fixture.php" + ] + }, "license": [ "GPL-2.0-or-later" ], @@ -4153,7 +4178,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-09-26T09:45:28+00:00" + "time": "2023-10-16T07:36:56+00:00" }, { "name": "drupal/helfi_navigation", @@ -4191,16 +4216,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.25", + "version": "3.4.29", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "68e859125538f820eb264a21342ad1fddc094b11" + "reference": "a3827797611517358b73a5c5f7f5653b918c2ea9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/68e859125538f820eb264a21342ad1fddc094b11", - "reference": "68e859125538f820eb264a21342ad1fddc094b11", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a3827797611517358b73a5c5f7f5653b918c2ea9", + "reference": "a3827797611517358b73a5c5f7f5653b918c2ea9", "shasum": "" }, "require": { @@ -4304,10 +4329,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.25", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.29", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-13T10:46:22+00:00" + "time": "2023-10-19T09:49:07+00:00" }, { "name": "drupal/helfi_proxy", @@ -6638,17 +6663,17 @@ }, { "name": "drupal/search_api", - "version": "1.29.0", + "version": "1.30.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.29" + "reference": "8.x-1.30" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip", - "reference": "8.x-1.29", - "shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip", + "reference": "8.x-1.30", + "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -6669,8 +6694,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.29", - "datestamp": "1679910252", + "version": "8.x-1.30", + "datestamp": "1697366291", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6678,7 +6703,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -7086,36 +7111,78 @@ }, { "name": "drupal/stomp", - "version": "2.0.0-alpha1", + "version": "2.0.0-alpha3", "source": { "type": "git", - "url": "https://github.com/City-of-Helsinki/drupal-module-stomp.git", - "reference": "820e1f3aa23dfdce441ac827e03286528111f497" + "url": "https://git.drupalcode.org/project/stomp.git", + "reference": "2.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-stomp/zipball/820e1f3aa23dfdce441ac827e03286528111f497", - "reference": "820e1f3aa23dfdce441ac827e03286528111f497", - "shasum": "" + "url": "https://ftp.drupal.org/files/projects/stomp-2.0.0-alpha3.zip", + "reference": "2.0.0-alpha3", + "shasum": "47607b91f06437259e1b0a84b9a696340df8ce55" }, "require": { + "drupal/core": "^9 || ^10", "php": "^8.1", "stomp-php/stomp-php": "^5.0" }, + "conflict": { + "drush/drush": "<11.6" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "drupal/coder": "^8.3" + "drupal/coder": "^8.3", + "drush/drush": "^11.6 || ^12", + "jangregor/phpstan-prophecy": "dev-master", + "mglaman/phpstan-drupal": "^1.2", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "1.11.x-dev", + "phpstan/phpstan-deprecation-rules": "1.2.x-dev" }, "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-alpha3", + "datestamp": "1697289803", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", "license": [ "GPL-2.0-or-later" ], + "authors": [ + { + "name": "alexpott", + "homepage": "https://www.drupal.org/user/157725" + }, + { + "name": "legovaer", + "homepage": "https://www.drupal.org/user/1327142" + }, + { + "name": "tayzlor", + "homepage": "https://www.drupal.org/user/274980" + }, + { + "name": "tsphethean", + "homepage": "https://www.drupal.org/user/881620" + }, + { + "name": "tuutti", + "homepage": "https://www.drupal.org/user/1114264" + } + ], "description": "Integrate Drupal with an external STOMP or AMQP message queue, such as ActiveMQ.", + "homepage": "https://www.drupal.org/project/stomp", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-stomp/tree/2.0.0-alpha1", - "issues": "https://github.com/City-of-Helsinki/drupal-module-stomp/issues" - }, - "time": "2023-10-06T08:19:03+00:00" + "source": "https://git.drupalcode.org/project/stomp" + } }, { "name": "drupal/token", @@ -9589,16 +9656,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { @@ -9629,7 +9696,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -9641,7 +9708,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "league/uri", @@ -10169,16 +10236,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -10219,9 +10286,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "nodespark/des-connector", @@ -11422,16 +11489,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.18", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -11460,7 +11527,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false } }, "autoload": { @@ -11492,9 +11563,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-05-23T02:31:11+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "ralouphie/getallheaders", @@ -19414,5 +19485,5 @@ "ext-libxml": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/docker-compose.yml b/docker-compose.yml index c7dc6ba8b..941446d7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,8 @@ services: # Optionally, you can add this to your default environments variables to enable or disable # xdebug by default (like /etc/environments, ~/.bashrc, or ~/.zshrc). XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}" + XDEBUG_CONFIG: "${XDEBUG_CONFIG:-}" + PHP_IDE_CONFIG: "${PHP_IDE_CONFIG:-serverName=${DRUPAL_HOSTNAME}}" # DOCKERHOST: host.docker.internal # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. @@ -121,7 +123,7 @@ services: container_name: "${COMPOSE_PROJECT_NAME}-artemis" image: quay.io/artemiscloud/activemq-artemis-broker environment: - AMQ_EXTRA_ARGS: "--nio --user admin --password admin" + AMQ_EXTRA_ARGS: "--user admin --password admin" depends_on: - app networks: diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index c38be1433..03b477635 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -6,7 +6,12 @@ endif DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token') + +SYNC_TARGETS := drush-sync-db + +ifneq ($(DUMP_SQL_EXISTS),yes) SYNC_TARGETS := oc-login oc-sync +endif PHONY += oc-login oc-login: