From 554b8d18e0bc01f8a157bfbe569919827b01e5b7 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sun, 12 Mar 2023 15:48:26 +0100 Subject: [PATCH] Update used packages to their latest versions --- composer.json | 6 +- composer.lock | 356 +++++++++++++++++++++++++++------------ config/elasticsearch.php | 105 +++++++----- 3 files changed, 312 insertions(+), 155 deletions(-) diff --git a/composer.json b/composer.json index 1b9455100..9208178dd 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "brick/math": "^0.10", "caneara/triggers": "^1.0", "canihavesomecoffee/thetvdbapi": "^2.0", - "cviebrock/laravel-elasticsearch": "^9.0", + "cviebrock/laravel-elasticsearch": "^10.0", "dariusiii/l5-fixtures": "^3.0", "dariusiii/php-itunes-api": "^1.0", "dariusiii/rarinfo": "^2.5", @@ -163,10 +163,6 @@ "type": "vcs", "url": "https://github.com/DariusIII/model" }, - { - "type": "vcs", - "url": "https://github.com/DariusIII/laravel-elasticsearch" - }, { "type": "vcs", "url": "https://github.com/NNTmux/laravel-caffeine" diff --git a/composer.lock b/composer.lock index 7d63d5ad8..6ec917cf3 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": "8e8f20f6bc7a36a886f3c1ca5bbe52e2", + "content-hash": "482c82b3e65f3164f085db23caffb132", "packages": [ { "name": "aharen/omdbapi", @@ -827,20 +827,20 @@ }, { "name": "cviebrock/laravel-elasticsearch", - "version": "9.1.5.1", + "version": "10.0.0", "source": { "type": "git", - "url": "https://github.com/DariusIII/laravel-elasticsearch.git", - "reference": "a335fda3b1f330782ce514f1f0c92fe7f09ec4a5" + "url": "https://github.com/cviebrock/laravel-elasticsearch.git", + "reference": "b0027b66e75e55dd143843be6f3fbbc01958cb57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DariusIII/laravel-elasticsearch/zipball/a335fda3b1f330782ce514f1f0c92fe7f09ec4a5", - "reference": "a335fda3b1f330782ce514f1f0c92fe7f09ec4a5", + "url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/b0027b66e75e55dd143843be6f3fbbc01958cb57", + "reference": "b0027b66e75e55dd143843be6f3fbbc01958cb57", "shasum": "" }, "require": { - "elasticsearch/elasticsearch": "^7.11|^8.6", + "elasticsearch/elasticsearch": "^7.11", "ext-json": "*", "guzzlehttp/psr7": "^1.7|^2.0", "illuminate/contracts": "^7.0|^8.0|^9.0|^10.0", @@ -849,7 +849,6 @@ "psr/http-message": "^1.0" }, "require-dev": { - "limedeck/phpunit-detailed-printer": "^6.0", "mockery/mockery": "^1.4.3", "orchestra/testbench": "^6.5|^7.0|^8.0", "phpunit/phpunit": "^9.4" @@ -873,20 +872,7 @@ "Cviebrock\\LaravelElasticsearch\\": "src" } }, - "autoload-dev": { - "psr-4": { - "Cviebrock\\LaravelElasticsearch\\Tests\\": "tests" - } - }, - "scripts": { - "fresh": [ - "rm -rf vendor composer.lock", - "composer install" - ], - "tests": [ - "php vendor/bin/phpunit" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -905,15 +891,16 @@ "search" ], "support": { - "source": "https://github.com/DariusIII/laravel-elasticsearch/tree/9.1.5.1" + "issues": "https://github.com/cviebrock/laravel-elasticsearch/issues", + "source": "https://github.com/cviebrock/laravel-elasticsearch/tree/10.0.0" }, "funding": [ { - "type": "github", - "url": "https://github.com/cviebrock" + "url": "https://github.com/cviebrock", + "type": "github" } ], - "time": "2023-02-17T11:24:43+00:00" + "time": "2023-02-18T02:44:52+00:00" }, { "name": "dariusiii/l5-fixtures", @@ -2037,108 +2024,68 @@ ], "time": "2023-01-14T14:17:03+00:00" }, - { - "name": "elastic/transport", - "version": "v8.6.0", - "source": { - "type": "git", - "url": "git@github.com:elastic/elastic-transport-php.git", - "reference": "b1d761549cebddf2add49921ef67242897b635df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/elastic/elastic-transport-php/zipball/b1d761549cebddf2add49921ef67242897b635df", - "reference": "b1d761549cebddf2add49921ef67242897b635df", - "shasum": "" - }, - "require": { - "composer-runtime-api": "^2.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", - "psr/log": "^1 || ^2 || ^3" - }, - "require-dev": { - "nyholm/psr7": "^1.5", - "php-http/mock-client": "^1.5", - "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^9.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Elastic\\Transport\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "HTTP transport PHP library for Elastic products", - "keywords": [ - "PSR_17", - "elastic", - "http", - "psr-18", - "psr-7", - "transport" - ], - "time": "2023-01-11T13:46:07+00:00" - }, { "name": "elasticsearch/elasticsearch", - "version": "v8.6.2", + "version": "v7.17.1", "source": { "type": "git", "url": "git@github.com:elastic/elasticsearch-php.git", - "reference": "71c023ae89d4ce3ee6230e158c2368ae4b4b957b" + "reference": "f1b8918f411b837ce5f6325e829a73518fd50367" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/71c023ae89d4ce3ee6230e158c2368ae4b4b957b", - "reference": "71c023ae89d4ce3ee6230e158c2368ae4b4b957b", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/f1b8918f411b837ce5f6325e829a73518fd50367", + "reference": "f1b8918f411b837ce5f6325e829a73518fd50367", "shasum": "" }, "require": { - "elastic/transport": "^8.5", - "guzzlehttp/guzzle": "^7.0", - "php": "^7.4 || ^8.0", - "psr/http-client": "^1.0", - "psr/http-message": "^1.0", + "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.5", - "nyholm/psr7": "^1.5", - "php-http/mock-client": "^1.5", - "phpstan/phpstan": "^1.4", - "phpunit/phpunit": "^9.5", - "symfony/finder": "~4.0", - "symfony/http-client": "^5.0|^6.0" + "mockery/mockery": "^1.2", + "phpstan/phpstan": "^0.12", + "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": { - "Elastic\\Elasticsearch\\": "src/" + "Elasticsearch\\": "src/Elasticsearch/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache-2.0", + "LGPL-2.1-only" + ], + "authors": [ + { + "name": "Zachary Tong" + }, + { + "name": "Enrico Zimuel" + } ], "description": "PHP Client for Elasticsearch", "keywords": [ "client", - "elastic", "elasticsearch", "search" ], - "time": "2023-02-13T08:24:59+00:00" + "time": "2022-09-30T12:28:55+00:00" }, { "name": "evenement/evenement", @@ -2187,6 +2134,116 @@ }, "time": "2017-07-23T21:35:13+00:00" }, + { + "name": "ezimuel/guzzlestreams", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/ezimuel/guzzlestreams.git", + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Stream\\": "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/", + "keywords": [ + "Guzzle", + "stream" + ], + "support": { + "source": "https://github.com/ezimuel/guzzlestreams/tree/3.1.0" + }, + "time": "2022-10-24T12:58:50+00:00" + }, + { + "name": "ezimuel/ringphp", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/ezimuel/ringphp.git", + "reference": "7887fc8488013065f72f977dcb281994f5fde9f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/7887fc8488013065f72f977dcb281994f5fde9f4", + "reference": "7887fc8488013065f72f977dcb281994f5fde9f4", + "shasum": "" + }, + "require": { + "ezimuel/guzzlestreams": "^3.0.1", + "php": ">=5.4.0", + "react/promise": "~2.0" + }, + "replace": { + "guzzlehttp/ringphp": "self.version" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~9.0" + }, + "suggest": { + "ext-curl": "Guzzle will use specific adapters if cURL is present" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Ring\\": "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/RingPHP (abandoned) to be used with elasticsearch-php", + "support": { + "source": "https://github.com/ezimuel/ringphp/tree/1.2.2" + }, + "time": "2022-12-07T11:28:53+00:00" + }, { "name": "fakerphp/faker", "version": "v1.21.0", @@ -4711,34 +4768,37 @@ }, { "name": "league/csv", - "version": "9.8.0", + "version": "9.9.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47" + "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47", - "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/b4418ede47fbd88facc34e40a16c8ce9153b961b", + "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": "^7.4 || ^8.0" + "php": "^8.1.2" }, "require-dev": { - "ext-curl": "*", + "doctrine/collections": "^2.1.2", "ext-dom": "*", - "friendsofphp/php-cs-fixer": "^v3.4.0", - "phpstan/phpstan": "^1.3.0", - "phpstan/phpstan-phpunit": "^1.0.0", - "phpstan/phpstan-strict-rules": "^1.1.0", - "phpunit/phpunit": "^9.5.11" + "ext-xdebug": "*", + "friendsofphp/php-cs-fixer": "^v3.14.3", + "phpbench/phpbench": "^1.2.8", + "phpstan/phpstan": "^1.10.4", + "phpstan/phpstan-deprecation-rules": "^1.1.2", + "phpstan/phpstan-phpunit": "^1.3.10", + "phpstan/phpstan-strict-rules": "^1.5.0", + "phpunit/phpunit": "^10.0.14" }, "suggest": { - "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes", + "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters" }, "type": "library", @@ -4791,7 +4851,7 @@ "type": "github" } ], - "time": "2022-01-04T00:13:07+00:00" + "time": "2023-03-11T15:57:12+00:00" }, { "name": "league/flysystem", @@ -8533,6 +8593,82 @@ ], "time": "2023-01-12T18:13:24+00:00" }, + { + "name": "react/promise", + "version": "v2.9.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + }, + "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/v2.9.0" + }, + "funding": [ + { + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-02-11T10:27:51+00:00" + }, { "name": "seld/cli-prompt", "version": "1.0.4", diff --git a/config/elasticsearch.php b/config/elasticsearch.php index 4fd62a2aa..8a3c6c6a5 100644 --- a/config/elasticsearch.php +++ b/config/elasticsearch.php @@ -2,7 +2,7 @@ return [ - /* + /** * You can specify one of several different connections when building an * Elasticsearch client. * @@ -10,17 +10,19 @@ return [ * as your default connection when building an client. Of course you may * use create several clients at once, each with different configurations. */ + 'defaultConnection' => 'default', - /* + /** * These are the connection parameters used when building a client. */ + 'connections' => [ 'default' => [ - /* - * Hosts. + /** + * Hosts * * This is an array of hosts that the client will connect to. It can be a * single host, or an array if you are running a cluster of Elasticsearch @@ -36,21 +38,33 @@ return [ * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_inline_host_configuration */ + 'hosts' => [ - env('ELASTICSEARCH_SCHEME', 'http').'://'.env('ELASTICSEARCH_HOST', 'localhost').':'.env('ELASTICSEARCH_PORT', 9200), - ], - 'basicAuthentication' => [ - 'user' => env('ELASTICSEARCH_USER', null), - 'pass' => env('ELASTICSEARCH_PASS', null), - ], - 'cloud_api' => [ - // Alternatively, you can log in via API keys - 'api_id' => env('ELASTICSEARCH_API_ID', null), - 'api_key' => env('ELASTICSEARCH_API_KEY', null), + [ + 'host' => env('ELASTICSEARCH_HOST', 'localhost'), + // For local development, the default Elasticsearch port is 9200. + // If you are connecting to an Elasticsearch instance on AWS, you probably want to set this to null + 'port' => env('ELASTICSEARCH_PORT', 9200), + 'scheme' => env('ELASTICSEARCH_SCHEME', null), + 'user' => env('ELASTICSEARCH_USER', null), + 'pass' => env('ELASTICSEARCH_PASS', null), + + // Alternatively, you can log in via API keys + 'api_id' => env('ELASTICSEARCH_API_ID', null), + 'api_key' => env('ELASTICSEARCH_API_KEY', null), + + // If you are connecting to an Elasticsearch instance on AWS, you will need these values as well + 'aws' => env('AWS_ELASTICSEARCH_ENABLED', false), + 'aws_region' => env('AWS_REGION', ''), + 'aws_key' => env('AWS_ACCESS_KEY_ID', ''), + 'aws_secret' => env('AWS_SECRET_ACCESS_KEY', ''), + 'aws_credentials' => null, + 'aws_session_token' => env('AWS_SESSION_TOKEN', null), + ], ], - /* - * SSL. + /** + * SSL * * If your Elasticsearch instance uses an out-dated or self-signed SSL * certificate, you will need to pass in the certificate bundle. This can @@ -64,10 +78,11 @@ return [ * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_security.html#_ssl_encryption_2 */ + 'sslVerification' => null, - /* - * Logging. + /** + * Logging * * Logging is handled by passing in an instance of Monolog\Logger (which * coincidentally is what Laravel's default logger is). @@ -83,7 +98,8 @@ return [ * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#enabling_logger */ - 'logging' => env('ELASTICSEARCH_LOGGING', false), + + 'logging' => false, // If you have an existing instance of Monolog you can use it here. // 'logObject' => \Log::getMonolog(), @@ -92,8 +108,8 @@ return [ 'logLevel' => Monolog\Logger::INFO, - /* - * Retries. + /** + * Retries * * By default, the client will retry n times, where n = number of nodes in * your cluster. If you would like to disable retries, or change the number, @@ -101,70 +117,79 @@ return [ * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_set_retries */ + 'retries' => null, - /* + /** * The remainder of the configuration options can almost always be left * as-is unless you have specific reasons to change them. Refer to the * appropriate sections in the Elasticsearch documentation for what each option * does and what values it expects. */ - /* - * Sniff On Start. + /** + * Sniff On Start * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html */ + 'sniffOnStart' => false, - /* - * HTTP Handler. + /** + * HTTP Handler * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_configure_the_http_handler * @see http://ringphp.readthedocs.org/en/latest/client_handlers.html */ + 'httpHandler' => null, - /* - * Connection Pool. + /** + * Connection Pool * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_pool * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_connection_pool.html */ + 'connectionPool' => null, - /* - * Connection Selector. + /** + * Connection Selector * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_connection_selector * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_selectors.html */ + 'connectionSelector' => null, - /* - * Serializer. + /** + * Serializer * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_the_serializer * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_serializers.html */ + 'serializer' => null, - /* - * Connection Factory. + /** + * Connection Factory * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_setting_a_custom_connectionfactory */ + 'connectionFactory' => null, - /* - * Endpoint. + /** + * Endpoint * * @see https://www.elastic.co/guide/en/elasticsearch/client/php-api/6.0/_configuration.html#_set_the_endpoint_closure */ + 'endpoint' => null, - /* - * Register additional namespaces. + + /** + * Register additional namespaces * * An array of additional namespaces to register. * @@ -173,8 +198,8 @@ return [ */ 'namespaces' => [], - /* - * Tracer. + /** + * Tracer * * Tracer is handled by passing in a name of the class implements Psr\Log\LoggerInterface. *