Load winzou config conditionally

.github/workflows/build.yml

@@ -25,7 +25,25 @@ jobs:
  node: ["20.x"]
  mysql: ["8.4"]
  wkhtmltopdf: ["0.12.6-1", false]
- state_machine_adapter: [ "winzou_state_machine", "symfony_workflow" ]
+ state_machine_adapter: [ "symfony_workflow" ]
+
+ include:
+ -
+ php: "8.3"
+ symfony: "^7.1"
+ sylius: "2.0.x-dev"
+ node: "20.x"
+ mysql: "8.4"
+ wkhtmltopdf: "0.12.6-1"
+ state_machine_adapter: "winzou_state_machine"
+ -
+ php: "8.3"
+ symfony: "^7.1"
+ sylius: "2.0.x-dev"
+ node: "20.x"
+ mysql: "8.4"
+ wkhtmltopdf: false
+ state_machine_adapter: "winzou_state_machine"
 
  env:
  APP_ENV: test
@@ -84,7 +102,6 @@ jobs:
  if: matrix.wkhtmltopdf == false
  run: |
  mv tests/Application/etc/sylius_invoicing_pdf_generation_disabled.yaml tests/Application/config/packages
- sed -i 's/pdf_generation_disabled/pdf_generation_enabled/g' behat.yml.dist
 
  -
  name: Get Composer cache directory
@@ -117,6 +134,13 @@ jobs:
  name: Install PHP dependencies
  run: composer install --no-interaction --no-scripts
 
+ -
+ name: Require Winzou State Machine
+ if: "${{ matrix.state_machine_adapter == 'winzou_state_machine' }}"
+ run: |
+ composer require winzou/state-machine:^0.4 --no-update 
+ composer require winzou/state-machine-bundle:^0.6 --no-update 
+
  -
  name: Get Yarn cache directory
  id: yarn-cache

src/Resources/config/app/winzou_state_machine.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use winzou\Bundle\StateMachineBundle\winzouStateMachineBundle;
+
+return static function (ContainerConfigurator $container) {
+ if (class_exists(winzouStateMachineBundle::class)) {
+ $container->extension('winzou_state_machine', [
+ 'sylius_payment' => [
+ 'callbacks' => [
+ 'after' => [
+ 'sylius_invoicing_plugin_payment_complete_producer' => [
+ 'on' => ['complete'],
+ 'do' => ['@sylius_invoicing_plugin.event_producer.order_payment_paid', '__invoke'],
+ 'args' => ['object'],
+ ],
+ ],
+ ],
+ ],
+ ]);
+ }
+};

src/Resources/config/config.yml

@@ -1,4 +1,5 @@
 imports:
+ - { resource: "@SyliusInvoicingPlugin/Resources/config/app/winzou_state_machine.php" }
  - { resource: 'app/twig_hooks/**/*.yaml' }
 
 parameters:
@@ -20,15 +21,6 @@ knp_snappy:
  pdf:
  enabled: true
 
-winzou_state_machine:
- sylius_payment:
- callbacks:
- after:
- sylius_invoicing_plugin_payment_complete_producer:
- on: ['complete']
- do: ['@sylius_invoicing_plugin.event_producer.order_payment_paid', '__invoke']
- args: ['object']
-
 sylius_grid:
  templates:
  filter:

tests/Application/config/bundles.php

@@ -29,7 +29,6 @@
  Sylius\Bundle\CoreBundle\SyliusCoreBundle::class => ['all' => true],
  Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
  Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
- winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
  Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true],
  Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true],
  Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],

tests/Behat/Context/Order/OrderContext.php

@@ -6,20 +6,14 @@
 
 use Behat\Behat\Context\Context;
 use Doctrine\Persistence\ObjectManager;
-use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
+use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Payment\PaymentTransitions;
 
 final class OrderContext implements Context
 {
- private ObjectManager $objectManager;
-
- private StateMachineFactoryInterface $stateMachineFactory;
-
- public function __construct(ObjectManager $objectManager, StateMachineFactoryInterface $stateMachineFactory)
+ public function __construct(private ObjectManager $objectManager, private StateMachineInterface $stateMachine)
  {
- $this->objectManager = $objectManager;
- $this->stateMachineFactory = $stateMachineFactory;
  }
 
  /**
@@ -35,7 +29,7 @@ public function orderHasJustBeenPaid(OrderInterface $order): void
  private function applyPaymentTransitionOnOrder(OrderInterface $order, $transition): void
  {
  foreach ($order->getPayments() as $payment) {
- $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH)->apply($transition);
+ $this->stateMachine->apply($payment, PaymentTransitions::GRAPH, $transition);
  }
  }
 }

tests/Behat/Resources/services.xml

@@ -42,7 +42,7 @@
 
  <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Order\OrderContext" public="true">
  <argument type="service" id="doctrine.orm.entity_manager" />
- <argument type="service" id="sm.factory" />
+ <argument type="service" id="sylius_abstraction.state_machine" />
  </service>
 
  <service id="Tests\Sylius\InvoicingPlugin\Behat\Context\Ui\Admin\ManagingChannelsContext" public="true">