From 9e885c8de40d68f1630bf94db2b6bbca99dcf414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 21 Dec 2022 09:14:08 +0200 Subject: [PATCH 1/4] Updated PHP 8.1 to local docker containers and update Drupal to 9.5. --- .env | 2 +- .gitattributes | 16 +-- composer.json | 4 +- composer.lock | 306 +++++++++++++++++++++++++------------------------ 4 files changed, 165 insertions(+), 163 deletions(-) diff --git a/.env b/.env index 5e499928..83b562bf 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ STAGE_FILE_PROXY_ORIGIN_DIR= DRUPAL_HOSTNAME=helfi-kuva.docker.so # Docker image -DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.0 +DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.1 # Default source @alias where to sync database and files from DRUPAL_SYNC_SOURCE=main diff --git a/.gitattributes b/.gitattributes index a37894e8..76ea8fee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,24 +19,24 @@ *.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html -*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php -*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php +*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php -*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php +*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 -*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php +*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php *.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff --git a/composer.json b/composer.json index 1844e72c..48626c20 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,8 @@ "require": { "composer/installers": "^2.0", "cweagans/composer-patches": "^1.6.7", - "drupal/core-composer-scaffold": "~9.4.5", - "drupal/core-recommended": "~9.4.5", + "drupal/core-composer-scaffold": "^9.4", + "drupal/core-recommended": "^9.4", "drupal/hdbt": "^4.0", "drupal/hdbt_admin": "^1.0", "drupal/helfi_azure_fs": "^1.0", diff --git a/composer.lock b/composer.lock index 4d201287..2b3a2f77 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": "e19732725fc285f3110d612f2503dbad", + "content-hash": "c3d8ea70abfea8662e369656ed50729d", "packages": [ { "name": "asm89/stack-cors", @@ -2183,16 +2183,16 @@ }, { "name": "drupal/core", - "version": "9.4.9", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "5fa639a3ddf0241db08b270f429f9da91d06fdfc" + "reference": "f56525999dba655b4fc867df95edf8727f8b8624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/5fa639a3ddf0241db08b270f429f9da91d06fdfc", - "reference": "5fa639a3ddf0241db08b270f429f9da91d06fdfc", + "url": "https://api.github.com/repos/drupal/core/zipball/f56525999dba655b4fc867df95edf8727f8b8624", + "reference": "f56525999dba655b4fc867df95edf8727f8b8624", "shasum": "" }, "require": { @@ -2215,7 +2215,7 @@ "ext-tokenizer": "*", "ext-xml": "*", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "laminas/laminas-diactoros": "^2.11", + "laminas/laminas-diactoros": "^2.14", "laminas/laminas-feed": "^2.17", "masterminds/html5": "^2.7", "pear/archive_tar": "^1.4.14", @@ -2229,8 +2229,8 @@ "symfony/http-foundation": "^4.4.7", "symfony/http-kernel": "^4.4", "symfony/mime": "^5.4", - "symfony/polyfill-iconv": "^1.25", - "symfony/polyfill-php80": "^1.25", + "symfony/polyfill-iconv": "^1.26", + "symfony/polyfill-php80": "^1.26", "symfony/process": "^4.4", "symfony/psr-http-message-bridge": "^2.1", "symfony/routing": "^4.4", @@ -2344,22 +2344,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.4.9" + "source": "https://github.com/drupal/core/tree/9.5.0" }, - "time": "2022-12-07T13:36:57+00:00" + "time": "2022-12-15T14:33:38+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.4.8", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f" + "reference": "df1f779d3f94500f6cc791427aa729e0ba4b2464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f", - "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/df1f779d3f94500f6cc791427aa729e0ba4b2464", + "reference": "df1f779d3f94500f6cc791427aa729e0ba4b2464", "shasum": "" }, "require": { @@ -2394,40 +2394,40 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.8" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.0" }, - "time": "2022-06-19T16:14:23+00:00" + "time": "2022-06-19T16:14:18+00:00" }, { "name": "drupal/core-recommended", - "version": "9.4.9", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "20a9b373c4b3fc23a56d9d0a591a3c3b3415d433" + "reference": "db501d834a042f2bde349a8fc49b8364db99790b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/20a9b373c4b3fc23a56d9d0a591a3c3b3415d433", - "reference": "20a9b373c4b3fc23a56d9d0a591a3c3b3415d433", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/db501d834a042f2bde349a8fc49b8364db99790b", + "reference": "db501d834a042f2bde349a8fc49b8364db99790b", "shasum": "" }, "require": { "asm89/stack-cors": "~1.3.0", "composer/semver": "~3.3.2", - "doctrine/annotations": "~1.13.2", + "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.4.9", - "egulias/email-validator": "~3.2", + "drupal/core": "9.5.0", + "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", - "guzzlehttp/promises": "~1.5.1", + "guzzlehttp/promises": "~1.5.2", "guzzlehttp/psr7": "~1.9.0", - "laminas/laminas-diactoros": "~2.11.1", + "laminas/laminas-diactoros": "~2.14.0", "laminas/laminas-escaper": "~2.9.0", "laminas/laminas-feed": "~2.17.0", - "laminas/laminas-stdlib": "~3.7.1", - "masterminds/html5": "~2.7.5", + "laminas/laminas-stdlib": "~3.11.0", + "masterminds/html5": "~2.7.6", "pear/archive_tar": "~1.4.14", "pear/console_getopt": "~v1.4.3", "pear/pear-core-minimal": "~v1.10.11", @@ -2440,33 +2440,33 @@ "ralouphie/getallheaders": "~3.0.3", "stack/builder": "~v1.0.6", "symfony-cmf/routing": "~2.3.4", - "symfony/console": "~v4.4.42", - "symfony/debug": "~v4.4.41", - "symfony/dependency-injection": "~v4.4.42", - "symfony/deprecation-contracts": "~v2.5.1", - "symfony/error-handler": "~v4.4.41", - "symfony/event-dispatcher": "~v4.4.42", - "symfony/event-dispatcher-contracts": "~v1.1.12", - "symfony/http-client-contracts": "~v2.5.1", - "symfony/http-foundation": "~v4.4.41", - "symfony/http-kernel": "~v4.4.42", - "symfony/mime": "~v5.4.9", - "symfony/polyfill-ctype": "~v1.25.0", - "symfony/polyfill-iconv": "~v1.25.0", - "symfony/polyfill-intl-idn": "~v1.25.0", - "symfony/polyfill-intl-normalizer": "~v1.25.0", - "symfony/polyfill-mbstring": "~v1.25.0", - "symfony/polyfill-php80": "~v1.25.0", - "symfony/process": "~v4.4.41", - "symfony/psr-http-message-bridge": "~v2.1.2", - "symfony/routing": "~v4.4.41", - "symfony/serializer": "~v4.4.42", - "symfony/service-contracts": "~v2.5.1", - "symfony/translation": "~v4.4.41", - "symfony/translation-contracts": "~v2.5.1", - "symfony/validator": "~v4.4.41", - "symfony/var-dumper": "~v5.4.9", - "symfony/yaml": "~v4.4.37", + "symfony/console": "~v4.4.49", + "symfony/debug": "~v4.4.44", + "symfony/dependency-injection": "~v4.4.49", + "symfony/deprecation-contracts": "~v2.5.2", + "symfony/error-handler": "~v4.4.44", + "symfony/event-dispatcher": "~v4.4.44", + "symfony/event-dispatcher-contracts": "~v1.1.13", + "symfony/http-client-contracts": "~v2.5.2", + "symfony/http-foundation": "~v4.4.49", + "symfony/http-kernel": "~v4.4.49", + "symfony/mime": "~v5.4.13", + "symfony/polyfill-ctype": "~v1.27.0", + "symfony/polyfill-iconv": "~v1.27.0", + "symfony/polyfill-intl-idn": "~v1.27.0", + "symfony/polyfill-intl-normalizer": "~v1.27.0", + "symfony/polyfill-mbstring": "~v1.27.0", + "symfony/polyfill-php80": "~v1.27.0", + "symfony/process": "~v4.4.44", + "symfony/psr-http-message-bridge": "~v2.1.4", + "symfony/routing": "~v4.4.44", + "symfony/serializer": "~v4.4.47", + "symfony/service-contracts": "~v2.5.2", + "symfony/translation": "~v4.4.47", + "symfony/translation-contracts": "~v2.5.2", + "symfony/validator": "~v4.4.48", + "symfony/var-dumper": "~v5.4.14", + "symfony/yaml": "~v4.4.45", "twig/twig": "~v2.15.3", "typo3/phar-stream-wrapper": "~v3.1.7" }, @@ -2480,9 +2480,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/9.4.9" + "source": "https://github.com/drupal/core-recommended/tree/9.5.0" }, - "time": "2022-12-07T13:36:57+00:00" + "time": "2022-12-15T14:33:38+00:00" }, { "name": "drupal/crop", @@ -4252,16 +4252,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.15.6", + "version": "2.16.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fade6389685f17868355a129f6872f50b75a81b4" + "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fade6389685f17868355a129f6872f50b75a81b4", - "reference": "fade6389685f17868355a129f6872f50b75a81b4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", + "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", "shasum": "" }, "require": { @@ -4323,6 +4323,7 @@ "drupal/views_bulk_operations": "^4.1" }, "conflict": { + "drupal/core-recommended": "<9.5", "drupal/ctools": "<3.11 || ^4.0.1" }, "type": "drupal-module", @@ -4334,8 +4335,8 @@ "drupal/core": { "[#UHF-181] Hide untranslated menu links": "https://www.drupal.org/files/issues/2021-03-05/3091246-allow-menu-tree-manipulators-alter-12-1.patch", "[#UHF-920] Token for base URL (https://www.drupal.org/project/drupal/issues/1088112).": "https://www.drupal.org/files/issues/2020-10-06/1088112-63.patch", - "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299). Re-rolled for hel.fi": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/83eb65d99327bf9c9c67ca4f7c1220ae3d8e2eae/patches/drupal-3163299-ajax-exposed-filters-views-block-on-same-page.patch", - "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629)": "https://www.drupal.org/files/issues/2021-07-09/2807629-45.patch", + "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299). Re-rolled for hel.fi": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/01229a9fc8ec33532d2fc624ea58ffc63817eafd/patches/drupal-3163299-ajax-exposed-filters-views-block-on-same-page.patch", + "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629)": "https://www.drupal.org/files/issues/2022-12-16/2807629-75.patch", "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", @@ -4367,10 +4368,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-12-13T10:13:24+00:00" + "time": "2022-12-16T11:47:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -7927,16 +7928,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.11.3", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76" + "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/1f97b0c52eafd108e09c76d6b29d83ef4a855f76", - "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6cb35f61913f06b2c91075db00f67cfd78869e28", + "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28", "shasum": "" }, "require": { @@ -7957,13 +7958,13 @@ "ext-dom": "*", "ext-gd": "*", "ext-libxml": "*", - "http-interop/http-factory-tests": "^0.8.0", - "laminas/laminas-coding-standard": "~1.0.0", - "php-http/psr7-integration-tests": "^1.1", + "http-interop/http-factory-tests": "^0.9.0", + "laminas/laminas-coding-standard": "~2.3.0", + "php-http/psr7-integration-tests": "^1.1.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1", - "psalm/plugin-phpunit": "^0.14.0", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "type": "library", "extra": { @@ -8022,7 +8023,7 @@ "type": "community_bridge" } ], - "time": "2022-07-06T09:24:53+00:00" + "time": "2022-07-28T12:23:48+00:00" }, { "name": "laminas/laminas-escaper", @@ -8165,16 +8166,16 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.7.1", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "bcd869e2fe88d567800057c1434f2380354fe325" + "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/bcd869e2fe88d567800057c1434f2380354fe325", - "reference": "bcd869e2fe88d567800057c1434f2380354fe325", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f", + "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f", "shasum": "" }, "require": { @@ -8187,7 +8188,7 @@ "laminas/laminas-coding-standard": "~2.3.0", "phpbench/phpbench": "^1.0", "phpunit/phpunit": "^9.3.7", - "psalm/plugin-phpunit": "^0.16.0", + "psalm/plugin-phpunit": "^0.17.0", "vimeo/psalm": "^4.7" }, "type": "library", @@ -8220,7 +8221,7 @@ "type": "community_bridge" } ], - "time": "2022-01-21T15:50:46+00:00" + "time": "2022-07-27T12:28:58+00:00" }, { "name": "league/container", @@ -8548,37 +8549,38 @@ }, { "name": "league/uri", - "version": "6.7.2", + "version": "6.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "d3b50812dd51f3fbf176344cc2981db03d10fe06" + "reference": "a700b4656e4c54371b799ac61e300ab25a2d1d39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/d3b50812dd51f3fbf176344cc2981db03d10fe06", - "reference": "d3b50812dd51f3fbf176344cc2981db03d10fe06", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/a700b4656e4c54371b799ac61e300ab25a2d1d39", + "reference": "a700b4656e4c54371b799ac61e300ab25a2d1d39", "shasum": "" }, "require": { "ext-json": "*", "league/uri-interfaces": "^2.3", - "php": "^7.4 || ^8.0", - "psr/http-message": "^1.0" + "php": "^8.1", + "psr/http-message": "^1.0.1" }, "conflict": { "league/uri-schemes": "^1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^v3.3.2", - "nyholm/psr7": "^1.5", - "php-http/psr7-integration-tests": "^1.1", - "phpstan/phpstan": "^1.2.0", + "friendsofphp/php-cs-fixer": "^v3.9.5", + "nyholm/psr7": "^1.5.1", + "php-http/psr7-integration-tests": "^1.1.1", + "phpbench/phpbench": "^1.2.6", + "phpstan/phpstan": "^1.8.5", "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0.0", - "phpstan/phpstan-strict-rules": "^1.1.0", - "phpunit/phpunit": "^9.5.10", - "psr/http-factory": "^1.0" + "phpstan/phpstan-phpunit": "^1.1.1", + "phpstan/phpstan-strict-rules": "^1.4.3", + "phpunit/phpunit": "^9.5.24", + "psr/http-factory": "^1.0.1" }, "suggest": { "ext-fileinfo": "Needed to create Data URI from a filepath", @@ -8635,7 +8637,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri/issues", - "source": "https://github.com/thephpleague/uri/tree/6.7.2" + "source": "https://github.com/thephpleague/uri/tree/6.8.0" }, "funding": [ { @@ -8643,7 +8645,7 @@ "type": "github" } ], - "time": "2022-09-13T19:50:42+00:00" + "time": "2022-09-13T19:58:47+00:00" }, { "name": "league/uri-interfaces", @@ -11781,16 +11783,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -11805,7 +11807,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11843,7 +11845,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -11859,20 +11861,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" + "reference": "927013f3aac555983a5059aada98e1907d842695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", + "reference": "927013f3aac555983a5059aada98e1907d842695", "shasum": "" }, "require": { @@ -11887,7 +11889,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11926,7 +11928,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" }, "funding": [ { @@ -11942,20 +11944,20 @@ "type": "tidelift" } ], - "time": "2022-01-04T09:04:05+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -11969,7 +11971,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12013,7 +12015,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -12029,20 +12031,20 @@ "type": "tidelift" } ], - "time": "2021-09-14T14:02:44+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -12054,7 +12056,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12097,7 +12099,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -12113,20 +12115,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -12141,7 +12143,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12180,7 +12182,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -12196,7 +12198,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", @@ -12355,16 +12357,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -12373,7 +12375,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12418,7 +12420,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -12434,7 +12436,7 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", @@ -14613,16 +14615,16 @@ }, { "name": "drupal/core-dev", - "version": "9.4.8", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29" + "reference": "60196e12909624e168c482660c0f5795df67a6d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29", - "reference": "72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/60196e12909624e168c482660c0f5795df67a6d7", + "reference": "60196e12909624e168c482660c0f5795df67a6d7", "shasum": "" }, "require": { @@ -14634,7 +14636,7 @@ "friends-of-behat/mink-browserkit-driver": "^1.4", "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", - "mikey179/vfsstream": "^1.6.8", + "mikey179/vfsstream": "^1.6.11", "phpspec/prophecy": "^1.12", "phpunit/phpunit": "^8.5.14 || ^9", "symfony/browser-kit": "^4.4", @@ -14657,9 +14659,9 @@ ], "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/9.4.8" + "source": "https://github.com/drupal/core-dev/tree/9.5.0" }, - "time": "2022-04-14T00:37:13+00:00" + "time": "2022-07-27T00:23:55+00:00" }, { "name": "easyrdf/easyrdf", @@ -15800,16 +15802,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.21", + "version": "9.2.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0" + "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3f893e19712bb0c8bc86665d1562e9fd509c4ef0", - "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df", + "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df", "shasum": "" }, "require": { @@ -15865,7 +15867,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.21" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22" }, "funding": [ { @@ -15873,7 +15875,7 @@ "type": "github" } ], - "time": "2022-12-14T13:26:54+00:00" + "time": "2022-12-18T16:40:55+00:00" }, { "name": "phpunit/php-file-iterator", From 4473f0b87caee8bfcfb6d65e604545f8c36f7ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 21 Dec 2022 09:44:40 +0200 Subject: [PATCH 2/4] Updated github workflows and tools. --- .github/workflows/artifact.yml | 2 +- .github/workflows/test.yml | 13 +++++++------ .github/workflows/update-config.yml | 3 ++- tools/make/Makefile | 17 ----------------- tools/make/common.mk | 3 ++- tools/make/docker.mk | 12 ++++++------ tools/make/drupal.mk | 11 +++++++++-- tools/make/include.mk | 23 +++++++++++++++++++++++ tools/make/kubectl.mk | 3 +-- 9 files changed, 51 insertions(+), 36 deletions(-) diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index ff525501..d4f85a89 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.0-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine services: db: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b0cc4e1..73c91835 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,11 +9,11 @@ jobs: tests: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.0-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine services: db: - image: mariadb:10.7 + image: mariadb:10.9 env: MYSQL_USER: drupal MYSQL_PASSWORD: drupal @@ -52,13 +52,14 @@ jobs: run: | drush runserver $SIMPLETEST_BASE_URL > /dev/null 2>&1 & chromedriver --port=4444 > /dev/null 2>&1 & - # Uncomment the line below to run 'existing-site-javascript' tests. - # chromium-browser --headless --disable-gpu --remote-debugging-port=9222 & + # Chromium browser is required to run 'functional-javascript' and + # 'existing-site-javascript' tests. + chromium-browser --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 & + # Wait for drush server to start. for i in {1..5}; do RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done - name: Run PHPUnit tests run: | composer test-php public/modules/custom - # Uncomment the line below to run drupal-test-trait tests under tests/src/* folder. - # composer test-php tests/ + [ -d "tests/" ] && composer test-php tests/ || echo "No DTT tests found. Ignoring..." diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 2c595707..2790c16f 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -11,7 +11,7 @@ jobs: update-config: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.0-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine services: db: @@ -52,6 +52,7 @@ jobs: author: actions-bot commit-message: Update configuration title: Automatic update + labels: auto-update body: | - Updated active configuration. - Updated platform diff --git a/tools/make/Makefile b/tools/make/Makefile index 19f1cf97..ce10ca6f 100644 --- a/tools/make/Makefile +++ b/tools/make/Makefile @@ -12,23 +12,6 @@ UNAME_S := $(shell uname -s) UPDATE_SCRIPT_URL := https://git.io/JP10q WEBROOT ?= public -# Detect app -IS_DRUPAL ?= $(shell test -f $(WEBROOT)/sites/default/settings.php && echo yes || echo no) -IS_SYMFONY ?= $(shell test -f config/bundles.php && echo yes || echo no) -IS_WP ?= $(shell (test -f $(WEBROOT)/wp-settings.php || test -f conf/wp-config.php) && echo yes || echo no) - -# Detect additional tooling -LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no) -WODBY := $(shell test -f wodby.yml && echo yes || echo no) - -ifeq ($(LAGOON),yes) - SYSTEM := LAGOON -else ifeq ($(WODBY),yes) - SYSTEM := WODBY -else - SYSTEM := WHOKNOWS -endif - include $(DRUIDFI_TOOLS_MAKE_DIR)utils.mk # Include druidfi/tools make files diff --git a/tools/make/common.mk b/tools/make/common.mk index 55b972a0..fe000103 100644 --- a/tools/make/common.mk +++ b/tools/make/common.mk @@ -40,7 +40,8 @@ build-production: PHONY += clean clean: ## Cleanup - $(call step,Do Git clean\n) + $(call step,Cleanup loaded files...\n) + @rm -rf vendor @git clean -fdx $(foreach item,$(CLEAN_EXCLUDE),-e $(item)) PHONY += self-update diff --git a/tools/make/docker.mk b/tools/make/docker.mk index 89014bcf..9ddde12b 100644 --- a/tools/make/docker.mk +++ b/tools/make/docker.mk @@ -1,7 +1,7 @@ CLI_SERVICE := cli CLI_SHELL := sh CLI_USER := root -DOCKER_COMPOSE := docker-compose +DOCKER_COMPOSE := docker compose DOCKER_COMPOSE_EXEC ?= $(DOCKER_COMPOSE) exec DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no) @@ -15,7 +15,7 @@ endif PHONY += config config: ## Show docker-compose config - $(call step,Show docker-compose config...\n) + $(call step,Show Docker Compose config...\n) $(call docker_compose,config) PHONY += pull @@ -29,8 +29,8 @@ down: ## Tear down the environment $(call docker_compose,down -v --remove-orphans --rmi local) PHONY += ps -ps: ## Show docker-compose ps - $(call step,Show docker-compose ps...\n) +ps: ## List containers + $(call step,List container(s)...\n) $(call docker_compose,ps) PHONY += stop @@ -39,9 +39,9 @@ stop: ## Stop the environment $(call docker_compose,stop) PHONY += up -up: pull ## Launch the environment +up: ## Launch the environment $(call step,Start up the container(s)...\n) - $(call docker_compose,up -d --remove-orphans) + $(call docker_compose,up -d --pull always --wait --remove-orphans) PHONY += shell shell: ## Login to CLI container diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk index 44721390..c5aaa881 100644 --- a/tools/make/drupal.mk +++ b/tools/make/drupal.mk @@ -8,7 +8,7 @@ DRUPAL_DISABLE_MODULES ?= no DRUPAL_ENABLE_MODULES ?= no DRUPAL_PROFILE ?= minimal DRUPAL_SYNC_FILES ?= yes -DRUPAL_SYNC_SOURCE ?= production +DRUPAL_SYNC_SOURCE ?= main DRUSH_RSYNC_MODE ?= Pakzu DRUSH_RSYNC_OPTS ?= -- --omit-dir-times --no-perms --no-group --no-owner --chmod=ugo=rwX DRUSH_RSYNC_EXCLUDE ?= css:ctools:js:php:tmp:tmp_php @@ -38,6 +38,7 @@ endif PHONY += drupal-create-folders drupal-create-folders: + @mkdir -p $(WEBROOT)/sites/default/files/private @mkdir -p $(WEBROOT)/sites/default/files/translations PHONY += drupal-update @@ -157,7 +158,7 @@ drush-create-dump: ## Create database dump to dump.sql PHONY += drush-download-dump drush-download-dump: ## Download database dump to dump.sql - $(call drush,-Dssh.tty=0 @$(DRUPAL_SYNC_SOURCE) sql-dump --structure-tables-key=common > ${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME)) + $(call drush,@$(DRUPAL_SYNC_SOURCE) sql-dump --structure-tables-key=common > ${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME)) PHONY += open-db-gui open-db-gui: DB_CONTAINER := $(COMPOSE_PROJECT_NAME)-db @@ -172,6 +173,12 @@ fix-drupal: ## Fix Drupal code style $(call step,Fix Drupal code style with phpcbf...\n) $(call cs,phpcbf,$(PATHS)) +PHONY += fix-drupal-coder +fix-drupal-coder: VERSION := 8.3.16 +fix-drupal-coder: ## Fix Drupal Coder loading + composer config repositories.drupal '{"type": "composer", "url": "https://packages.drupal.org/8"}' + composer config repositories.drupal/coder '{"type": "package", "package": {"name": "drupal/coder", "type": "phpcodesniffer-standard", "version": "$(VERSION)", "dist": {"type": "zip", "url": "https://ftp.drupal.org/files/projects/coder-$(VERSION).zip"}}}' + PHONY += lint-drupal lint-drupal: PATHS := $(subst $(space),,$(LINT_PATHS_PHP)) lint-drupal: ## Lint Drupal code style diff --git a/tools/make/include.mk b/tools/make/include.mk index d69a4665..2216bc1f 100644 --- a/tools/make/include.mk +++ b/tools/make/include.mk @@ -6,6 +6,14 @@ endif include $(DRUIDFI_TOOLS_MAKE_DIR)qa.mk +# +# Apps +# + +IS_DRUPAL ?= $(shell test -f $(WEBROOT)/sites/default/settings.php && echo yes || echo no) +IS_SYMFONY ?= $(shell test -f config/bundles.php && echo yes || echo no) +IS_WP ?= $(shell (test -f $(WEBROOT)/wp-settings.php || test -f conf/wp-config.php) && echo yes || echo no) + ifeq ($(IS_DRUPAL),yes) include $(DRUIDFI_TOOLS_MAKE_DIR)drupal.mk endif @@ -18,6 +26,21 @@ ifeq ($(IS_WP),yes) include $(DRUIDFI_TOOLS_MAKE_DIR)wordpress.mk endif +# +# Hosting systems +# + +LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no) +WODBY := $(shell test -f wodby.yml && echo yes || echo no) + +ifeq ($(LAGOON),yes) + SYSTEM := LAGOON +else ifeq ($(WODBY),yes) + SYSTEM := WODBY +else + SYSTEM := WHOKNOWS +endif + ifeq ($(SYSTEM),LAGOON) include $(DRUIDFI_TOOLS_MAKE_DIR)lagoon.mk endif diff --git a/tools/make/kubectl.mk b/tools/make/kubectl.mk index 6f538f8d..e4f3c604 100644 --- a/tools/make/kubectl.mk +++ b/tools/make/kubectl.mk @@ -3,7 +3,6 @@ KUBECTL_NAMESPACE ?= foobar-namespace KUBECTL_SHELL ?= sh KUBECTL_EXEC_FLAGS ?= -n $(KUBECTL_NAMESPACE) -c $(KUBECTL_CONTAINER) KUBECTL_WORKDIR ?= /app -KUBECTL_POD_SELECTOR ?= --field-selector=status.phase==Running PHONY += kubectl-sync-db kubectl-sync-db: ## Sync database from Kubernetes @@ -48,5 +47,5 @@ define kubectl_cp endef define kubectl_get_pod - $(shell $(KUBECTL_BIN) get pods -n $(KUBECTL_NAMESPACE) $(KUBECTL_POD_SELECTOR) -o jsonpath="{.items[0].metadata.name}") + $(shell $(KUBECTL_BIN) get pods -n $(KUBECTL_NAMESPACE) --template '{{range .items}}{{ if not .metadata.deletionTimestamp }}{{.metadata.name}}{{"\n"}}{{end}}{{end}}') endef From dc8449f89b073d15f1c4bc16528e8cddfa5c2d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto-Pekka=20Nyka=CC=88nen?= Date: Thu, 5 Jan 2023 12:00:25 +0200 Subject: [PATCH 3/4] UHF-7862: update proxy 2.3 to 3.0 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 48626c20..fe68d475 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "drupal/helfi_drupal_tools": "dev-main", "drupal/helfi_navigation": "^1.0", "drupal/helfi_platform_config": "^2.0", - "drupal/helfi_proxy": "^2.0", + "drupal/helfi_proxy": "^3.0", "drupal/helfi_tpr": "^2.0", "drupal/helfi_tunnistamo": "^2.0", "drupal/raven": "^4.0", diff --git a/composer.lock b/composer.lock index 2b3a2f77..c271a85f 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": "c3d8ea70abfea8662e369656ed50729d", + "content-hash": "986ad42a30afcefede8eda8dc60134c6", "packages": [ { "name": "asm89/stack-cors", @@ -4375,16 +4375,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "2.3.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7" + "reference": "569383371028ec22e3a82c9ebc2c20ddced5a075" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", - "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/569383371028ec22e3a82c9ebc2c20ddced5a075", + "reference": "569383371028ec22e3a82c9ebc2c20ddced5a075", "shasum": "" }, "require": { @@ -4409,10 +4409,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.3.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-11-08T11:03:23+00:00" + "time": "2022-11-10T04:53:14+00:00" }, { "name": "drupal/helfi_tpr", From f6ae902336bc389c9bb09e9bc6fb89eda409dea4 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 11 Jan 2023 07:41:40 +0000 Subject: [PATCH 4/4] Update configuration --- composer.lock | 588 ++++++++++++++---- ...isplay.tpr_service.tpr_service.default.yml | 30 + ...isplay.tpr_service.tpr_service.default.yml | 3 + ...display.tpr_service.tpr_service.teaser.yml | 3 + conf/cmi/core.extension.yml | 3 + ..._mdm.file_metadata_plugin.getimagesize.yml | 9 + conf/cmi/file_mdm.settings.yml | 6 + ...e_metadata_plugin.imagemagick_identify.yml | 9 + conf/cmi/imagemagick.settings.yml | 61 ++ conf/cmi/sophron.settings.yml | 5 + conf/cmi/system.image.yml | 2 +- public/sites/default/settings.php | 7 +- 12 files changed, 607 insertions(+), 119 deletions(-) create mode 100644 conf/cmi/file_mdm.file_metadata_plugin.getimagesize.yml create mode 100644 conf/cmi/file_mdm.settings.yml create mode 100644 conf/cmi/imagemagick.file_metadata_plugin.imagemagick_identify.yml create mode 100644 conf/cmi/imagemagick.settings.yml create mode 100644 conf/cmi/sophron.settings.yml diff --git a/composer.lock b/composer.lock index c271a85f..68740863 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": "986ad42a30afcefede8eda8dc60134c6", + "content-hash": "1c7168085c5bf2435555f98bd226b782", "packages": [ { "name": "asm89/stack-cors", @@ -2183,16 +2183,16 @@ }, { "name": "drupal/core", - "version": "9.5.0", + "version": "9.5.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "f56525999dba655b4fc867df95edf8727f8b8624" + "reference": "083636264b027984694eb6d1e592f148ec24c637" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/f56525999dba655b4fc867df95edf8727f8b8624", - "reference": "f56525999dba655b4fc867df95edf8727f8b8624", + "url": "https://api.github.com/repos/drupal/core/zipball/083636264b027984694eb6d1e592f148ec24c637", + "reference": "083636264b027984694eb6d1e592f148ec24c637", "shasum": "" }, "require": { @@ -2344,9 +2344,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.0" + "source": "https://github.com/drupal/core/tree/9.5.1" }, - "time": "2022-12-15T14:33:38+00:00" + "time": "2023-01-04T15:53:28+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2400,16 +2400,16 @@ }, { "name": "drupal/core-recommended", - "version": "9.5.0", + "version": "9.5.1", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "db501d834a042f2bde349a8fc49b8364db99790b" + "reference": "9004418593163c787ff9057e31cf76063dd282dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/db501d834a042f2bde349a8fc49b8364db99790b", - "reference": "db501d834a042f2bde349a8fc49b8364db99790b", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/9004418593163c787ff9057e31cf76063dd282dc", + "reference": "9004418593163c787ff9057e31cf76063dd282dc", "shasum": "" }, "require": { @@ -2418,7 +2418,7 @@ "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.5.0", + "drupal/core": "9.5.1", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.2", @@ -2467,7 +2467,7 @@ "symfony/validator": "~v4.4.48", "symfony/var-dumper": "~v5.4.14", "symfony/yaml": "~v4.4.45", - "twig/twig": "~v2.15.3", + "twig/twig": "~v2.15.4", "typo3/phar-stream-wrapper": "~v3.1.7" }, "conflict": { @@ -2480,9 +2480,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/9.5.0" + "source": "https://github.com/drupal/core-recommended/tree/9.5.1" }, - "time": "2022-12-15T14:33:38+00:00" + "time": "2023-01-04T15:53:28+00:00" }, { "name": "drupal/crop", @@ -2932,20 +2932,21 @@ }, { "name": "drupal/elasticsearch_connector", - "version": "7.0.0-alpha3", + "version": "7.0.0-alpha4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/elasticsearch_connector.git", - "reference": "8.x-7.0-alpha3" + "reference": "8.x-7.0-alpha4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha3.zip", - "reference": "8.x-7.0-alpha3", - "shasum": "0752fc8b83479d10cdf314fc4225f6de17cc08e9" + "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha4.zip", + "reference": "8.x-7.0-alpha4", + "shasum": "2e0922d831a781555970a787c9ec98dc9891f565" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^9.2 || ^10", + "ext-curl": "*", "makinacorpus/php-lucene": "^1.0.2", "nodespark/des-connector": "7.x-dev" }, @@ -2961,8 +2962,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-7.0-alpha3", - "datestamp": "1602658539", + "version": "8.x-7.0-alpha4", + "datestamp": "1673006177", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3398,18 +3399,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "Hanno", - "homepage": "https://www.drupal.org/user/18826" - }, - { - "name": "Jelle_S", - "homepage": "https://www.drupal.org/user/829198" - }, - { - "name": "Wim Leers", - "homepage": "https://www.drupal.org/user/99777" - }, { "name": "attiks", "homepage": "https://www.drupal.org/user/105002" @@ -3418,6 +3407,14 @@ "name": "clemens.tolboom", "homepage": "https://www.drupal.org/user/125814" }, + { + "name": "Hanno", + "homepage": "https://www.drupal.org/user/18826" + }, + { + "name": "Jelle_S", + "homepage": "https://www.drupal.org/user/829198" + }, { "name": "pefferen", "homepage": "https://www.drupal.org/user/993376" @@ -3433,6 +3430,10 @@ { "name": "rp7", "homepage": "https://www.drupal.org/user/219330" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" } ], "description": "Allows using remote entities, for example through a REST interface.", @@ -3639,6 +3640,56 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, + { + "name": "drupal/file_mdm", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/file_mdm.git", + "reference": "8.x-2.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.5.zip", + "reference": "8.x-2.5", + "shasum": "391d9902733704274594873aa9b1f6b6ba3bd319" + }, + "require": { + "drupal/core": "^9.3 | ^10", + "lsolesen/pel": "^0.9.12", + "phenx/php-font-lib": "^0.5.4" + }, + "require-dev": { + "drupal/vendor_stream_wrapper": "^2.0.2", + "fileeye/linuxlibertine-fonts": "^5.3" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.5", + "datestamp": "1663668519", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "mondrake", + "homepage": "https://www.drupal.org/user/1307444" + } + ], + "description": "Provides a service to manage file metadata.", + "homepage": "https://www.drupal.org/project/file_mdm", + "support": { + "source": "https://git.drupalcode.org/project/file_mdm" + } + }, { "name": "drupal/filelog", "version": "2.1.1", @@ -3992,16 +4043,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.7", + "version": "4.3.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "ced6870c099b2c1d52be3e3bb8a095a502238644" + "reference": "d3a8247987246c63f9ff935ebd38081324599451" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ced6870c099b2c1d52be3e3bb8a095a502238644", - "reference": "ced6870c099b2c1d52be3e3bb8a095a502238644", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d3a8247987246c63f9ff935ebd38081324599451", + "reference": "d3a8247987246c63f9ff935ebd38081324599451", "shasum": "" }, "require": { @@ -4016,10 +4067,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-12-14T08:23:01+00:00" + "time": "2023-01-10T07:26:13+00:00" }, { "name": "drupal/hdbt_admin", @@ -4055,16 +4106,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.6", + "version": "2.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "f25f99abb17896c15531b4834f0908ba560437bd" + "reference": "bbf138db7bac7701097881a36832288ae809bf7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f25f99abb17896c15531b4834f0908ba560437bd", - "reference": "f25f99abb17896c15531b4834f0908ba560437bd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bbf138db7bac7701097881a36832288ae809bf7f", + "reference": "bbf138db7bac7701097881a36832288ae809bf7f", "shasum": "" }, "require": { @@ -4087,10 +4138,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-11-28T07:46:25+00:00" + "time": "2022-12-21T10:10:38+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4252,16 +4303,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.16.1", + "version": "2.16.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae" + "reference": "a3506410d1ddfe6bb51d3b849d69415eec11a407" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", - "reference": "c7ce9133a8c9ec9c02d6764f9a4ae2ec5d3557ae", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a3506410d1ddfe6bb51d3b849d69415eec11a407", + "reference": "a3506410d1ddfe6bb51d3b849d69415eec11a407", "shasum": "" }, "require": { @@ -4293,6 +4344,7 @@ "drupal/helfi_tpr": "*", "drupal/image_style_quality": "^1.4", "drupal/imagecache_external": "^3.0", + "drupal/imagemagick": "^3.4", "drupal/linkit": "^6.0@beta", "drupal/matomo": "^1.11", "drupal/matomo_reports": "^1.1", @@ -4360,6 +4412,9 @@ }, "drupal/field_group": { "[#UHF-3268] Support for field group translations": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/736077493b73d83b63081820790dc68e226a6460/patches/field_group_fix-translations_label_description-3111107-31-rerolled.patch" + }, + "drupal/publication_date": { + "[#UHF-7721] Fixed node preview when publication date is not set. (https://www.drupal.org/project/publication_date/issues/3074373)": "https://www.drupal.org/files/issues/2022-12-20/publication_date_is_required_for_completing_the_form-3074373-11.patch" } } }, @@ -4368,23 +4423,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-12-16T11:47:12+00:00" + "time": "2023-01-10T06:20:07+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "569383371028ec22e3a82c9ebc2c20ddced5a075" + "reference": "72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/569383371028ec22e3a82c9ebc2c20ddced5a075", - "reference": "569383371028ec22e3a82c9ebc2c20ddced5a075", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b", + "reference": "72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b", "shasum": "" }, "require": { @@ -4409,10 +4464,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-11-10T04:53:14+00:00" + "time": "2023-01-11T07:39:14+00:00" }, { "name": "drupal/helfi_tpr", @@ -4592,6 +4647,92 @@ "source": "https://git.drupalcode.org/project/imagecache_external" } }, + { + "name": "drupal/imagemagick", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/imagemagick.git", + "reference": "8.x-3.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "9f07b7db4bba2cb0e4ff004629f8f78242bb7226" + }, + "require": { + "drupal/core": "^9.3 || ^10", + "drupal/file_mdm": "^2.5", + "drupal/sophron": "^1.2 || ^2" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.4", + "datestamp": "1663947784", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Chris Charlton", + "homepage": "https://www.drupal.org/user/17089" + }, + { + "name": "chx", + "homepage": "https://www.drupal.org/user/9446" + }, + { + "name": "claudiu.cristea", + "homepage": "https://www.drupal.org/user/56348" + }, + { + "name": "dman", + "homepage": "https://www.drupal.org/user/33240" + }, + { + "name": "dopry", + "homepage": "https://www.drupal.org/user/22202" + }, + { + "name": "drewish", + "homepage": "https://www.drupal.org/user/34869" + }, + { + "name": "gdl", + "homepage": "https://www.drupal.org/user/507326" + }, + { + "name": "mondrake", + "homepage": "https://www.drupal.org/user/1307444" + }, + { + "name": "quicksketch", + "homepage": "https://www.drupal.org/user/35821" + }, + { + "name": "sun", + "homepage": "https://www.drupal.org/user/54136" + }, + { + "name": "walkah", + "homepage": "https://www.drupal.org/user/1531" + } + ], + "description": "Provides an image toolkit to integrate ImageMagick with the Image API.", + "homepage": "https://www.drupal.org/project/imagemagick", + "support": { + "source": "https://git.drupalcode.org/project/imagemagick" + } + }, { "name": "drupal/linkit", "version": "6.0.0-beta3", @@ -5773,31 +5914,31 @@ }, { "name": "drupal/scheduler", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/scheduler.git", - "reference": "8.x-1.4" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/scheduler-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "5b2203e4688e5d3ac67d0780605809c92c6ece70" + "url": "https://ftp.drupal.org/files/projects/scheduler-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "206a9b6e348273aa2cf97ba429d437112b47469b" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "require-dev": { - "drupal/devel_generate": "^2.0 || 4.x-dev", + "drupal/devel_generate": "^2.0 || >=4", "drupal/rules": "^3", - "drush/drush": "^9.0 || ^10" + "drush/drush": ">=9" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1654699160", + "version": "8.x-1.5", + "datestamp": "1673107194", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6148,6 +6289,56 @@ "issues": "https://www.drupal.org/project/issues/social_media" } }, + { + "name": "drupal/sophron", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/sophron.git", + "reference": "8.x-1.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/sophron-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "426dde53813e855317d6f7ef9fd6b104cc8a3e22" + }, + "require": { + "drupal/core": "^9.2 || ^10", + "fileeye/mimemap": "^2" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.3", + "datestamp": "1663598448", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "autoload": { + "psr-4": { + "Drupal\\sophron\\": "src/" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "mondrake", + "homepage": "https://www.drupal.org/user/1307444" + } + ], + "description": "Provides an extensive MIME types management API", + "homepage": "https://www.drupal.org/project/sophron", + "support": { + "source": "https://git.drupalcode.org/project/sophron" + } + }, { "name": "drupal/stage_file_proxy", "version": "1.2.0", @@ -6713,17 +6904,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.1", + "version": "4.2.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.1" + "reference": "4.2.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.1.zip", - "reference": "4.2.1", - "shasum": "3bce967e24c0ce19fc7e0de031594729e22c38ef" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.3.zip", + "reference": "4.2.3", + "shasum": "56014a68924b358caca5c41cd74b995fc0cc5e13" }, "require": { "drupal/core": "^9.4 || ^10", @@ -6738,8 +6929,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.1", - "datestamp": "1666185226", + "version": "4.2.3", + "datestamp": "1673360841", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6980,25 +7171,24 @@ }, { "name": "egulias/email-validator", - "version": "3.2.1", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715" + "reference": "b531a2311709443320c786feb4519cfaf94af796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715", - "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", + "reference": "b531a2311709443320c786feb4519cfaf94af796", "shasum": "" }, "require": { - "doctrine/lexer": "^1.2", + "doctrine/lexer": "^1.2|^2", "php": ">=7.2", "symfony/polyfill-intl-idn": "^1.15" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^8.5.8|^9.3.3", "vimeo/psalm": "^4" }, @@ -7036,7 +7226,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.1" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" }, "funding": [ { @@ -7044,7 +7234,7 @@ "type": "github" } ], - "time": "2022-06-18T20:57:19+00:00" + "time": "2023-01-02T17:26:14+00:00" }, { "name": "elasticsearch/elasticsearch", @@ -7346,6 +7536,68 @@ }, "time": "2022-09-18T07:06:19+00:00" }, + { + "name": "fileeye/mimemap", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/FileEye/MimeMap.git", + "reference": "24144b7dc84168e14e4fc893d654c4fb40628346" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/24144b7dc84168e14e4fc893d654c4fb40628346", + "reference": "24144b7dc84168e14e4fc893d654c4fb40628346", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "composer-runtime-api": "^2.0.0", + "phpstan/phpstan": "^1.2", + "phpunit/phpunit": "^9", + "sebastian/comparator": ">=4", + "sebastian/diff": ">=4", + "squizlabs/php_codesniffer": ">=3.6", + "symfony/console": ">=5.4", + "symfony/filesystem": ">=5.4", + "symfony/var-dumper": ">=5.4", + "symfony/yaml": ">=5.4", + "vimeo/psalm": "^4.23" + }, + "bin": [ + "bin/fileeye-mimemap" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "FileEye\\MimeMap\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "description": "A PHP library to handle MIME Content-Type fields and their related file extensions.", + "homepage": "https://github.com/FileEye/MimeMap", + "keywords": [ + "mime", + "mime-database", + "mime-parser", + "mime-type" + ], + "support": { + "issues": "https://github.com/FileEye/MimeMap/issues", + "source": "https://github.com/FileEye/MimeMap/tree/2.0.0" + }, + "time": "2022-07-17T13:00:20+00:00" + }, { "name": "galbar/jsonpath", "version": "2.1", @@ -8718,6 +8970,66 @@ ], "time": "2021-06-28T04:27:21+00:00" }, + { + "name": "lsolesen/pel", + "version": "0.9.12", + "source": { + "type": "git", + "url": "https://github.com/pel/pel.git", + "reference": "b95fe29cdacf9d36330da277f10910a13648c84c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pel/pel/zipball/b95fe29cdacf9d36330da277f10910a13648c84c", + "reference": "b95fe29cdacf9d36330da277f10910a13648c84c", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "ext-exif": "*", + "ext-gd": "*", + "php-coveralls/php-coveralls": ">2.4", + "squizlabs/php_codesniffer": ">3.5", + "symfony/phpunit-bridge": "^4 || ^5" + }, + "type": "library", + "autoload": { + "psr-4": { + "lsolesen\\pel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Lars Olesen", + "email": "lars@intraface.dk", + "homepage": "http://intraface.dk", + "role": "Developer" + }, + { + "name": "Martin Geisler", + "email": "martin@geisler.net", + "homepage": "http://geisler.net", + "role": "Developer" + } + ], + "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", + "homepage": "http://pel.github.com/pel/", + "keywords": [ + "exif", + "image" + ], + "support": { + "issues": "https://github.com/pel/pel/issues", + "source": "https://github.com/pel/pel/tree/0.9.12" + }, + "time": "2022-02-18T13:20:54+00:00" + }, { "name": "makinacorpus/php-lucene", "version": "1.2.0", @@ -9388,6 +9700,50 @@ }, "time": "2021-03-21T15:43:46+00:00" }, + { + "name": "phenx/php-font-lib", + "version": "0.5.4", + "source": { + "type": "git", + "url": "https://github.com/dompdf/php-font-lib.git", + "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4", + "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4", + "shasum": "" + }, + "require": { + "ext-mbstring": "*" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3 || ^4 || ^5" + }, + "type": "library", + "autoload": { + "psr-4": { + "FontLib\\": "src/FontLib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Fabien Ménager", + "email": "fabien.menager@gmail.com" + } + ], + "description": "A library to read, parse, export and make subsets of different types of font files.", + "homepage": "https://github.com/PhenX/php-font-lib", + "support": { + "issues": "https://github.com/dompdf/php-font-lib/issues", + "source": "https://github.com/dompdf/php-font-lib/tree/0.5.4" + }, + "time": "2021-12-17T19:44:54+00:00" + }, { "name": "php-http/client-common", "version": "2.6.0", @@ -11296,16 +11652,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.16", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "0f43af12a27733a060b92396b7bde84a4376da0a" + "reference": "772129f800fc0bfaa6bd40c40934d544f0957d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/0f43af12a27733a060b92396b7bde84a4376da0a", - "reference": "0f43af12a27733a060b92396b7bde84a4376da0a", + "url": "https://api.github.com/repos/symfony/http-client/zipball/772129f800fc0bfaa6bd40c40934d544f0957d30", + "reference": "772129f800fc0bfaa6bd40c40934d544f0957d30", "shasum": "" }, "require": { @@ -11363,7 +11719,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.16" + "source": "https://github.com/symfony/http-client/tree/v5.4.17" }, "funding": [ { @@ -11379,7 +11735,7 @@ "type": "tidelift" } ], - "time": "2022-11-09T11:27:39+00:00" + "time": "2022-12-13T11:07:37+00:00" }, { "name": "symfony/http-client-contracts", @@ -13129,16 +13485,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.14", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6894d06145fefebd9a4c7272baa026a1c394a430" + "reference": "ad74890513d07060255df2575703daf971de92c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430", - "reference": "6894d06145fefebd9a4c7272baa026a1c394a430", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7", + "reference": "ad74890513d07060255df2575703daf971de92c7", "shasum": "" }, "require": { @@ -13198,7 +13554,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.14" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.17" }, "funding": [ { @@ -13214,7 +13570,7 @@ "type": "tidelift" } ], - "time": "2022-10-07T08:01:20+00:00" + "time": "2022-12-22T10:31:03+00:00" }, { "name": "symfony/yaml", @@ -13337,16 +13693,16 @@ }, { "name": "twig/twig", - "version": "v2.15.3", + "version": "v2.15.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" + "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", - "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3", + "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3", "shasum": "" }, "require": { @@ -13401,7 +13757,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.3" + "source": "https://github.com/twigphp/Twig/tree/v2.15.4" }, "funding": [ { @@ -13413,7 +13769,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T08:40:08+00:00" + "time": "2022-12-27T12:26:20+00:00" }, { "name": "twistor/flysystem-stream-wrapper", @@ -14440,30 +14796,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -14490,7 +14846,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -14506,7 +14862,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "donatj/mock-webserver", @@ -15802,16 +16158,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.22", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df", - "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { @@ -15867,7 +16223,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -15875,7 +16231,7 @@ "type": "github" } ], - "time": "2022-12-18T16:40:55+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", diff --git a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml index e9ce105d..305621ec 100644 --- a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml @@ -104,6 +104,16 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + has_unit: + type: readonly_field_widget + weight: 27 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } hide_sidebar_navigation: type: boolean_checkbox weight: 21 @@ -146,12 +156,32 @@ content: size: 60 placeholder: '' third_party_settings: { } + name_synonyms: + type: readonly_field_widget + weight: 26 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } path: type: path weight: 7 region: content settings: { } third_party_settings: { } + service_id: + type: readonly_field_widget + weight: 28 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } toc_enabled: type: boolean_checkbox weight: 3 diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml index e996340f..b4c0b24c 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml @@ -110,4 +110,7 @@ content: region: content hidden: created: true + has_unit: true langcode: true + name_synonyms: true + service_id: true diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml index 5a0fe78a..c6192e61 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml @@ -48,6 +48,9 @@ hidden: field_lower_content: true field_metatags: true field_sidebar_content: true + has_unit: true langcode: true links: true + name_synonyms: true + service_id: true toc_enabled: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index e3db4513..258814f0 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -32,6 +32,7 @@ module: field_group: 0 field_ui: 0 file: 0 + file_mdm: 0 filelog: 0 filter: 0 flysystem: 0 @@ -67,6 +68,7 @@ module: image: 0 image_style_quality: 0 imagecache_external: 0 + imagemagick: 0 language: 0 link: 0 linkit: 0 @@ -111,6 +113,7 @@ module: serialization: 0 simple_sitemap: 0 social_media: 0 + sophron: 0 stage_file_proxy: 0 system: 0 taxonomy: 0 diff --git a/conf/cmi/file_mdm.file_metadata_plugin.getimagesize.yml b/conf/cmi/file_mdm.file_metadata_plugin.getimagesize.yml new file mode 100644 index 00000000..363a4455 --- /dev/null +++ b/conf/cmi/file_mdm.file_metadata_plugin.getimagesize.yml @@ -0,0 +1,9 @@ +_core: + default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI +configuration: + cache: + override: false + settings: + enabled: true + expiration: 172800 + disallowed_paths: { } diff --git a/conf/cmi/file_mdm.settings.yml b/conf/cmi/file_mdm.settings.yml new file mode 100644 index 00000000..1721cdf2 --- /dev/null +++ b/conf/cmi/file_mdm.settings.yml @@ -0,0 +1,6 @@ +_core: + default_config_hash: Q8ZrmO8RU36KGMcNEaWFQOqYYO3z5Q4IZoS-xYy8MlA +metadata_cache: + enabled: true + expiration: 172800 + disallowed_paths: { } diff --git a/conf/cmi/imagemagick.file_metadata_plugin.imagemagick_identify.yml b/conf/cmi/imagemagick.file_metadata_plugin.imagemagick_identify.yml new file mode 100644 index 00000000..363a4455 --- /dev/null +++ b/conf/cmi/imagemagick.file_metadata_plugin.imagemagick_identify.yml @@ -0,0 +1,9 @@ +_core: + default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI +configuration: + cache: + override: false + settings: + enabled: true + expiration: 172800 + disallowed_paths: { } diff --git a/conf/cmi/imagemagick.settings.yml b/conf/cmi/imagemagick.settings.yml new file mode 100644 index 00000000..37333701 --- /dev/null +++ b/conf/cmi/imagemagick.settings.yml @@ -0,0 +1,61 @@ +_core: + default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ +quality: 75 +binaries: imagemagick +path_to_binaries: '' +prepend: '' +log_warnings: true +debug: false +locale: en_US.UTF-8 +advanced: + density: 0 + colorspace: '0' + profile: '' + coalesce: false +image_formats: + PNG: + mime_type: image/png + JPEG: + mime_type: image/jpeg + JPG: + mime_type: image/jpeg + weight: 10 + enabled: false + GIF: + mime_type: image/gif + GIF87: + mime_type: image/gif + weight: 10 + enabled: false + SVG: + mime_type: image/svg+xml + enabled: false + WEBP: + mime_type: image/webp + AVIF: + mime_type: image/avif + enabled: false + TIFF: + mime_type: image/tiff + enabled: false + PDF: + mime_type: application/pdf + enabled: false + HEIC: + mime_type: image/heif + enabled: false + BMP: + mime_type: image/x-ms-bmp + enabled: false + PSD: + mime_type: image/x-photoshop + enabled: false + WBMP: + mime_type: image/vnd.wap.wbmp + enabled: false + XBM: + mime_type: image/x-xbitmap + enabled: false + ICO: + mime_type: image/vnd.microsoft.icon + enabled: false diff --git a/conf/cmi/sophron.settings.yml b/conf/cmi/sophron.settings.yml new file mode 100644 index 00000000..2a815fab --- /dev/null +++ b/conf/cmi/sophron.settings.yml @@ -0,0 +1,5 @@ +_core: + default_config_hash: kS--VUM7Yhfb5AIcnoXV8-JW90t-aIuQbzxPa1hbooU +map_option: 0 +map_class: '' +map_commands: { } diff --git a/conf/cmi/system.image.yml b/conf/cmi/system.image.yml index 2e18f7fc..eb1a393b 100644 --- a/conf/cmi/system.image.yml +++ b/conf/cmi/system.image.yml @@ -1,3 +1,3 @@ _core: default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24 -toolkit: gd +toolkit: imagemagick diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 6d9747ca..190b16c4 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -50,12 +50,15 @@ $settings['matomo_site_id'] = getenv('MATOMO_SITE_ID'); $settings['siteimprove_id'] = getenv('SITEIMPROVE_ID'); +$routes = []; // Drupal route(s). -$routes = (getenv('DRUPAL_ROUTES')) ? explode(',', getenv('DRUPAL_ROUTES')) : []; +if ($drupal_routes = getenv('DRUPAL_ROUTES')) { + $routes = array_map(fn (string $route) => trim($route), explode(',', $drupal_routes)); +} $routes[] = 'http://127.0.0.1'; foreach ($routes as $route) { - $host = parse_url($route)['host']; + $host = parse_url($route, PHP_URL_HOST); $trusted_host = str_replace('.', '\.', $host); $settings['trusted_host_patterns'][] = '^' . $trusted_host . '$'; }