kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[UPMERGE] 2.1 -> 2.2 (#18890)

Browse source 
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/2.3/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.2 -m "Resolve conflicts between 2.1 and 2.2"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This commit is contained in:
Kamil Grygierzec 2026-03-06 08:42:42 +01:00 • committed by GitHub
commit ee5eacb355
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Sylius/Behat/Context/Api/Admin/ManagingPromotionCouponsContext.php
View file

@ -173,7 +173,9 @@ final readonly class ManagingPromotionCouponsContext implements Context
*/
public function iSpecifyTheirCodeLengthAs(?int $codeLength = null): void
{
$this->client->updateRequestData(['codeLength' => $codeLength]);
if (null !== $codeLength) {
$this->client->updateRequestData(['codeLength' => $codeLength]);
}
}
/**

4
tests/Api/Responses/shop/payment_request/post_payment_request_without_required_data.json
View file

@ -2,9 +2,9 @@
"@context": "\/api\/v2\/contexts\/Error",
"@id": "\/api\/v2\/errors\/422",
"@type": "hydra:Error",
"detail": "Request does not have the following required fields specified: paymentMethodCode.",
"detail": "Request does not have the following required fields specified: paymentId, paymentMethodCode.",
"status": 422,
"type": "\/errors\/422",
"hydra:description": "Request does not have the following required fields specified: paymentMethodCode.",
"hydra:description": "Request does not have the following required fields specified: paymentId, paymentMethodCode.",
"hydra:title": "An error occurred"
}