Skip to content

Commit

Permalink
Merge pull request #433 from Rafikooo/SYL/4028-support-sylius-1.14-beta
Browse files Browse the repository at this point in the history
[Maintenance] Support `Sylius v1.14.0-beta.1`
  • Loading branch information
GSadee authored Nov 6, 2024
2 parents ef5a7d7 + a54ddde commit 6eedd77
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
matrix:
php: ["8.1", "8.2"]
symfony: ["^5.4.21", "^6.4"]
sylius: ["~1.13.0"]
sylius: ["~1.13.0", "v1.14.0-beta.1"]
node: ["20.x"]
mysql: ["8.0"]
wkhtmltopdf: ["0.12.6-1"]
Expand Down Expand Up @@ -211,8 +211,9 @@ jobs:

-
name: Validate composer.json
run: composer validate --ansi --strict

# Restore before RefundPlugin 1.6 release
# run: composer validate --ansi --strict
run: composer validate --ansi --strict --no-check-all
-
name: Run ECS
run: vendor/bin/ecs check src/ spec/
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"myclabs/php-enum": "^1.7",
"php-http/message-factory": "^1.1",
"sylius/resource-bundle": "^1.9",
"sylius/sylius": "~1.13.0",
"sylius/sylius": "~1.13.0 || v1.14.0-beta.1",
"symfony/messenger": "^5.4.21 || ^6.4"
},
"require-dev": {
Expand Down Expand Up @@ -90,7 +90,7 @@
},
"extra": {
"branch-alias": {
"dev-1.4": "1.4-dev"
"dev-1.6": "1.6-dev"
},
"symfony": {
"require": "^5.4 || ^6.0"
Expand Down
1 change: 1 addition & 0 deletions src/Provider/RemainingTotalProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ final class RemainingTotalProvider implements RemainingTotalProviderInterface

private ?RepositoryInterface $adjustmentRepository = null;

/** @param ServiceProviderInterface<RepositoryInterface>|RepositoryInterface $refundUnitTotalProvider */
public function __construct(
private readonly ServiceProviderInterface|RepositoryInterface $refundUnitTotalProvider,
private RepositoryInterface $refundRepository,
Expand Down

0 comments on commit 6eedd77

Please sign in to comment.