Skip to content

Commit

Permalink
Merge branch '14.0' into 15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasLudvik committed Mar 4, 2024
2 parents dea16f9 + 63e21d3 commit a4d1cb5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"symfony/dependency-injection": "^5.4",
"symfony/form": "^5.4",
"symfony/http-kernel": "^5.4",
"symfony/translation": "^5.4"
"symfony/translation": "^5.4",
"twig/twig": "^3.5.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5.20",
"shopsys/coding-standards": "15.0.x-dev",
"twig/twig": "^3.5.0"
"shopsys/coding-standards": "15.0.x-dev"
},
"config": {
"allow-plugins": {
Expand Down
3 changes: 0 additions & 3 deletions ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
PhpdocToPropertyTypeFixer::class => [
__DIR__ . '/src/*',
],
DeclareStrictTypesFixer::class => [
__DIR__ . '/src/*',
],
PropertyTypeHintSniff::class => [
__DIR__ . '/src/Model/Product/GoogleProductDomain.php',
],
Expand Down

0 comments on commit a4d1cb5

Please sign in to comment.