From 861f3e56a20c509263aac9c8bded68ff272b1001 Mon Sep 17 00:00:00 2001 From: "Peter Droogmans (attiks)" Date: Wed, 8 Nov 2023 15:18:30 +0100 Subject: [PATCH] D10 --- .docksal/docksal.env | 2 +- composer.lock | 159 +++++++++--------- .../reliefweb_openai.info.yml | 2 +- 3 files changed, 84 insertions(+), 79 deletions(-) diff --git a/.docksal/docksal.env b/.docksal/docksal.env index 3022f26c9..948007f53 100644 --- a/.docksal/docksal.env +++ b/.docksal/docksal.env @@ -1,4 +1,4 @@ DOCKSAL_STACK=default DOCROOT=html DB_IMAGE="docksal/db:1.1-mysql-5.7" -CLI_IMAGE='docksal/cli:php8.0-build' +CLI_IMAGE='docksal/cli:php8.2-build' diff --git a/composer.lock b/composer.lock index 184940e30..0bcf0849d 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": "b7f38acac99378e724d9c22c99e6df60", + "content-hash": "952a106aab646ccce08e02fcd10b4754", "packages": [ { "name": "asm89/stack-cors", @@ -64,16 +64,16 @@ }, { "name": "aws/aws-crt-php", - "version": "v1.2.1", + "version": "v1.2.3", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" + "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382", + "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382", "shasum": "" }, "require": { @@ -112,34 +112,35 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3" }, - "time": "2023-03-24T20:22:19+00:00" + "time": "2023-10-16T20:10:06+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.263.13", + "version": "3.285.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "939120791996563677afe75a97ff18f514b7418f" + "reference": "41c7a9491455f89052cba62c4e4f0c748af51265" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/939120791996563677afe75a97ff18f514b7418f", - "reference": "939120791996563677afe75a97ff18f514b7418f", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/41c7a9491455f89052cba62c4e4f0c748af51265", + "reference": "41c7a9491455f89052cba62c4e4f0c748af51265", "shasum": "" }, "require": { - "aws/aws-crt-php": "^1.0.4", + "aws/aws-crt-php": "^1.2.3", "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.8.5 || ^2.3", + "guzzlehttp/promises": "^1.4.0 || ^2.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5" + "php": ">=7.2.5", + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", @@ -154,9 +155,8 @@ "ext-sockets": "*", "nette/neon": "^2.3", "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", + "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", "psr/cache": "^1.0", - "psr/http-message": "<1.1", "psr/simple-cache": "^1.0", "sebastian/comparator": "^1.2.3 || ^4.0", "yoast/phpunit-polyfills": "^1.0" @@ -207,9 +207,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.263.13" + "source": "https://github.com/aws/aws-sdk-php/tree/3.285.0" }, - "time": "2023-04-19T18:23:42+00:00" + "time": "2023-11-07T19:33:47+00:00" }, { "name": "behat/mink", @@ -2647,17 +2647,17 @@ }, { "name": "drupal/config_split", - "version": "2.0.0-rc5", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_split.git", - "reference": "2.0.0-rc5" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-rc5.zip", - "reference": "2.0.0-rc5", - "shasum": "6c7240086bb65c668f2cf32f59f2e1414ad6afbe" + "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0.zip", + "reference": "2.0.0", + "shasum": "be9fd0aba1206e0f19e8448f69d4210e53dae069" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -2675,11 +2675,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-rc5", - "datestamp": "1698624439", + "version": "2.0.0", + "datestamp": "1699259254", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } }, "drush": { @@ -5622,16 +5622,16 @@ }, { "name": "google/auth", - "version": "v1.31.0", + "version": "v1.32.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "22209fddd0c06f3f8e3cb4aade0b352aa00f9888" + "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/22209fddd0c06f3f8e3cb4aade0b352aa00f9888", - "reference": "22209fddd0c06f3f8e3cb4aade0b352aa00f9888", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/999e9ce8b9d17914f04e1718271a0a46da4de2f3", + "reference": "999e9ce8b9d17914f04e1718271a0a46da4de2f3", "shasum": "" }, "require": { @@ -5674,9 +5674,9 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.31.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.32.1" }, - "time": "2023-10-05T20:39:00+00:00" + "time": "2023-10-17T21:13:22+00:00" }, { "name": "google/common-protos", @@ -5732,16 +5732,16 @@ }, { "name": "google/gax", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/googleapis/gax-php.git", - "reference": "2fedb0dc9bbad2dff945d95e165bc0af418186b8" + "reference": "8f07f56f8d14e784777020cd73cfde518bd7dd33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/gax-php/zipball/2fedb0dc9bbad2dff945d95e165bc0af418186b8", - "reference": "2fedb0dc9bbad2dff945d95e165bc0af418186b8", + "url": "https://api.github.com/repos/googleapis/gax-php/zipball/8f07f56f8d14e784777020cd73cfde518bd7dd33", + "reference": "8f07f56f8d14e784777020cd73cfde518bd7dd33", "shasum": "" }, "require": { @@ -5781,9 +5781,9 @@ ], "support": { "issues": "https://github.com/googleapis/gax-php/issues", - "source": "https://github.com/googleapis/gax-php/tree/v1.24.0" + "source": "https://github.com/googleapis/gax-php/tree/v1.25.0" }, - "time": "2023-10-10T17:52:54+00:00" + "time": "2023-11-02T22:05:32+00:00" }, { "name": "google/grpc-gcp", @@ -7130,16 +7130,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "d721420086f146640acecebb7a678661a66e97d5" + "reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/d721420086f146640acecebb7a678661a66e97d5", - "reference": "d721420086f146640acecebb7a678661a66e97d5", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/920c6b972a832046327f66dc6ff7448e3b5d6e4c", + "reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c", "shasum": "" }, "require": { @@ -7214,7 +7214,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.0" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.1" }, "funding": [ { @@ -7230,7 +7230,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T20:32:56+00:00" + "time": "2023-11-03T13:17:28+00:00" }, { "name": "mikey179/vfsstream", @@ -7285,25 +7285,25 @@ }, { "name": "mtdowling/jmespath.php", - "version": "2.6.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0", + "php": "^7.2.5 || ^8.0", "symfony/polyfill-mbstring": "^1.17" }, "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.33" }, "bin": [ "bin/jp.php" @@ -7311,7 +7311,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -7327,6 +7327,11 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", @@ -7340,9 +7345,9 @@ ], "support": { "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" + "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" }, - "time": "2021-06-14T00:11:39+00:00" + "time": "2023-08-25T10:54:48+00:00" }, { "name": "myclabs/deep-copy", @@ -7940,29 +7945,29 @@ }, { "name": "pelago/emogrifier", - "version": "v7.0.0", + "version": "v7.1.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "547b8c814794aec871e3c98b1c712f416755f4eb" + "reference": "1945460af992d0c14ad08e7b4567d7d0dd3a2f94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/547b8c814794aec871e3c98b1c712f416755f4eb", - "reference": "547b8c814794aec871e3c98b1c712f416755f4eb", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/1945460af992d0c14ad08e7b4567d7d0dd3a2f94", + "reference": "1945460af992d0c14ad08e7b4567d7d0dd3a2f94", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "sabberworm/php-css-parser": "^8.4.0", "symfony/css-selector": "^4.4.23 || ^5.4.0 || ^6.0.0" }, "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.3.2", - "phpunit/phpunit": "^9.5.25", - "rawr/cross-data-providers": "^2.3.0" + "php-parallel-lint/php-parallel-lint": "1.3.2", + "phpunit/phpunit": "9.6.11", + "rawr/cross-data-providers": "2.4.0" }, "type": "library", "extra": { @@ -8014,7 +8019,7 @@ "issues": "https://github.com/MyIntervals/emogrifier/issues", "source": "https://github.com/MyIntervals/emogrifier" }, - "time": "2022-11-01T17:53:29+00:00" + "time": "2023-10-20T15:34:30+00:00" }, { "name": "phar-io/manifest", @@ -8708,16 +8713,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.40", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d", - "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -8766,7 +8771,7 @@ "type": "tidelift" } ], - "time": "2023-10-30T14:48:31+00:00" + "time": "2023-11-05T12:57:57+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -14686,16 +14691,16 @@ }, { "name": "unocha/common_design", - "version": "v9.2.1", + "version": "v9.2.2", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "c52613835d3e10baf03783d3601c030483057684" + "reference": "f582963b5848d92b42de871b628f52c5a9f34930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/c52613835d3e10baf03783d3601c030483057684", - "reference": "c52613835d3e10baf03783d3601c030483057684", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/f582963b5848d92b42de871b628f52c5a9f34930", + "reference": "f582963b5848d92b42de871b628f52c5a9f34930", "shasum": "" }, "require": { @@ -14710,9 +14715,9 @@ "description": "OCHA Common Design base theme for Drupal 9+", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.1" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.2" }, - "time": "2023-10-11T12:36:16+00:00" + "time": "2023-10-26T10:03:06+00:00" }, { "name": "webflo/drupal-finder", @@ -15632,5 +15637,5 @@ "php": ">=8.2" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/html/modules/custom/reliefweb_openai/reliefweb_openai.info.yml b/html/modules/custom/reliefweb_openai/reliefweb_openai.info.yml index a38447ab9..0863f37ef 100644 --- a/html/modules/custom/reliefweb_openai/reliefweb_openai.info.yml +++ b/html/modules/custom/reliefweb_openai/reliefweb_openai.info.yml @@ -2,4 +2,4 @@ name: OpenAI Content Tools type: module description: Adds assistive tools for different areas of the content editing process. This module is experimental. package: OpenAI -core_version_requirement: ^9 +core_version_requirement: ^10