-
-
Notifications
You must be signed in to change notification settings - Fork 893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(elasticsearch): re-introduce v7 support #6827
base: 4.1
Are you sure you want to change the base?
Conversation
79eb593
to
35160cf
Compare
@soyuka i tried to add back ES v7 support, with as less changes as possible. I commented above the code whether it involves ES v7 or v8 and up, which should make maintenance a bit easier, also when ES 7 has been declared EOL. There were still some ES7 checks in the code, so i just added comments above them. As for the phpstan errors; can I add them to the baseline? I get more errors locally than in CI, so I'm not sure if everything is setup correctly. In the Behat tests fail, they give the following error:
I'm not a Behat user; do you maybe have some thoughts how to resolve this? I added a new behat job for ES v7, it looks like these are successful. |
@soyuka any thoughts on this PR? :) |
Not many changes except namespaces, why not, could you target 4.1 and make the CI green? |
78184a0
to
e0ccf50
Compare
@soyuka Great! Ive rebased on 4.1 As for the phpstan errors; can I add them to the baseline? What would be the quickest way to do that? I get more errors locally than in CI, so I'm not sure if everything is setup correctly. In the phpstan.neon.dist keys like containerXmlPath and constantHassers are used, but those are phpstan v2 keys. Behat tests fail, they give the following error:
I'm not a Behat user; do you maybe have some thoughts how to resolve this? I added a new behat job for ES v7, it looks like these are successful. |
The 500 inside Behat is weird, I'll handle phpstan no problem. |
can you check the 500? Run the tests using |
Tests fail before they've even begun:
Edit: I was hoping something like this would do the trick: diff --git a/behat.yml.dist b/behat.yml.dist
index 371bdd03f..efa2ead67 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -104,12 +104,16 @@ elasticsearch:
- '%paths.base%/features/elasticsearch'
contexts:
- 'ApiPlatform\Tests\Behat\CommandContext'
- - 'ApiPlatform\Tests\Behat\ElasticsearchContext'
+ - 'ApiPlatform\Tests\Behat\ElasticsearchContext':
+ client: '@elasticsearch_client'
- 'ApiPlatform\Tests\Behat\JsonContext'
- 'Behat\MinkExtension\Context\MinkContext'
- 'behatch:context:rest'
filters:
tags: '@elasticsearch&&~@mercure&&~@query_parameter_validator'
+ extensions:
+ 'FriendsOfBehat\SymfonyExtension': ~
default-coverage:
suites: But then:
I'm quite lost here |
@soyuka what can I do to move this forward? :) do you know how to resolve the Behat issue? |
This PR re-introduces ES7 support, by simply introducing the v7 client namespaces.