Skip to content

Commit

Permalink
Fix CI matrix APIP versions (Sylius#17349)
Browse files Browse the repository at this point in the history
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
  • Loading branch information
GSadee authored Oct 28, 2024
2 parents dcf5284 + 27b9d23 commit c5bf799
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci_static-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ jobs:
- name: Run PHPSpec
run: vendor/bin/phpspec run --ansi --no-interaction -f dot

- name: Run ComposerRequireChecker
run: |
(cat composer.json | jq '.["autoload-dev"]["psr-4"] |= . + {"Sylius\\Behat\\": "src/Sylius/Behat/"}' | jq 'del(.autoload["psr-4"]["Sylius\\Behat\\"])') > _composer.json
mv _composer.json composer.json
composer dump-autoload
composer-require-checker check --config-file=composer-require-checker.json --ignore-parse-errors
# - name: Run ComposerRequireChecker
# run: |
# (cat composer.json | jq '.["autoload-dev"]["psr-4"] |= . + {"Sylius\\Behat\\": "src/Sylius/Behat/"}' | jq 'del(.autoload["psr-4"]["Sylius\\Behat\\"])') > _composer.json
# mv _composer.json composer.json
# composer dump-autoload
# composer-require-checker check --config-file=composer-require-checker.json --ignore-parse-errors
16 changes: 8 additions & 8 deletions .github/workflows/matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
{
"php": "8.2",
"symfony": "^6.4",
"api-platform": "^3.3"
"api-platform": "^4.0.3"
},
{
"php": "8.3",
"symfony": "^7.1",
"api-platform": "^3.3"
"api-platform": "^4.0.3"
}
]
},
Expand Down Expand Up @@ -44,21 +44,21 @@
{
"php": "8.2",
"symfony": "^6.4",
"api-platform": "^3.3",
"api-platform": "^4.0.3",
"mysql": "8.0",
"twig": "^3.3"
},
{
"php": "8.3",
"symfony": "^7.1",
"api-platform": "^3.3",
"api-platform": "^4.0.3",
"mysql": "8.4",
"twig": "^3.3"
},
{
"php": "8.3",
"symfony": "^6.4",
"api-platform": "^3.3",
"api-platform": "^4.0.3",
"mysql": "8.4",
"twig": "^3.3",
"env": "test_cached_payum"
Expand Down Expand Up @@ -103,7 +103,7 @@
"static-checks": {
"php": ["8.2", "8.3"],
"symfony": ["^6.4", "^7.1"],
"api-platform": ["^3.3"]
"api-platform": ["^4.0.3"]
},
"e2e-mariadb": {
"php": ["8.2", "8.3"],
Expand All @@ -122,14 +122,14 @@
"e2e-mysql": {
"php": ["8.2", "8.3"],
"symfony": ["^6.4", "^7.1"],
"api-platform": ["^3.3"],
"api-platform": ["^4.0.3"],
"mysql": ["8.0", "8.4"],
"twig": ["^3.3"],
"include": [
{
"php": "8.3",
"symfony": "^6.4",
"api-platform": "^2.7.10",
"api-platform": "^4.0.3",
"mysql": "8.4",
"twig": "^3.3",
"env": "test_cached_payum"
Expand Down
4 changes: 4 additions & 0 deletions tests/Model/OrderAdjustmentsRecalculationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ final class OrderAdjustmentsRecalculationTest extends TestCase

private OrderItemInterface $item;

private OrderItemUnit $unitNumberOne;

private OrderItemUnit $unitNumberTwo;

protected function setUp(): void
{
$neutralAdjustment = $this->createAdjustment(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT, -150, true);
Expand Down

0 comments on commit c5bf799

Please sign in to comment.