From 1bd6fb9218c7bf3bf93bf77f6ab73718851326ca Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 22 Sep 2023 10:05:36 +0000 Subject: [PATCH] Update configuration --- composer.lock | 110 +++++++++---------- conf/cmi/helfi_api_base.delete_revisions.yml | 6 + docker-compose.yml | 16 --- phpunit.xml.dist | 4 + 4 files changed, 65 insertions(+), 71 deletions(-) create mode 100644 conf/cmi/helfi_api_base.delete_revisions.yml diff --git a/composer.lock b/composer.lock index 93d642d4..a70aa536 100644 --- a/composer.lock +++ b/composer.lock @@ -2035,16 +2035,16 @@ }, { "name": "drupal/core", - "version": "9.5.10", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06" + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/c84bab7403943fbc4ed90ffcdde4460a94642b06", - "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06", + "url": "https://api.github.com/repos/drupal/core/zipball/8afcb233c2a71501b35fed2713167c37831d5c19", + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19", "shasum": "" }, "require": { @@ -2196,9 +2196,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.10" + "source": "https://github.com/drupal/core/tree/9.5.11" }, - "time": "2023-07-05T09:26:59+00:00" + "time": "2023-09-19T17:58:28+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3812,16 +3812,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.1", + "version": "5.6.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09" + "reference": "e8a3b4554e0d87a35cb49aba4c1f581c47fbbd2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09", - "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e8a3b4554e0d87a35cb49aba4c1f581c47fbbd2a", + "reference": "e8a3b4554e0d87a35cb49aba4c1f581c47fbbd2a", "shasum": "" }, "require": { @@ -3839,10 +3839,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-11T12:42:43+00:00" + "time": "2023-09-22T10:02:05+00:00" }, { "name": "drupal/hdbt_admin", @@ -3931,16 +3931,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.4", + "version": "2.5.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "2a0a4fb2ea863232dc3eed32a3e8104fdffab178" + "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2a0a4fb2ea863232dc3eed32a3e8104fdffab178", - "reference": "2a0a4fb2ea863232dc3eed32a3e8104fdffab178", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7ffd5b029f1d85590dc8966007f3936f14cb3c35", + "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35", "shasum": "" }, "require": { @@ -3966,10 +3966,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-09-14T09:11:02+00:00" + "time": "2023-09-18T06:55:18+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4016,12 +4016,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa" + "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", - "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/640edf67a34bf37e44c24b75e45e946c7ddb8ef0", + "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0", "shasum": "" }, "default-branch": true, @@ -4034,20 +4034,20 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-09-06T06:27:11+00:00" + "time": "2023-09-19T05:58:55+00:00" }, { "name": "drupal/helfi_navigation", - "version": "2.0.13", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7" + "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/c2497e87c7b4242354c323aad5c21ec09e37d3a7", - "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/5c0f648a21220a6e8b6c14543f8e60b4b843a918", + "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918", "shasum": "" }, "require": { @@ -4065,23 +4065,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.13", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-09-13T05:51:44+00:00" + "time": "2023-09-21T08:34:22+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.4.5", + "version": "3.4.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "90394a0feab45409ed2c2101ef3d48c02906714e" + "reference": "1b07d5f2c76efef3298ceae016671a2a22bbdaf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/90394a0feab45409ed2c2101ef3d48c02906714e", - "reference": "90394a0feab45409ed2c2101ef3d48c02906714e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/1b07d5f2c76efef3298ceae016671a2a22bbdaf5", + "reference": "1b07d5f2c76efef3298ceae016671a2a22bbdaf5", "shasum": "" }, "require": { @@ -4184,10 +4184,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-13T06:57:57+00:00" + "time": "2023-09-22T10:01:32+00:00" }, { "name": "drupal/helfi_proxy", @@ -4235,16 +4235,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.6", + "version": "2.2.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac" + "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f73c27c4d30522303dfadf1228c7331e120f04ac", - "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/68a4e65acffc2038e5006f1d4b2763bc52017184", + "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184", "shasum": "" }, "require": { @@ -4270,10 +4270,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-09-01T12:09:30+00:00" + "time": "2023-09-14T11:48:29+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -8129,30 +8129,30 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.17.0", + "version": "3.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "dd35c868075bad80b6718959740913e178eb4274" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274", - "reference": "dd35c868075bad80b6718959740913e178eb4274", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -8184,7 +8184,7 @@ "type": "community_bridge" } ], - "time": "2023-03-20T13:51:37+00:00" + "time": "2023-09-19T10:15:21+00:00" }, { "name": "league/container", @@ -15972,16 +15972,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.0", + "version": "1.24.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", "shasum": "" }, "require": { @@ -16013,9 +16013,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1" }, - "time": "2023-09-07T20:46:32+00:00" + "time": "2023-09-18T12:18:02+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/helfi_api_base.delete_revisions.yml b/conf/cmi/helfi_api_base.delete_revisions.yml new file mode 100644 index 00000000..6955f667 --- /dev/null +++ b/conf/cmi/helfi_api_base.delete_revisions.yml @@ -0,0 +1,6 @@ +entity_types: + - node + - paragraph + - tpr_unit + - tpr_service + - tpr_errand_service diff --git a/docker-compose.yml b/docker-compose.yml index e8b20509..c9be64c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,22 +82,6 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true" - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081" - "traefik.docker.network=stonehenge-network" - robo: - image: ghcr.io/city-of-helsinki/drupal-robo:latest - shm_size: '2gb' - tty: true - volumes: - - .:/app:delegated - networks: - - internal - - stonehenge-network - depends_on: - - app - profiles: - - testing - extra_hosts: - - "${DRUPAL_HOSTNAME}:host-gateway" - - "varnish-${DRUPAL_HOSTNAME}:host-gateway" networks: internal: external: false diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1a56d5be..0ae082a9 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -41,9 +41,13 @@ ./tests/dtt/src/ExistingSite + ./public/modules/custom/*/tests/src/ExistingSite + ./public/modules/contrib/*/tests/src/ExistingSite ./tests/dtt/src/ExistingSiteJavascript + ./public/modules/custom/*/tests/src/ExistingSiteJavascript + ./public/modules/contrib/*/tests/src/ExistingSiteJavascript