Merge pull request #17 from delyriand/feature/recurrence-event-shippi…

…ng-method

Add shipping method in Recurrence event object

.github/workflows/recipe.yaml

@@ -53,8 +53,8 @@ jobs:
           key: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-${{ github.sha }}
           restore-keys: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-
 
-      - name: Composer v2
-        run: sudo composer self-update --2
+      - name: Update Composer
+        run: sudo composer self-update
 
       - name: Composer Github Auth
         run: composer config -g github-oauth.github.com ${{ github.token }}
@@ -72,6 +72,7 @@ jobs:
       - name: Setup some requirements
         working-directory: ./sylius
         run: |
+            composer config --no-plugins allow-plugins true
             composer config repositories.plugin '{"type": "path", "url": "../plugin/"}'
             composer config extra.symfony.allow-contrib true
             composer config secure-http false

Makefile

@@ -71,6 +71,7 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
+	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
 	$(MAKE) apply_dist
 	(cd ${APP_DIR} && ${COMPOSER} require --no-progress monsieurbiz/${PLUGIN_NAME}="*@dev")

composer.json

@@ -69,5 +69,13 @@
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "symfony/thanks": true,
+            "symfony/flex": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "ergebnis/composer-normalize": true
+        }
     }
 }

src/Event/RecurrenceGenerationEvent.php

@@ -13,16 +13,20 @@
 
 namespace MonsieurBiz\SyliusShippingSlotPlugin\Event;
 
+use MonsieurBiz\SyliusShippingSlotPlugin\Entity\ShippingMethodInterface;
 use Recurr\Recurrence;
 use Symfony\Contracts\EventDispatcher\Event;
 
 final class RecurrenceGenerationEvent extends Event
 {
     private array $recurrences;
 
-    public function __construct(array $recurrences)
+    private ?ShippingMethodInterface $shippingMethod;
+
+    public function __construct(array $recurrences, ?ShippingMethodInterface $shippingMethod = null)
     {
         $this->recurrences = $recurrences;
+        $this->shippingMethod = $shippingMethod;
     }
 
     /**
@@ -37,4 +41,9 @@ public function setRecurrences(array $recurrences): void
     {
         $this->recurrences = $recurrences;
     }
+
+    public function getShippingMethod(): ?ShippingMethodInterface
+    {
+        return $this->shippingMethod;
+    }
 }

src/Generator/SlotGenerator.php

@@ -226,7 +226,7 @@ public function generateCalendarEvents(
             return [];
         }
         $recurrences = $shippingSlotConfig->getRecurrences($startDate, $endDate, $this->getCartPreparationDelay());
-        $event = new RecurrenceGenerationEvent($recurrences);
+        $event = new RecurrenceGenerationEvent($recurrences, $shippingMethod);
         $this->eventDispatcher->dispatch($event);
         $recurrences = $event->getRecurrences();