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 ffa1a04 + 459e205 commit 08117ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 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/*',
],
]);

$ecsConfig->import(__DIR__ . '/vendor/shopsys/coding-standards/ecs.php', null, true);
Expand Down
2 changes: 1 addition & 1 deletion src/Model/FeedItem/LuigisBoxProductFeedItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class LuigisBoxProductFeedItem implements FeedItemInterface
{
protected const UNIQUE_IDENTIFIER_PREFIX = 'product-';
public const UNIQUE_IDENTIFIER_PREFIX = 'product-';
protected const SMALL_IMAGE_SIZE = 100;
protected const MEDIUM_IMAGE_SIZE = 200;
protected const LARGE_IMAGE_SIZE = 600;
Expand Down

0 comments on commit 08117ef

Please sign in to comment.