Skip to content

Commit

Permalink
Merge pull request #50 from BitBagCommerce/hotfix/OP-131
Browse files Browse the repository at this point in the history
OP-131/Fix composer dependency
  • Loading branch information
senghe authored Apr 7, 2023
2 parents 31ef194 + b1e0f66 commit 3e64c9a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
php: [ 8.0 ]
symfony: [ ^5.4, ^6.0 ]
sylius: [ ~1.11.0, ~1.12.0 ]
node: [ 12.x ]
node: [ 14.x ]
mysql: [ 5.7, 8.0 ]

exclude:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/coding_standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.4", "8.0"]
symfony: ["^5.2"]
sylius: ["~1.10.0", "~1.11.0"]
node: ["10.x"]
mysql: ["8.0"]
php: [ 8.0]
symfony: [^5.4, ^6.0]
sylius: [~1.11.0, ~1.12.0]
node: [14.x]
mysql: [8.0]

exclude:
- sylius: ~1.11.0
php: 7.4
symfony: ^6.0

env:
APP_ENV: test
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
],
"license": "MIT",
"require": {
"php": "^7.4 || ^8.0",
"sylius/sylius": "^1.10"
"php": "^8.0",
"sylius/sylius": "^1.11 || ^1.12"
},
"require-dev": {
"behat/behat": "^3.6.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Validator/AdValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

final class AdValidator extends ConstraintValidator
{
public function validate($ad, Constraint $constraint): void
public function validate(mixed $ad, Constraint $constraint): void
{
Assert::isInstanceOf($ad, AdInterface::class);

Expand Down
2 changes: 1 addition & 1 deletion src/Validator/BannerValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

final class BannerValidator extends ConstraintValidator
{
public function validate($banner, Constraint $constraint): void
public function validate(mixed $banner, Constraint $constraint): void
{
Assert::isInstanceOf($banner, BannerInterface::class);

Expand Down

0 comments on commit 3e64c9a

Please sign in to comment.