diff --git a/.env b/.env index 18911cc11..655e43143 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ STAGE_FILE_PROXY_ORIGIN_DIR=sites/default/files DRUPAL_HOSTNAME=helsinki-paatokset.docker.so # Docker image -DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2 +DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3 # Composer profiles, include Elasticsearch COMPOSE_PROFILES=search diff --git a/composer.json b/composer.json index fab89914f..0c4933972 100644 --- a/composer.json +++ b/composer.json @@ -25,10 +25,9 @@ "drupal/purge": "^3.0", "drupal/varnish_purge": "^2.1", "drush/drush": "^12", - "elasticsearch/elasticsearch": "^7.15", "josdejong/jsoneditor": "^5.29", "league/csv": "^9.8", - "paatokset/paatokset_search": "1.2.2" + "paatokset/paatokset_search": "^1.3.2" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -152,9 +151,9 @@ "type": "package", "package": { "name": "paatokset/paatokset_search", - "version": "1.2.2", + "version": "1.3.2", "dist": { - "url": "https://github.com/City-of-Helsinki/paatokset-search/releases/download/1.2.2/paatokset_search.zip", + "url": "https://github.com/City-of-Helsinki/paatokset-search/releases/download/1.3.2/paatokset_search.zip", "type": "zip" } } diff --git a/composer.lock b/composer.lock index 59b9e07e7..2fd5612fc 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": "c67c8e84908866f1cf0e0ee10e98f7bf", + "content-hash": "184273655c00aeb7c68b4201cb5eb025", "packages": [ { "name": "asm89/stack-cors", @@ -3011,38 +3011,43 @@ }, { "name": "drupal/elasticsearch_connector", - "version": "7.0.0-alpha5", + "version": "8.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/elasticsearch_connector.git", - "reference": "8.x-7.0-alpha5" + "reference": "8.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.x-7.0-alpha5.zip", - "reference": "8.x-7.0-alpha5", - "shasum": "75456c31f48d76b176d81f258aa589987cd16b87" + "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.0.0-alpha2.zip", + "reference": "8.0.0-alpha2", + "shasum": "35928100f913b7a1d57a362b528071034f2ae1ff" }, "require": { - "drupal/core": "^9.2 || ^10", - "ext-curl": "*", - "makinacorpus/php-lucene": "^1.0.2", - "nodespark/des-connector": "7.x-dev" + "drupal/core": "^9 || ^10 | ^11", + "drupal/search_api": "^1.23", + "elasticsearch/elasticsearch": "^8", + "makinacorpus/php-lucene": "^1.1", + "php": "^8" }, "require-dev": { - "behat/mink-selenium2-driver": "^1.3", - "bex/behat-screenshot": "^1.2", - "drupal/coder": "^8.2", - "drupal/drupal-extension": "master-dev", - "drupal/search_api": "^1.4", - "phpmd/phpmd": "^2.6", - "phpmetrics/phpmetrics": "^2.3" + "drupal/coder": "^8.3", + "drupal/devel": "^4.0|^5.0", + "drupal/geofield": "1.x-dev", + "drush/drush": "^12.0 || ^13", + "phayes/geophp": "^1.2" + }, + "suggest": { + "drupal/facets": "Provides facetted search.", + "drupal/search_api_autocomplete": "Provides auto complete for search boxes.", + "drupal/search_api_location": "Provides location searches.", + "drupal/search_api_spellcheck": "Provides spell checking and 'Did You Mean?'." }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-7.0-alpha5", - "datestamp": "1718962853", + "version": "8.0.0-alpha2", + "datestamp": "1722668348", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3051,18 +3056,16 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { - "name": "Nikolay Ignatov", - "homepage": "http://www.nodespark.com", - "email": "nignatov@nodespark.com", - "role": "Creator and Maintainer" + "name": "lachezar.valchev", + "homepage": "https://www.drupal.org/user/1482368" }, { - "name": "See other contributors", - "homepage": "https://www.drupal.org/node/2159059/committers" + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" }, { "name": "skek", @@ -3077,11 +3080,10 @@ "homepage": "https://www.drupal.org/user/257311" } ], - "description": "Elasticsearch Connector module for Drupal.", + "description": "Provides an ElasticSearch backend for Search API.", "homepage": "https://www.drupal.org/project/elasticsearch_connector", "support": { - "source": "https://github.com/nodespark/elasticsearch_connector", - "issues": "https://www.drupal.org/project/issues/elasticsearch_connector" + "source": "https://git.drupalcode.org/project/elasticsearch_connector" } }, { @@ -4423,16 +4425,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.24", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "07fd66ba2f3cb452db84940dc1d254b8466a75bd" + "reference": "680984849f6f204b63af73efb0ae531ba121ff58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/07fd66ba2f3cb452db84940dc1d254b8466a75bd", - "reference": "07fd66ba2f3cb452db84940dc1d254b8466a75bd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/680984849f6f204b63af73efb0ae531ba121ff58", + "reference": "680984849f6f204b63af73efb0ae531ba121ff58", "shasum": "" }, "require": { @@ -4450,7 +4452,7 @@ "drupal/diff": "^1.0", "drupal/easy_breadcrumb": "^2.0", "drupal/editoria11y": "^2.0", - "drupal/elasticsearch_connector": "^7.0@alpha", + "drupal/elasticsearch_connector": "^8.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", "drupal/eu_cookie_compliance": "1.24", @@ -4497,7 +4499,8 @@ "drupal/views_bulk_operations": "^4.1", "ext-curl": "*", "league/uri": "^6.0", - "php": "^8.1" + "php": "^8.1", + "ruflin/elastica": "^8.0" }, "conflict": { "drupal/core": "<10.3", @@ -4509,6 +4512,9 @@ "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" }, + "require-dev": { + "dg/bypass-finals": "^1.0" + }, "type": "drupal-module", "extra": { "patches": { @@ -4543,6 +4549,9 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" + }, + "drupal/elasticsearch_connector": { + "https://drupal.org/i/3486375": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/be8a1fba1a5ea2422154caf4fb7183dfc3917599/patches/3486375.patch" } } }, @@ -4551,10 +4560,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.24", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.7.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-07T13:57:38+00:00" + "time": "2024-11-11T07:44:23+00:00" }, { "name": "drupal/helfi_tpr", @@ -7899,181 +7908,120 @@ "time": "2023-10-06T06:47:41+00:00" }, { - "name": "elasticsearch/elasticsearch", - "version": "v7.17.2", - "source": { - "type": "git", - "url": "https://github.com/elastic/elasticsearch-php.git", - "reference": "2d302233f2bb0926812d82823bb820d405e130fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/2d302233f2bb0926812d82823bb820d405e130fc", - "reference": "2d302233f2bb0926812d82823bb820d405e130fc", - "shasum": "" - }, - "require": { - "ext-json": ">=1.3.7", - "ezimuel/ringphp": "^1.1.2", - "php": "^7.3 || ^8.0", - "psr/log": "^1|^2|^3" - }, - "require-dev": { - "ext-yaml": "*", - "ext-zip": "*", - "mockery/mockery": "^1.2", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.3", - "squizlabs/php_codesniffer": "^3.4", - "symfony/finder": "~4.0" - }, - "suggest": { - "ext-curl": "*", - "monolog/monolog": "Allows for client-level logging and tracing" - }, - "type": "library", - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Elasticsearch\\": "src/Elasticsearch/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0", - "LGPL-2.1-only" - ], - "authors": [ - { - "name": "Zachary Tong" - }, - { - "name": "Enrico Zimuel" - } - ], - "description": "PHP Client for Elasticsearch", - "keywords": [ - "client", - "elasticsearch", - "search" - ], - "support": { - "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.2" - }, - "time": "2023-04-21T15:31:12+00:00" - }, - { - "name": "ezimuel/guzzlestreams", - "version": "3.1.0", + "name": "elastic/transport", + "version": "v8.10.0", "source": { "type": "git", - "url": "https://github.com/ezimuel/guzzlestreams.git", - "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997" + "url": "https://github.com/elastic/elastic-transport-php.git", + "reference": "8be37d679637545e50b1cea9f8ee903888783021" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/b4b5a025dfee70d6cd34c780e07330eb93d5b997", - "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "url": "https://api.github.com/repos/elastic/elastic-transport-php/zipball/8be37d679637545e50b1cea9f8ee903888783021", + "reference": "8be37d679637545e50b1cea9f8ee903888783021", "shasum": "" }, "require": { - "php": ">=5.4.0" + "composer-runtime-api": "^2.0", + "open-telemetry/api": "^1.0", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.14", + "php-http/httplug": "^2.3", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0 || ^2.0", + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpunit/phpunit": "~9.0" + "nyholm/psr7": "^1.5", + "open-telemetry/sdk": "^1.0", + "php-http/mock-client": "^1.5", + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9.5", + "symfony/http-client": "^5.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "autoload": { "psr-4": { - "GuzzleHttp\\Stream\\": "src/" + "Elastic\\Transport\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php", - "homepage": "http://guzzlephp.org/", + "description": "HTTP transport PHP library for Elastic products", "keywords": [ - "Guzzle", - "stream" + "PSR_17", + "elastic", + "http", + "psr-18", + "psr-7", + "transport" ], "support": { - "source": "https://github.com/ezimuel/guzzlestreams/tree/3.1.0" + "issues": "https://github.com/elastic/elastic-transport-php/issues", + "source": "https://github.com/elastic/elastic-transport-php/tree/v8.10.0" }, - "time": "2022-10-24T12:58:50+00:00" + "time": "2024-08-14T08:55:07+00:00" }, { - "name": "ezimuel/ringphp", - "version": "1.2.2", + "name": "elasticsearch/elasticsearch", + "version": "v8.16.0", "source": { "type": "git", - "url": "https://github.com/ezimuel/ringphp.git", - "reference": "7887fc8488013065f72f977dcb281994f5fde9f4" + "url": "https://github.com/elastic/elasticsearch-php.git", + "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/7887fc8488013065f72f977dcb281994f5fde9f4", - "reference": "7887fc8488013065f72f977dcb281994f5fde9f4", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", + "reference": "ab0fdb43f9e69f0d0539028d8b0b56cdf3328d85", "shasum": "" }, "require": { - "ezimuel/guzzlestreams": "^3.0.1", - "php": ">=5.4.0", - "react/promise": "~2.0" - }, - "replace": { - "guzzlehttp/ringphp": "self.version" + "elastic/transport": "^8.10", + "guzzlehttp/guzzle": "^7.0", + "php": "^7.4 || ^8.0", + "psr/http-client": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "psr/log": "^1|^2|^3" }, "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~9.0" - }, - "suggest": { - "ext-curl": "Guzzle will use specific adapters if cURL is present" + "ext-yaml": "*", + "ext-zip": "*", + "mockery/mockery": "^1.5", + "nyholm/psr7": "^1.5", + "php-http/message-factory": "^1.0", + "php-http/mock-client": "^1.5", + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9.5", + "psr/http-factory": "^1.0", + "symfony/finder": "~4.0", + "symfony/http-client": "^5.0|^6.0|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { - "GuzzleHttp\\Ring\\": "src/" + "Elastic\\Elasticsearch\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } + "description": "PHP Client for Elasticsearch", + "keywords": [ + "client", + "elastic", + "elasticsearch", + "search" ], - "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.2.2" + "issues": "https://github.com/elastic/elasticsearch-php/issues", + "source": "https://github.com/elastic/elasticsearch-php/tree/v8.16.0" }, - "time": "2022-12-07T11:28:53+00:00" + "time": "2024-11-14T22:23:33+00:00" }, { "name": "ezyang/htmlpurifier", @@ -9887,128 +9835,137 @@ "time": "2024-10-08T18:51:32+00:00" }, { - "name": "nodespark/des-connector", - "version": "7.x-dev", + "name": "open-telemetry/api", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/tuutti/des-connector.git", - "reference": "a075a6b9e54b5855d0a292d9266839312e6026dc" + "url": "https://github.com/opentelemetry-php/api.git", + "reference": "87de95d926f46262885d0d390060c095af13e2e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tuutti/des-connector/zipball/a075a6b9e54b5855d0a292d9266839312e6026dc", - "reference": "a075a6b9e54b5855d0a292d9266839312e6026dc", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", + "reference": "87de95d926f46262885d0d390060c095af13e2e5", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "ruflin/elastica": "^7.0" + "open-telemetry/context": "^1.0", + "php": "^7.4 || ^8.0", + "psr/log": "^1.1|^2.0|^3.0", + "symfony/polyfill-php80": "^1.26", + "symfony/polyfill-php81": "^1.26", + "symfony/polyfill-php82": "^1.26" }, - "require-dev": { - "phpunit/phpunit": "^8.4.1 || ^9" + "conflict": { + "open-telemetry/sdk": "<=1.0.4" }, "type": "library", - "autoload": { - "psr-4": { - "nodespark\\DESConnector\\": "src/DESConnector/" + "extra": { + "branch-alias": { + "dev-main": "1.0.x-dev" } }, - "autoload-dev": { + "autoload": { + "files": [ + "Trace/functions.php" + ], "psr-4": { - "nodespark\\DESConnector\\Test\\": "tests/" + "OpenTelemetry\\API\\": "." } }, + "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "Apache-2.0" ], "authors": [ { - "name": "Nikolay Ignatov", - "email": "nignatov@nodespark.com", - "homepage": "http://www.nodespark.com", - "role": "Creator and Maintainer" - }, - { - "name": "Lachezar Valchev", - "email": "lachezar.valchev@gmail.com", - "homepage": "https://drupal.org/u/lachezar.valchev", - "role": "Maintainer" + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" } ], - "description": "An abstraction library for Elasticsearch Connector module for Drupal.", - "homepage": "https://github.com/nodespark/des-connector", + "description": "API for OpenTelemetry PHP.", + "keywords": [ + "Metrics", + "api", + "apm", + "logging", + "opentelemetry", + "otel", + "tracing" + ], "support": { - "source": "https://github.com/nodespark/des-connector" + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2022-12-05T10:56:20+00:00" + "time": "2024-02-06T01:32:25+00:00" }, { - "name": "nyholm/dsn", - "version": "2.0.1", + "name": "open-telemetry/context", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/Nyholm/dsn.git", - "reference": "9445621b426bac8c0ca161db8cd700da00a4e618" + "url": "https://github.com/opentelemetry-php/context.git", + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/dsn/zipball/9445621b426bac8c0ca161db8cd700da00a4e618", - "reference": "9445621b426bac8c0ca161db8cd700da00a4e618", + "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3", + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3", "shasum": "" }, "require": { - "php": ">=7.1" + "php": "^8.1", + "symfony/polyfill-php82": "^1.26" }, - "require-dev": { - "symfony/phpunit-bridge": "^5.1" + "suggest": { + "ext-ffi": "To allow context switching in Fibers" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "1.0.x-dev" } }, "autoload": { + "files": [ + "fiber/initialize_fiber_handler.php" + ], "psr-4": { - "Nyholm\\Dsn\\": "src/" + "OpenTelemetry\\Context\\": "." } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0" ], "authors": [ { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" } ], - "description": "Parse your DSN strings in a powerful and flexible way", - "homepage": "http://tnyholm.se", + "description": "Context implementation for OpenTelemetry PHP.", "keywords": [ - "database", - "dsn", - "dsn parser", - "parser" + "Context", + "opentelemetry", + "otel" ], "support": { - "issues": "https://github.com/Nyholm/dsn/issues", - "source": "https://github.com/Nyholm/dsn/tree/2.0.1" + "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", + "docs": "https://opentelemetry.io/docs/php", + "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", + "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "funding": [ - { - "url": "https://github.com/Nyholm", - "type": "github" - } - ], - "time": "2021-11-18T09:23:29+00:00" + "time": "2024-08-21T00:29:20+00:00" }, { "name": "paatokset/paatokset_search", - "version": "1.2.2", + "version": "1.3.2", "dist": { "type": "zip", - "url": "https://github.com/City-of-Helsinki/paatokset-search/releases/download/1.2.2/paatokset_search.zip" + "url": "https://github.com/City-of-Helsinki/paatokset-search/releases/download/1.3.2/paatokset_search.zip" }, "type": "library" }, @@ -10463,37 +10420,225 @@ "time": "2024-10-03T13:43:19+00:00" }, { - "name": "phpowermove/docblock", - "version": "v4.0", + "name": "php-http/discovery", + "version": "1.20.0", "source": { "type": "git", - "url": "https://github.com/phpowermove/docblock.git", - "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826" + "url": "https://github.com/php-http/discovery.git", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpowermove/docblock/zipball/a73f6e17b7d4e1b92ca5378c248c952c9fae7826", - "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", "shasum": "" }, "require": { - "phootwork/collection": "^3.0", - "phootwork/lang": "^3.0", - "php": ">=8.0" + "composer-plugin-api": "^1.0|^2.0", + "php": "^7.1 || ^8.0" }, - "require-dev": { - "phootwork/php-cs-fixer-config": "^0.4", - "phpunit/phpunit": "^9.0", - "psalm/phar": "^4.3" + "conflict": { + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" }, - "type": "library", - "autoload": { - "psr-4": { - "phpowermove\\docblock\\": "src/" - } + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message-implementation": "*" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "graham-campbell/phpspec-skip-example-extension": "^5.0", + "php-http/httplug": "^1.0 || ^2.0", + "php-http/message-factory": "^1.0", + "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", + "sebastian/comparator": "^3.0.5 || ^4.0.8", + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" + }, + "type": "composer-plugin", + "extra": { + "class": "Http\\Discovery\\Composer\\Plugin", + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Http\\Discovery\\": "src/" + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", + "homepage": "http://php-http.org", + "keywords": [ + "adapter", + "client", + "discovery", + "factory", + "http", + "message", + "psr17", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/discovery/issues", + "source": "https://github.com/php-http/discovery/tree/1.20.0" + }, + "time": "2024-10-02T11:20:13+00:00" + }, + { + "name": "php-http/httplug", + "version": "2.4.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/httplug.git", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/promise": "^1.1", + "psr/http-client": "^1.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "HTTPlug, the HTTP client abstraction for PHP", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http" + ], + "support": { + "issues": "https://github.com/php-http/httplug/issues", + "source": "https://github.com/php-http/httplug/tree/2.4.1" + }, + "time": "2024-09-23T11:39:58+00:00" + }, + { + "name": "php-http/promise", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/promise.git", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", + "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joel Wurtz", + "email": "joel.wurtz@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Promise used for asynchronous HTTP requests", + "homepage": "http://httplug.io", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/php-http/promise/issues", + "source": "https://github.com/php-http/promise/tree/1.3.1" + }, + "time": "2024-03-15T13:55:21+00:00" + }, + { + "name": "phpowermove/docblock", + "version": "v4.0", + "source": { + "type": "git", + "url": "https://github.com/phpowermove/docblock.git", + "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpowermove/docblock/zipball/a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "reference": "a73f6e17b7d4e1b92ca5378c248c952c9fae7826", + "shasum": "" + }, + "require": { + "phootwork/collection": "^3.0", + "phootwork/lang": "^3.0", + "php": ">=8.0" + }, + "require-dev": { + "phootwork/php-cs-fixer-config": "^0.4", + "phpunit/phpunit": "^9.0", + "psalm/phar": "^4.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpowermove\\docblock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ "MIT" ], "authors": [ @@ -11106,32 +11251,44 @@ "time": "2019-03-08T08:55:37+00:00" }, { - "name": "react/promise", - "version": "v2.11.0", + "name": "ruflin/elastica", + "version": "8.0.0", "source": { "type": "git", - "url": "https://github.com/reactphp/promise.git", - "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831" + "url": "https://github.com/ruflin/Elastica.git", + "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831", - "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/2fc446e37847e84cd9f9be8e75fd2b322007ea43", + "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43", "shasum": "" }, "require": { - "php": ">=5.4.0" + "elastic/transport": "^8.8", + "elasticsearch/elasticsearch": "^8.4.1", + "ext-json": "*", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "psr/log": "^1.0 || ^2.0 || ^3.0" + }, + "conflict": { + "guzzlehttp/psr7": "<2.0.0" }, "require-dev": { - "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + "guzzlehttp/guzzle": "^7.2", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "symfony/phpunit-bridge": "^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", + "monolog/monolog": "Logging request" }, "type": "library", "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { - "React\\Promise\\": "src/" + "Elastica\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -11140,124 +11297,34 @@ ], "authors": [ { - "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com", - "homepage": "https://sorgalla.com/" - }, - { - "name": "Christian Lück", - "email": "christian@clue.engineering", - "homepage": "https://clue.engineering/" - }, - { - "name": "Cees-Jan Kiewiet", - "email": "reactphp@ceesjankiewiet.nl", - "homepage": "https://wyrihaximus.net/" - }, - { - "name": "Chris Boden", - "email": "cboden@gmail.com", - "homepage": "https://cboden.dev/" + "name": "Nicolas Ruflin", + "homepage": "http://ruflin.com/" } ], - "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "description": "Elasticsearch Client", + "homepage": "http://elastica.io/", "keywords": [ - "promise", - "promises" + "client", + "search" ], "support": { - "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.11.0" + "issues": "https://github.com/ruflin/Elastica/issues", + "source": "https://github.com/ruflin/Elastica/tree/8.0.0" }, - "funding": [ - { - "url": "https://opencollective.com/reactphp", - "type": "open_collective" - } - ], - "time": "2023-11-16T16:16:50+00:00" + "time": "2024-05-29T11:45:23+00:00" }, { - "name": "ruflin/elastica", - "version": "7.3.2", + "name": "sebastian/diff", + "version": "4.0.6", "source": { "type": "git", - "url": "https://github.com/ruflin/Elastica.git", - "reference": "84ba137678707a1aa4242d12bad891dc38fa2608" + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/84ba137678707a1aa4242d12bad891dc38fa2608", - "reference": "84ba137678707a1aa4242d12bad891dc38fa2608", - "shasum": "" - }, - "require": { - "elasticsearch/elasticsearch": "^7.10", - "ext-json": "*", - "nyholm/dsn": "^2.0.0", - "php": "^7.2 || ^8.0", - "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0", - "symfony/polyfill-php73": "^1.19" - }, - "require-dev": { - "aws/aws-sdk-php": "^3.155", - "guzzlehttp/guzzle": "^6.3 || ^7.2", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5.8 || ^9.4", - "symfony/phpunit-bridge": "^6.0" - }, - "suggest": { - "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", - "guzzlehttp/guzzle": "Allow using guzzle as transport", - "monolog/monolog": "Logging request" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Elastica\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Ruflin", - "homepage": "http://ruflin.com/" - } - ], - "description": "Elasticsearch Client", - "homepage": "http://elastica.io/", - "keywords": [ - "client", - "search" - ], - "support": { - "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/7.3.2" - }, - "time": "2024-03-11T14:11:50+00:00" - }, - { - "name": "sebastian/diff", - "version": "4.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", - "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -13050,17 +13117,17 @@ "time": "2020-10-23T14:02:19+00:00" }, { - "name": "symfony/polyfill-php73", + "name": "symfony/polyfill-php80", "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", - "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { @@ -13078,7 +13145,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, "classmap": [ "Resources/stubs" @@ -13089,6 +13156,10 @@ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -13098,7 +13169,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -13107,7 +13178,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -13201,6 +13272,82 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php82", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php82.git", + "reference": "5d2ed36f7734637dacc025f179698031951b1692" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692", + "reference": "5d2ed36f7734637dacc025f179698031951b1692", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php82\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php82/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, { "name": "symfony/polyfill-php83", "version": "v1.31.0", @@ -16315,132 +16462,6 @@ ], "time": "2023-03-08T13:26:56+00:00" }, - { - "name": "open-telemetry/api", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/opentelemetry-php/api.git", - "reference": "87de95d926f46262885d0d390060c095af13e2e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", - "reference": "87de95d926f46262885d0d390060c095af13e2e5", - "shasum": "" - }, - "require": { - "open-telemetry/context": "^1.0", - "php": "^7.4 || ^8.0", - "psr/log": "^1.1|^2.0|^3.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26" - }, - "conflict": { - "open-telemetry/sdk": "<=1.0.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.0.x-dev" - } - }, - "autoload": { - "files": [ - "Trace/functions.php" - ], - "psr-4": { - "OpenTelemetry\\API\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "opentelemetry-php contributors", - "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" - } - ], - "description": "API for OpenTelemetry PHP.", - "keywords": [ - "Metrics", - "api", - "apm", - "logging", - "opentelemetry", - "otel", - "tracing" - ], - "support": { - "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", - "docs": "https://opentelemetry.io/docs/php", - "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", - "source": "https://github.com/open-telemetry/opentelemetry-php" - }, - "time": "2024-02-06T01:32:25+00:00" - }, - { - "name": "open-telemetry/context", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/opentelemetry-php/context.git", - "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3", - "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3", - "shasum": "" - }, - "require": { - "php": "^8.1", - "symfony/polyfill-php82": "^1.26" - }, - "suggest": { - "ext-ffi": "To allow context switching in Fibers" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.0.x-dev" - } - }, - "autoload": { - "files": [ - "fiber/initialize_fiber_handler.php" - ], - "psr-4": { - "OpenTelemetry\\Context\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "opentelemetry-php contributors", - "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" - } - ], - "description": "Context implementation for OpenTelemetry PHP.", - "keywords": [ - "Context", - "opentelemetry", - "otel" - ], - "support": { - "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V", - "docs": "https://opentelemetry.io/docs/php", - "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", - "source": "https://github.com/open-telemetry/opentelemetry-php" - }, - "time": "2024-08-21T00:29:20+00:00" - }, { "name": "open-telemetry/exporter-otlp", "version": "1.0.3", @@ -16780,268 +16801,83 @@ "type": "zip", "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, - "time": "2022-02-21T01:04:05+00:00" - }, - { - "name": "php-http/discovery", - "version": "1.20.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/discovery.git", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", - "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0|^2.0", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "nyholm/psr7": "<1.0", - "zendframework/zend-diactoros": "*" - }, - "provide": { - "php-http/async-client-implementation": "*", - "php-http/client-implementation": "*", - "psr/http-client-implementation": "*", - "psr/http-factory-implementation": "*", - "psr/http-message-implementation": "*" - }, - "require-dev": { - "composer/composer": "^1.0.2|^2.0", - "graham-campbell/phpspec-skip-example-extension": "^5.0", - "php-http/httplug": "^1.0 || ^2.0", - "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "sebastian/comparator": "^3.0.5 || ^4.0.8", - "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" - }, - "type": "composer-plugin", - "extra": { - "class": "Http\\Discovery\\Composer\\Plugin", - "plugin-optional": true - }, - "autoload": { - "psr-4": { - "Http\\Discovery\\": "src/" - }, - "exclude-from-classmap": [ - "src/Composer/Plugin.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", - "homepage": "http://php-http.org", - "keywords": [ - "adapter", - "client", - "discovery", - "factory", - "http", - "message", - "psr17", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.20.0" - }, - "time": "2024-10-02T11:20:13+00:00" - }, - { - "name": "php-http/guzzle7-adapter", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/guzzle7-adapter.git", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", - "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^7.0", - "php": "^7.2 | ^8.0", - "php-http/httplug": "^2.0", - "psr/http-client": "^1.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.0|^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Adapter\\Guzzle7\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "Guzzle 7 HTTP Adapter", - "homepage": "http://httplug.io", - "keywords": [ - "Guzzle", - "http" - ], - "support": { - "issues": "https://github.com/php-http/guzzle7-adapter/issues", - "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" - }, - "time": "2021-03-09T07:35:15+00:00" - }, - { - "name": "php-http/httplug", - "version": "2.4.1", - "source": { - "type": "git", - "url": "https://github.com/php-http/httplug.git", - "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", - "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/promise": "^1.1", - "psr/http-client": "^1.0", - "psr/http-message": "^1.0 || ^2.0" + "shasum": "" }, - "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", - "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" + "require": { + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { - "psr-4": { - "Http\\Client\\": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" }, { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "HTTPlug, the HTTP client abstraction for PHP", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http" - ], + "description": "Library for handling version information and constraints", "support": { - "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.4.1" + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2024-09-23T11:39:58+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { - "name": "php-http/promise", - "version": "1.3.1", + "name": "php-http/guzzle7-adapter", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-http/promise.git", - "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" + "url": "https://github.com/php-http/guzzle7-adapter.git", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", - "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "guzzlehttp/guzzle": "^7.0", + "php": "^7.2 | ^8.0", + "php-http/httplug": "^2.0", + "psr/http-client": "^1.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", - "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.0|^9.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.2.x-dev" + } + }, "autoload": { "psr-4": { - "Http\\Promise\\": "src/" + "Http\\Adapter\\Guzzle7\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -17050,24 +16886,21 @@ ], "authors": [ { - "name": "Joel Wurtz", - "email": "joel.wurtz@gmail.com" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" } ], - "description": "Promise used for asynchronous HTTP requests", + "description": "Guzzle 7 HTTP Adapter", "homepage": "http://httplug.io", "keywords": [ - "promise" + "Guzzle", + "http" ], "support": { - "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.3.1" + "issues": "https://github.com/php-http/guzzle7-adapter/issues", + "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" }, - "time": "2024-03-15T13:55:21+00:00" + "time": "2021-03-09T07:35:15+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -18040,6 +17873,79 @@ ], "time": "2024-01-19T07:03:14+00:00" }, + { + "name": "react/promise", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-05-24T10:39:05+00:00" + }, { "name": "sebastian/cli-parser", "version": "1.0.1", @@ -19675,97 +19581,17 @@ "time": "2024-01-23T14:51:35+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.31.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-09-09T11:45:10+00:00" - }, - { - "name": "symfony/polyfill-php82", + "name": "symfony/polyfill-php73", "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "5d2ed36f7734637dacc025f179698031951b1692" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692", - "reference": "5d2ed36f7734637dacc025f179698031951b1692", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { @@ -19783,7 +19609,7 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php82\\": "" + "Symfony\\Polyfill\\Php73\\": "" }, "classmap": [ "Resources/stubs" @@ -19803,7 +19629,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -19812,7 +19638,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -19885,7 +19711,7 @@ "version": "2.2.0", "source": { "type": "git", - "url": "git@gitlab.com:weitzman/drupal-test-traits.git", + "url": "https://git.drupalcode.org/project/dtt.git", "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8" }, "dist": { @@ -19942,7 +19768,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, + "platform": [], + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/conf/cmi/elasticsearch_connector.cluster.paatokset.yml b/conf/cmi/elasticsearch_connector.cluster.paatokset.yml deleted file mode 100644 index 4410a48fc..000000000 --- a/conf/cmi/elasticsearch_connector.cluster.paatokset.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 4a8571c1-96d6-4f8d-b775-4bcf4199759a -langcode: en -status: '1' -dependencies: { } -cluster_id: paatokset -name: Päätökset -url: 'http://elastic:9200' -options: - multiple_nodes_connection: false - use_authentication: true - authentication_type: Basic - username: elastic - password: changeme - timeout: 3 - rewrite: - rewrite_index: true - index: - prefix: paatokset - suffix: '' diff --git a/conf/cmi/search_api.index.decisions.yml b/conf/cmi/search_api.index.decisions.yml index fafd99627..552afcd82 100644 --- a/conf/cmi/search_api.index.decisions.yml +++ b/conf/cmi/search_api.index.decisions.yml @@ -3,31 +3,40 @@ langcode: en status: true dependencies: config: - - field.storage.node.field_classification_title - field.storage.node.field_decision_case_title + - field.storage.node.field_classification_title - field.storage.node.field_decision_content_parsed - field.storage.node.field_decision_motion_parsed - - field.storage.node.field_decision_native_id - - field.storage.node.field_decision_section - field.storage.node.field_diary_number - - field.storage.node.field_dm_org_above_name - - field.storage.node.field_dm_org_name - field.storage.node.field_full_title - - field.storage.node.field_is_decision - field.storage.node.field_meeting_date - - field.storage.node.field_organization_type + - field.storage.node.field_decision_native_id + - field.storage.node.field_is_decision - field.storage.node.field_policymaker_id + - field.storage.node.field_dm_org_above_name + - field.storage.node.field_dm_org_name + - field.storage.node.field_organization_type + - field.storage.node.field_decision_section - field.storage.node.field_top_category_name - - search_api.server.elasticsearch + - search_api.server.default module: - - helfi_react_search - node + - search_api + - helfi_react_search - paatokset_search id: decisions name: Decisions description: '' read_only: false field_settings: + _language: + label: Language + datasource_id: 'entity:node' + property_path: langcode + type: string + dependencies: + module: + - node category_name: label: 'Classification title' datasource_id: 'entity:node' @@ -261,4 +270,4 @@ options: cron_limit: 0 index_directly: false track_changes_in_references: true -server: elasticsearch +server: default diff --git a/conf/cmi/search_api.index.meetings.yml b/conf/cmi/search_api.index.meetings.yml index 9cc8df735..e6eca4f67 100644 --- a/conf/cmi/search_api.index.meetings.yml +++ b/conf/cmi/search_api.index.meetings.yml @@ -11,7 +11,7 @@ dependencies: - field.storage.node.field_meeting_minutes_published - field.storage.node.field_meeting_sequence_number - field.storage.node.field_meeting_status - - search_api.server.elasticsearch + - search_api.server.default module: - helfi_react_search - node @@ -21,6 +21,14 @@ name: Meetings description: '' read_only: false field_settings: + _language: + label: Language + datasource_id: 'entity:node' + property_path: langcode + type: string + dependencies: + module: + - node field_meeting_agenda_published: label: 'Agenda published' datasource_id: 'entity:node' @@ -179,4 +187,4 @@ options: cron_limit: 0 index_directly: false track_changes_in_references: true -server: elasticsearch +server: default diff --git a/conf/cmi/search_api.index.policymakers.yml b/conf/cmi/search_api.index.policymakers.yml index d18862a3f..397f16f88 100644 --- a/conf/cmi/search_api.index.policymakers.yml +++ b/conf/cmi/search_api.index.policymakers.yml @@ -11,7 +11,7 @@ dependencies: - field.storage.node.field_organization_type - field.storage.node.field_policymaker_existing - field.storage.node.field_sector_name - - search_api.server.elasticsearch + - search_api.server.default module: - helfi_react_search - node @@ -21,6 +21,14 @@ name: Policymakers description: '' read_only: false field_settings: + _language: + label: Language + datasource_id: 'entity:node' + property_path: langcode + type: string + dependencies: + module: + - node color_class: label: 'Color Class' datasource_id: 'entity:node' @@ -198,4 +206,4 @@ options: cron_limit: 0 index_directly: false track_changes_in_references: true -server: elasticsearch +server: default diff --git a/conf/cmi/search_api.server.elasticsearch.yml b/conf/cmi/search_api.server.default.yml similarity index 51% rename from conf/cmi/search_api.server.elasticsearch.yml rename to conf/cmi/search_api.server.default.yml index 4ea3d3ca1..f9ece025b 100644 --- a/conf/cmi/search_api.server.elasticsearch.yml +++ b/conf/cmi/search_api.server.default.yml @@ -4,11 +4,16 @@ status: true dependencies: module: - elasticsearch_connector -id: elasticsearch +id: default name: Elasticsearch description: '' backend: elasticsearch backend_config: - cluster_settings: - cluster: paatokset - fuzziness: auto + connector: standard + connector_config: + url: 'http://elastic:9200' + enable_debug_logging: false + advanced: + fuzziness: auto + prefix: paatokset_ + suffix: '' diff --git a/public/modules/custom/paatokset_search/paatokset_search.libraries.yml b/public/modules/custom/paatokset_search/paatokset_search.libraries.yml index 6293a8ef0..cc76b9786 100644 --- a/public/modules/custom/paatokset_search/paatokset_search.libraries.yml +++ b/public/modules/custom/paatokset_search/paatokset_search.libraries.yml @@ -1,6 +1,6 @@ paatokset-search: remote: https://github.com/City-of-Helsinki/paatokset-search - version: 1.2.2 + version: 1.3.2 license: name: MIT url: https://github.com/City-of-Helsinki/asuntomyynti-search/blob/develop/README.md diff --git a/public/modules/custom/paatokset_search/paatokset_search.module b/public/modules/custom/paatokset_search/paatokset_search.module index 652d42092..af582e176 100644 --- a/public/modules/custom/paatokset_search/paatokset_search.module +++ b/public/modules/custom/paatokset_search/paatokset_search.module @@ -15,15 +15,3 @@ function paatokset_search_preprocess_html(array &$variables) { $variables['attributes']['class'][] = 'paatokset-search-page--decisions'; } } - -/** - * Implements hook_elasticsearch_connector_load_library_options_alter(). - * - * Set cURL options to trust self-signed certificate. - * - * @fixme rather than disabling verification, should set CURLOPT_SSLCERT to correct value. - */ -function paatokset_search_elasticsearch_connector_load_library_options_alter(&$options, &$context) { - $options['curl'][CURLOPT_SSL_VERIFYPEER] = FALSE; - $options['curl'][CURLOPT_SSL_VERIFYHOST] = FALSE; -} diff --git a/public/modules/custom/paatokset_search/src/EventSubscriber/PrepareIndex.php b/public/modules/custom/paatokset_search/src/EventSubscriber/PrepareIndex.php index 508e5e0c5..3bea70d27 100644 --- a/public/modules/custom/paatokset_search/src/EventSubscriber/PrepareIndex.php +++ b/public/modules/custom/paatokset_search/src/EventSubscriber/PrepareIndex.php @@ -1,40 +1,52 @@ 'prepareIndices', + AlterSettingsEvent::class => 'prepareIndices', ]; } /** * Method to prepare index. * - * @param Drupal\elasticsearch_connector\Event\PrepareIndexEvent $event + * @param \Drupal\elasticsearch_connector\Event\AlterSettingsEvent $event * The PrepareIndex event. */ - public function prepareIndices(PrepareIndexEvent $event) { - $indexName = $event->getIndexName(); + public function prepareIndices(AlterSettingsEvent $event): void { + $indexName = $event->getIndex()->id(); $finnishIndices = [ 'paatokset_decisions', 'paatokset_policymakers', ]; if (in_array($indexName, $finnishIndices)) { - $indexConfig = $event->getIndexConfig(); - $indexConfig['body']['settings']['analysis']['analyzer']['default']['type'] = 'finnish'; - $event->setIndexConfig($indexConfig); + $event->setSettings(NestedArray::mergeDeep( + $event->getSettings(), + [ + 'analysis' => [ + 'analyzer' => [ + 'default' => [ + 'type' => 'finnish', + ], + ], + ], + ], + )); } } diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 60d44ed55..3caf720f9 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -8,18 +8,6 @@ $settings['http_client_config']['timeout'] = 240; ini_set('default_socket_timeout', 240); -// Elasticsearch settings. -if (getenv('ELASTIC_CONNECTOR_URL')) { - $config['elasticsearch_connector.cluster.paatokset']['url'] = getenv('ELASTIC_CONNECTOR_URL'); - - if (getenv('ELASTIC_INTERNAL_USER') && getenv('ELASTIC_INTERNAL_PWD')) { - $config['elasticsearch_connector.cluster.paatokset']['options']['use_authentication'] = '1'; - $config['elasticsearch_connector.cluster.paatokset']['options']['authentication_type'] = 'Basic'; - $config['elasticsearch_connector.cluster.paatokset']['options']['username'] = getenv('ELASTIC_INTERNAL_USER'); - $config['elasticsearch_connector.cluster.paatokset']['options']['password'] = getenv('ELASTIC_INTERNAL_PWD'); - } -} - // Elastic proxy URL. $config['elastic_proxy.settings']['elastic_proxy_url'] = drupal_get_env(['REACT_APP_PROXY_URL', 'REACT_APP_ELASTIC_URL']); @@ -61,9 +49,9 @@ 'DRUPAL_REVERSE_PROXY_ADDRESS|AHJO_PROXY_BASE_URL', 'LOCAL_PROXY_API_KEY', 'REACT_APP_PROXY_URL|REACT_APP_ELASTIC_URL', - 'ELASTIC_CONNECTOR_URL', - 'ELASTIC_INTERNAL_USER', - 'ELASTIC_INTERNAL_PWD', + 'ELASTICSEARCH_URL', + 'ELASTIC_USER', + 'ELASTIC_PASSWORD', 'SENTRY_DSN_REACT', ];