Skip to content

Commit 0736eae

Browse files
authored
Merge pull request #283 from BitBagCommerce/OP-551-compatibility-adjustments
OP-551: Compatibility adjustments
2 parents 9b4101f + eb4b80e commit 0736eae

24 files changed

+166
-190
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,12 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
php: [ "8.1", "8.2", "8.3" ]
26-
symfony: ["^5.4", "^6.4"]
27-
sylius: [ "~1.13.0", "~1.14.0" ]
28-
node: [ "18.x", "20.x" ]
25+
php: [ "8.2", "8.3" ]
26+
symfony: ["^6.4", "^7.1"]
27+
sylius: [ "^2.0" ]
28+
node: [ "20.x" ]
2929
mysql: ["8.0"]
3030

31-
exclude:
32-
-
33-
php: "8.3"
34-
symfony: "^5.4"
35-
sylius: "~1.13.0"
36-
3731
env:
3832
APP_ENV: test
3933
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"

composer.json

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,46 @@
44
"description": "Wishlist plugin for Sylius.",
55
"license": "MIT",
66
"require": {
7-
"php": "^8.1",
8-
"sylius/sylius": "^1.13 || ^1.14",
9-
"symfony/webpack-encore-bundle": "^1.15",
10-
"dompdf/dompdf": "^2.0"
7+
"php": "^8.2",
8+
"sylius/sylius": "^2.0",
9+
"dompdf/dompdf": "^2.0",
10+
"sylius/twig-hooks": "^0.6",
11+
"sylius/twig-extra": "^0.6",
12+
"symfony/ux-autocomplete": "^2.17",
13+
"symfony/ux-live-component": "^2.20",
14+
"symfony/ux-twig-component": "^2.20",
15+
"symfony/stimulus-bundle": "^2.12",
16+
"symfony/webpack-encore-bundle": "^2.1"
1117
},
1218
"require-dev": {
13-
"behat/behat": "^3.7",
14-
"behat/mink-selenium2-driver": "~1.6.0",
19+
"behat/behat": "^3.14",
1520
"bitbag/coding-standard": "^3.0.0",
16-
"dmore/behat-chrome-extension": "^1.3",
17-
"dmore/chrome-mink-driver": "^2.7",
18-
"gedmo/doctrine-extensions": "^3.9",
21+
"dmore/behat-chrome-extension": "^1.4",
1922
"friends-of-behat/mink": "^1.8",
2023
"friends-of-behat/mink-browserkit-driver": "^1.4",
21-
"friends-of-behat/mink-debug-extension": "^2.0",
24+
"friends-of-behat/mink-debug-extension": "^2.0.0",
2225
"friends-of-behat/mink-extension": "^2.4",
2326
"friends-of-behat/page-object-extension": "^0.3",
2427
"friends-of-behat/suite-settings-extension": "^1.0",
2528
"friends-of-behat/symfony-extension": "^2.1",
2629
"friends-of-behat/variadic-extension": "^1.3",
30+
"gedmo/doctrine-extensions": "^3.9",
31+
"league/flysystem-bundle": "^3.3",
32+
"nelmio/alice": "^3.10",
2733
"phpspec/phpspec": "^7.0",
2834
"phpunit/phpunit": "^9.5",
29-
"symfony/browser-kit": "^5.4 || ^6.0",
30-
"symfony/debug-bundle": "^5.4 || ^6.0",
31-
"symfony/dotenv": "^5.4 || ^6.0",
32-
"symfony/intl": "^5.4 || ^6.0",
33-
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
34-
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
35-
"symfony/dependency-injection": "^5.4 || ^6.0",
36-
"league/flysystem-bundle": "2.4.0",
37-
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
35+
"sylius/sylius-rector": "^2.0",
36+
"sylius-labs/coding-standard": "^4.4",
37+
"sylius-labs/suite-tags-extension": "~0.2",
38+
"symfony/browser-kit": "^6.4 || ^7.1",
39+
"symfony/debug-bundle": "^6.4 || ^7.1",
40+
"symfony/dependency-injection": "^6.4 || ^7.1",
41+
"symfony/dotenv": "^6.4 || ^7.1",
42+
"symfony/http-client": "^6.4 || ^7.1",
43+
"symfony/intl": "^6.4 || ^7.1",
44+
"symfony/web-profiler-bundle": "^6.4 || ^7.1",
3845
"lchrusciel/api-test-case": "^4.1 || ^5.0",
39-
"nelmio/alice": "^3.10"
46+
"robertfausk/behat-panther-extension": "^1.1"
4047
},
4148
"prefer-stable": true,
4249
"autoload": {
@@ -58,7 +65,8 @@
5865
"phpstan/extension-installer": true,
5966
"composer/package-versions-deprecated": true,
6067
"dealerdirect/phpcodesniffer-composer-installer": true,
61-
"symfony/thanks": true
68+
"symfony/thanks": true,
69+
"php-http/discovery": true
6270
},
6371
"preferred-install": {
6472
"sylius/sylius": "source"

src/Command/RemoveGuestWishlistsCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected function configure(): void
3030
{
3131
$this
3232
->setDescription('Removes guest wishlists')
33+
->setName(self::$defaultName)
3334
->addOption(
3435
'date',
3536
'd',

src/Command/Wishlist/WishlistTokenValueAwareInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace BitBag\SyliusWishlistPlugin\Command\Wishlist;
1313

1414
use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
15-
use Sylius\Bundle\ApiBundle\Command\CommandAwareDataTransformerInterface;
15+
//use Sylius\Bundle\ApiBundle\Command\CommandAwareDataTransformerInterface;
1616

17-
interface WishlistTokenValueAwareInterface extends CommandAwareDataTransformerInterface, WishlistSyncCommandInterface
17+
interface WishlistTokenValueAwareInterface extends /** CommandAwareDataTransformerInterface, */ WishlistSyncCommandInterface
1818
{
1919
public function getWishlist(): WishlistInterface;
2020

src/Controller/OrderItemController.php

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -24,68 +24,68 @@
2424
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
2525
use Symfony\Contracts\Translation\TranslatorInterface;
2626

27-
final class OrderItemController extends BaseController
28-
{
29-
public function addAction(Request $request): Response
30-
{
31-
$cart = $this->getCurrentCart();
32-
$configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
33-
34-
$this->isGrantedOr403($configuration, CartActions::ADD);
35-
/** @var OrderItemInterface $orderItem */
36-
$orderItem = $this->newResourceFactory->create($configuration, $this->factory);
37-
38-
$this->getQuantityModifier()->modify($orderItem, 1);
39-
40-
/** @var string $formType */
41-
$formType = $configuration->getFormType();
42-
43-
$form = $this->getFormFactory()->create(
44-
$formType,
45-
$this->createAddToCartCommand($cart, $orderItem),
46-
$configuration->getFormOptions(),
47-
);
48-
49-
$form->handleRequest($request);
50-
51-
/** @var SubmitButton $addToWishlist */
52-
$addToWishlist = $form->get('addToWishlist');
53-
54-
if ($addToWishlist->isClicked()) {
55-
/** @var AddToCartCommandInterface $addToCartCommand */
56-
$addToCartCommand = $form->getData();
57-
58-
/** @var OrderItemInterface $item */
59-
$item = $addToCartCommand->getCartItem();
60-
/** @var ?ProductVariantInterface $variant */
61-
$variant = $item->getVariant();
62-
63-
/** @var ?WishlistInterface $wishlist */
64-
$wishlist = $form->get('wishlists')->getData();
65-
66-
if (null === $variant) {
67-
throw new NotFoundHttpException('Could not find variant');
68-
}
69-
70-
if (null === $wishlist) {
71-
/** @var Session $session */
72-
$session = $request->getSession();
73-
/** @var ?TranslatorInterface $translator */
74-
$translator = $this->get('translator');
75-
76-
if (null !== $translator) {
77-
$session->getFlashBag()->add('error', $translator->trans('bitbag_sylius_wishlist_plugin.ui.go_to_wishlist_failure'));
78-
}
79-
80-
return new Response($this->generateUrl('sylius_shop_homepage'));
81-
}
82-
83-
return new Response($this->generateUrl('bitbag_sylius_wishlist_plugin_shop_locale_wishlist_add_product_variant', [
84-
'wishlistId' => $wishlist->getId(),
85-
'variantId' => $variant->getId(),
86-
]));
87-
}
88-
89-
return parent::addAction($request);
90-
}
91-
}
27+
//final class OrderItemController extends BaseController
28+
//{
29+
// public function addAction(Request $request): Response
30+
// {
31+
// $cart = $this->getCurrentCart();
32+
// $configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
33+
//
34+
// $this->isGrantedOr403($configuration, CartActions::ADD);
35+
// /** @var OrderItemInterface $orderItem */
36+
// $orderItem = $this->newResourceFactory->create($configuration, $this->factory);
37+
//
38+
// $this->getQuantityModifier()->modify($orderItem, 1);
39+
//
40+
// /** @var string $formType */
41+
// $formType = $configuration->getFormType();
42+
//
43+
// $form = $this->getFormFactory()->create(
44+
// $formType,
45+
// $this->createAddToCartCommand($cart, $orderItem),
46+
// $configuration->getFormOptions(),
47+
// );
48+
//
49+
// $form->handleRequest($request);
50+
//
51+
// /** @var SubmitButton $addToWishlist */
52+
// $addToWishlist = $form->get('addToWishlist');
53+
//
54+
// if ($addToWishlist->isClicked()) {
55+
// /** @var AddToCartCommandInterface $addToCartCommand */
56+
// $addToCartCommand = $form->getData();
57+
//
58+
// /** @var OrderItemInterface $item */
59+
// $item = $addToCartCommand->getCartItem();
60+
// /** @var ?ProductVariantInterface $variant */
61+
// $variant = $item->getVariant();
62+
//
63+
// /** @var ?WishlistInterface $wishlist */
64+
// $wishlist = $form->get('wishlists')->getData();
65+
//
66+
// if (null === $variant) {
67+
// throw new NotFoundHttpException('Could not find variant');
68+
// }
69+
//
70+
// if (null === $wishlist) {
71+
// /** @var Session $session */
72+
// $session = $request->getSession();
73+
// /** @var ?TranslatorInterface $translator */
74+
// $translator = $this->get('translator');
75+
//
76+
// if (null !== $translator) {
77+
// $session->getFlashBag()->add('error', $translator->trans('bitbag_sylius_wishlist_plugin.ui.go_to_wishlist_failure'));
78+
// }
79+
//
80+
// return new Response($this->generateUrl('sylius_shop_homepage'));
81+
// }
82+
//
83+
// return new Response($this->generateUrl('bitbag_sylius_wishlist_plugin_shop_locale_wishlist_add_product_variant', [
84+
// 'wishlistId' => $wishlist->getId(),
85+
// 'variantId' => $variant->getId(),
86+
// ]));
87+
// }
88+
//
89+
// return parent::addAction($request);
90+
// }
91+
//}

src/Resources/config/resources.yml

Whitespace-only changes.

src/Resources/config/services/event.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</service>
1515

1616
<service id="bitbag_sylius_wishlist_plugin.event_subscriber.logged_user_wishlist_subscriber" class="BitBag\SyliusWishlistPlugin\EventSubscriber\LoggedUserWishlistSubscriber">
17-
<argument type="service" id="sylius.section_resolver.uri_based_section_resolver"/>
17+
<argument type="service" id="sylius.section_resolver.uri_based"/>
1818
<argument type="service" id="bitbag_sylius_wishlist_plugin.resolver.wishlists_resolver"/>
1919
<argument type="service" id="bitbag_sylius_wishlist_plugin.manager.wishlist_product"/>
2020
<tag name="kernel.event_subscriber"/>

src/Resources/config/services/form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<service id="bitbag_sylius_wishlist_plugin.form.type.add_products_to_cart" class="BitBag\SyliusWishlistPlugin\Form\Type\AddProductsToCartType">
99
<argument type="service" id="sylius.factory.add_to_cart_command"/>
1010
<argument type="service" id="sylius.factory.order_item"/>
11-
<argument type="service" id="sylius.order_item_quantity_modifier"/>
11+
<argument type="service" id="sylius.modifier.order_item_quantity"/>
1212
<tag name="form.type"/>
1313
</service>
1414

src/Resources/config/services/message_handler.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<services>
88
<service id="bitbag_sylius_wishlist_plugin.command_handler.wishlist.add_products_to_wishlist_handler" class="BitBag\SyliusWishlistPlugin\CommandHandler\Wishlist\AddProductsToCartHandler">
9-
<argument type="service" id="sylius.order_modifier"/>
9+
<argument type="service" id="sylius.modifier.order"/>
1010
<argument type="service" id="sylius.repository.order"/>
11-
<argument type="service" id="sylius.availability_checker.default"/>
11+
<argument type="service" id="sylius.checker.inventory.availability"/>
1212
<tag name="bitbag.sylius_wishlist_plugin.command_bus" bus="sylius.command_bus"/>
1313
</service>
1414

@@ -61,10 +61,10 @@
6161
</service>
6262

6363
<service id="bitbag_sylius_wishlist_plugin.command_handler.wishlist.add_selected_products_to_cart" class="BitBag\SyliusWishlistPlugin\CommandHandler\Wishlist\AddSelectedProductsToCartHandler">
64-
<argument type="service" id="sylius.order_item_quantity_modifier"/>
65-
<argument type="service" id="sylius.order_modifier"/>
64+
<argument type="service" id="sylius.modifier.order_item_quantity"/>
65+
<argument type="service" id="sylius.modifier.order"/>
6666
<argument type="service" id="sylius.repository.order"/>
67-
<argument type="service" id="sylius.availability_checker.default"/>
67+
<argument type="service" id="sylius.checker.inventory.availability"/>
6868
<tag name="bitbag.sylius_wishlist_plugin.command_bus" bus="sylius.command_bus"/>
6969
</service>
7070

src/Voter/WishlistVoter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Sylius\Component\Core\Model\ShopUserInterface;
1616
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1717
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
18-
use Symfony\Component\Security\Core\Security;
18+
use Symfony\Bundle\SecurityBundle\Security;
1919

2020
final class WishlistVoter extends Voter
2121
{

0 commit comments

Comments
 (0)