Merge pull request #21 from BitBagCommerce/bugfix/event-return-type

Event return type fix

Author: senghe

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
             DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
@@ -72,7 +72,7 @@ jobs:
                 run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
             -   name: Cache Composer
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
@@ -96,7 +96,7 @@ jobs:
                 run: echo "::set-output name=dir::$(yarn cache dir)"
 
             -   name: Cache Yarn
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.yarn-cache.outputs.dir }}
                     key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
@@ -138,7 +138,7 @@ jobs:
                 run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
 
             -   name: Upload Behat logs
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 if: failure()
                 with:
                     name: Behat logs

spec/EventSubscriber/AgreementSubscriberSpec.php

@@ -54,13 +54,13 @@ function it_processes_successfully(
         AgreementHandler $agreementHandler,
     ): void {
         $agreementCheckedEvent->getEvent()->willReturn($formEvent);
-        $agreementCheckedEvent->getEventDataUserId()->willReturn('1');
+        $agreementCheckedEvent->getEventDataUserId()->willReturn(1);
         $formEvent->getData()->willReturn($order);
         $order->getUser()->willReturn($shopUser);
-        $shopUser->getId()->willReturn('1');
+        $shopUser->getId()->willReturn(1);
         $order->getAgreements()->willReturn($userAgreements);
         $agreementCheckedEvent->getContext()->willReturn('checkout_form');
-        $order->getId()->willReturn('1');
+        $order->getId()->willReturn(1);
 
         $agreementHandler->handleAgreements(
             $userAgreements,
@@ -82,10 +82,10 @@ function it_processes_successfully_when_order_id_is_null(
         AgreementHandler $agreementHandler,
     ): void {
         $agreementCheckedEvent->getEvent()->willReturn($formEvent);
-        $agreementCheckedEvent->getEventDataUserId()->willReturn('1');
+        $agreementCheckedEvent->getEventDataUserId()->willReturn(1);
         $formEvent->getData()->willReturn($order);
         $order->getUser()->willReturn($shopUser);
-        $shopUser->getId()->willReturn('1');
+        $shopUser->getId()->willReturn(1);
         $order->getAgreements()->willReturn($userAgreements);
         $agreementCheckedEvent->getContext()->willReturn('checkout_form');
         $order->getId()->willReturn(null);
@@ -112,10 +112,10 @@ function it_processes_successfully_when_data_is_not_instance_of_order(
         CustomerInterface $customer,
     ): void {
         $agreementCheckedEvent->getEvent()->willReturn($formEvent);
-        $agreementCheckedEvent->getEventDataUserId()->willReturn('1');
+        $agreementCheckedEvent->getEventDataUserId()->willReturn(1);
         $formEvent->getData()->willReturn($customer);
         $customer->getUser()->willReturn($shopUser);
-        $shopUser->getId()->willReturn('1');
+        $shopUser->getId()->willReturn(1);
         $customer->getAgreements()->willReturn($userAgreements);
         $agreementCheckedEvent->getContext()->willReturn('checkout_form');
         $customer->getId()->willReturn(null);

src/Event/AgreementCheckedEvent.php

@@ -38,8 +38,8 @@ public function getEvent(): FormEvent
         return $this->formEvent;
     }
 
-    public function getEventDataUserId(): ?string
+    public function getEventDataUserId(): ?int
     {
-        return $this->formEvent->getData()->getUser()->getId();
+        return $this->formEvent->getData()?->getUser()?->getId();
     }
 }