From e0d1d84915f1b2dec5a0b94af4c966fd83bbd4c1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 16 Nov 2025 06:12:11 +0000 Subject: [PATCH 1/7] Initial plan From 7881862646301a14503c3e421b191646ece8a1b8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 16 Nov 2025 06:14:28 +0000 Subject: [PATCH 2/7] Upgrade elasticsearch/elasticsearch dependency from ^7.0||^8.0 to ^8.0||^9.0 Co-authored-by: huangdijia <8337659+huangdijia@users.noreply.github.com> --- composer.json | 2 +- src/elasticsearch/composer.json | 2 +- src/sentry/composer.json | 2 +- src/telescope-elasticsearch/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3d8cc5956..4b6b1af32 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ }, "require-dev": { "aws/aws-sdk-php": "^3.235.5", - "elasticsearch/elasticsearch": "^7.0 || ^8.0", + "elasticsearch/elasticsearch": "^8.0 || ^9.0", "ergebnis/composer-normalize": "^2.43", "hashids/hashids": "^4.1 || ^5.0", "huangdijia/php-coding-standard": "^2.4", diff --git a/src/elasticsearch/composer.json b/src/elasticsearch/composer.json index 573ff8f00..d1368d6db 100644 --- a/src/elasticsearch/composer.json +++ b/src/elasticsearch/composer.json @@ -21,7 +21,7 @@ "pull-request": "https://github.com/friendsofhyperf/components/pulls" }, "require": { - "elasticsearch/elasticsearch": "^8.0", + "elasticsearch/elasticsearch": "^8.0 || ^9.0", "hyperf/config": "~3.2.0", "hyperf/context": "~3.2.0", "hyperf/guzzle": "~3.2.0" diff --git a/src/sentry/composer.json b/src/sentry/composer.json index 1e9537ac9..e971121dc 100644 --- a/src/sentry/composer.json +++ b/src/sentry/composer.json @@ -36,7 +36,7 @@ "symfony/polyfill-php85": "^1.33" }, "suggest": { - "elasticsearch/elasticsearch": "Required to use the elasticsearch client (^7.0|^8.0).", + "elasticsearch/elasticsearch": "Required to use the elasticsearch client (^8.0 || ^9.0).", "hyperf/amqp": "Required to use the amqp event (~3.2.0).", "hyperf/crontab": "Required to use the crontab event (~3.2.0).", "hyperf/database": "Required to use the crontab event (~3.2.0).", diff --git a/src/telescope-elasticsearch/composer.json b/src/telescope-elasticsearch/composer.json index a39ef27f5..730465f48 100644 --- a/src/telescope-elasticsearch/composer.json +++ b/src/telescope-elasticsearch/composer.json @@ -33,7 +33,7 @@ "hyperf/stringable": "~3.2.0" }, "suggest": { - "elasticsearch/elasticsearch": "Required to use Elasticsearch Client.(^7.17.0||^8.8.0)" + "elasticsearch/elasticsearch": "Required to use Elasticsearch Client (^8.0 || ^9.0)." }, "autoload": { "psr-4": { From a32368c6ac447daf090cb9004e57ad3dfac06d61 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 16 Nov 2025 06:19:46 +0000 Subject: [PATCH 3/7] Remove Elasticsearch v7.x support from ElasticsearchAspect Co-authored-by: huangdijia <8337659+huangdijia@users.noreply.github.com> --- .../src/Tracing/Aspect/ElasticsearchAspect.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php index 08177576a..1b6aaa323 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php @@ -22,20 +22,7 @@ class ElasticsearchAspect extends AbstractAspect { public array $classes = [ - // v7.x - 'Elasticsearch\Client::bulk', - 'Elasticsearch\Client::count', - 'Elasticsearch\Client::create', - 'Elasticsearch\Client::get', - 'Elasticsearch\Client::getSource', - 'Elasticsearch\Client::index', - 'Elasticsearch\Client::mget', - 'Elasticsearch\Client::msearch', - 'Elasticsearch\Client::scroll', - 'Elasticsearch\Client::search', - 'Elasticsearch\Client::update', - 'Elasticsearch\Client::updateByQuery', - // v8.x + // v8.x+ 'Elastic\Elasticsearch\Traits\ClientEndpointsTrait::bulk', 'Elastic\Elasticsearch\Traits\ClientEndpointsTrait::count', 'Elastic\Elasticsearch\Traits\ClientEndpointsTrait::create', From 95499ec3895c681b5e27200528127adca8b4d0de Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 16 Nov 2025 06:27:10 +0000 Subject: [PATCH 4/7] Add Elasticsearch dependency testing to test-components workflow Co-authored-by: huangdijia <8337659+huangdijia@users.noreply.github.com> --- .github/workflows/test-components.yml | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/test-components.yml b/.github/workflows/test-components.yml index e2b2dedad..b457fb874 100644 --- a/.github/workflows/test-components.yml +++ b/.github/workflows/test-components.yml @@ -140,3 +140,33 @@ jobs: run: | composer analyse src composer analyse:types + elasticsearch: + name: Test for Elasticsearch + runs-on: 'ubuntu-latest' + env: + PHP_VERSION: ${{ matrix.php-version }} + strategy: + matrix: + php-version: [ '8.4', '8.3', '8.2' ] + elasticsearch-version: [ '^9.0', '^8.0' ] + max-parallel: 10 + fail-fast: false + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + tools: phpize + extensions: redis, pdo, pdo_mysql, bcmath, swoole + ini-values: opcache.enable_cli=1 + coverage: none + - name: Setup Packages + run: | + composer require elasticsearch/elasticsearch:${{ matrix.elasticsearch-version }} --no-update + composer update -o + - name: Run Test Cases + run: | + composer analyse src + composer analyse:types From 52c18a6cb54e7862a28a45f90a6b3f74da9194dd Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Sun, 16 Nov 2025 15:55:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=20hyperf/elasti?= =?UTF-8?q?csearch=20=E4=BE=9D=E8=B5=96=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 4b6b1af32..e7720fda0 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "google/protobuf": "^3.21", "google/recaptcha": "^1.2", "guzzlehttp/uri-template": "^1.0", - "hyperf/elasticsearch": "~3.2.0", "krowinski/php-mysql-replication": "^8.0 || ^9.0", "laravel/serializable-closure": "^1.0 || ^2.0", "league/commonmark": "^1.3 || ^2.0.2", From 0f8ceeeb1242f65d78ecf6eb67d28411df76d609 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Sun, 16 Nov 2025 16:02:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Elasticsearch=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=92=8C=E5=88=86=E6=9E=90=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-components.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-components.yml b/.github/workflows/test-components.yml index b457fb874..a84f79b9e 100644 --- a/.github/workflows/test-components.yml +++ b/.github/workflows/test-components.yml @@ -168,5 +168,9 @@ jobs: composer update -o - name: Run Test Cases run: | - composer analyse src - composer analyse:types + composer analyse src/elasticsearch + composer analyse src/sentry + composer analyse src/telescope-elasticsearch + composer analyse:types types/Sentry + composer test:unit -- --group=elasticsearch + composer test:unit -- --group=sentry From 88c6a9e742886dc398d04c70bedeb299d567102c Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Sun, 16 Nov 2025 16:16:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=BB=A5=E5=88=86=E6=9E=90=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-components.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-components.yml b/.github/workflows/test-components.yml index a84f79b9e..d542b81f0 100644 --- a/.github/workflows/test-components.yml +++ b/.github/workflows/test-components.yml @@ -46,8 +46,7 @@ jobs: composer update -o - name: Run Test Cases run: | - composer analyse src - composer analyse:types + composer analyse src/trigger serializable-closure: name: Test for Laravel Serializable Closure runs-on: 'ubuntu-latest' @@ -76,8 +75,9 @@ jobs: composer update -o - name: Run Test Cases run: | - composer analyse src - composer analyse:types + composer analyse src/support + composer analyse:types types/Support + composer test:unit -- tests/Support/DispatchTest.php carbon: name: Test for Nesbot Carbon runs-on: 'ubuntu-latest'