OP-558 - update plugin to Sylius 2, update composer.json, yaml files …

…and bundles, fix errors
BitBagCommerce · Jan 9, 2025 · bdac93e · bdac93e
1 parent 010a1fa
commit bdac93e
Showing 9 changed files with 47 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -6,18 +6,19 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "~2.0",
+        "dompdf/dompdf": "^2.0",
         "sylius-labs/polyfill-symfony-security": "^1.1",
         "sylius/calendar": "^0.5.0",
         "sylius/grid-bundle": "^1.13.0",
-        "dompdf/dompdf": "^2.0",
-        "sylius/twig-hooks": "^0.5",
+        "sylius/sylius": "~2.0",
         "sylius/twig-extra": "^0.5",
+        "sylius/twig-hooks": "^0.5",
+        "symfony/stimulus-bundle": "^2.12",
         "symfony/ux-autocomplete": "^2.17",
         "symfony/ux-live-component": "^2.20",
         "symfony/ux-twig-component": "^2.20",
         "symfony/webpack-encore-bundle": "^2.1",
-        "symfony/stimulus-bundle": "^2.12",
+        "symfony/workflow": "^7.2",
         "willdurand/hateoas-bundle": "2.5.0"
     },
     "require-dev": {

diff --git a/config/services/state_resolver/customer.xml b/config/services/state_resolver/customer.xml
@@ -7,8 +7,8 @@
 >
     <services>
         <service id="bitbag.sylius_blacklist_plugin.state_resolver.customer" class="BitBag\SyliusBlacklistPlugin\StateResolver\CustomerStateResolver">
-            <argument type="service" id="sm.factory" />
-            <argument type="service" id="sylius.manager.customer" />
+<!--            <argument type="service" id="sm.factory" />-->
+<!--            <argument type="service" id="sylius.manager.customer" />-->
         </service>
     </services>
 </container>
diff --git a/config/state_machine/customer.yaml b/config/state_machine/customer.yaml
@@ -1,4 +1,23 @@
-#winzou_state_machine:
+#framework:
+#    workflows:
+#        bitbag_sylius_blacklist_plugin_customer_state_machine:
+#            type: state_machine
+#            marking_store:
+#                type: method
+#                property: getMarking # Metoda w Twojej encji odpowiedzialna za przechowywanie stanu
+#            supports:
+#                - App\Entity\Customer
+#            places:
+#                - active
+#                - inactive
+#            transitions:
+#                deactivate:
+#                    from: active
+#                    to: inactive
+#                activate:
+#                    from: inactive
+#                    to: active
+
 #    bitbag_sylius_blacklist_plugin_customer:
 #        class: "%sylius.model.customer.class%"
 #        property_path: fraudStatus

diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -67,4 +67,5 @@
     Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
     Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true],
     Symfony\UX\Icons\UXIconsBundle::class => ['all' => true],
+    Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true],
 ];
diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
@@ -14,6 +14,9 @@ sylius_shop:
     product_grid:
         include_all_descendants: true
 
+sylius_state_machine_abstraction:
+    default_adapter: symfony_workflow
+
 sylius_grid:
     grids:
         sylius_admin_customer:

diff --git a/tests/Application/config/packages/http_discovery.yaml b/tests/Application/config/packages/http_discovery.yaml
@@ -0,0 +1,10 @@
+services:
+  Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory'
+  Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory'
+  Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory'
+  Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory'
+  Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory'
+  Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory'
+
+  http_discovery.psr17_factory:
+    class: Http\Discovery\Psr17Factory
diff --git a/tests/Application/config/routes/sylius_api.yaml b/tests/Application/config/routes/sylius_api.yaml
@@ -1,3 +1,3 @@
 sylius_api:
     resource: "@SyliusApiBundle/Resources/config/routing.yml"
-    prefix: "%sylius.security.new_api_route%"
+    prefix: "%sylius.security.api_route%"
diff --git a/tests/Application/config/routes/sylius_shop.yaml b/tests/Application/config/routes/sylius_shop.yaml
@@ -4,8 +4,8 @@ sylius_shop:
     requirements:
         _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
 
-sylius_shop_payum:
-    resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
+#sylius_shop_payum:
+#    resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
 
 sylius_shop_default_locale:
     path: /

diff --git a/tests/Application/config/sylius/2.0/packages/_sylius.yaml b/tests/Application/config/sylius/2.0/packages/_sylius.yaml
@@ -3,8 +3,9 @@ parameters:
   test_sylius_state_machine_adapter: '%env(string:default:test_default_state_machine_adapter:TEST_SYLIUS_STATE_MACHINE_ADAPTER)%'
 
 sylius_state_machine_abstraction:
-  graphs_to_adapters_mapping:
-    sylius_refund_refund_payment: '%test_sylius_state_machine_adapter%'
+  default_adapter: symfony_workflow
+#  graphs_to_adapters_mapping:
+#    sylius_refund_refund_payment: '%test_sylius_state_machine_adapter%'
 
 sylius_api:
   enabled: true