Merge pull request #93 from Setono/allow-php74

Allow PHP 7.4

.github/workflows/build.yaml

@@ -24,7 +24,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "8.1" # Always use the lowest version of PHP since a higher version could create actual syntax errors in lower versions
+                    - "7.4" # Always use the lowest version of PHP since a higher version could create actual syntax errors in lower versions
 
                 dependencies:
                     - "highest"
@@ -68,16 +68,13 @@ jobs:
         strategy:
             matrix:
                 php-version:
+                    - "7.4"
                     - "8.1"
                     - "8.2"
 
                 dependencies:
                     - "highest"
 
-                symfony:
-                    - "^5.4"
-                    - "^6.0"
-
         steps:
             -   name: "Checkout"
                 uses: "actions/checkout@v3"
@@ -111,16 +108,13 @@ jobs:
         strategy:
             matrix:
                 php-version:
+                    - "7.4"
                     - "8.1"
                     - "8.2"
 
                 dependencies:
                     - "highest"
 
-                symfony:
-                    - "^5.4"
-                    - "^6.0"
-
         steps:
             -   name: "Checkout"
                 uses: "actions/checkout@v3"
@@ -154,16 +148,13 @@ jobs:
         strategy:
             matrix:
                 php-version:
+                    - "7.4"
                     - "8.1"
                     - "8.2"
 
                 dependencies:
                     - "highest"
 
-                symfony:
-                    - "^5.4"
-                    - "^6.0"
-
         steps:
             -   name: "Checkout"
                 uses: "actions/checkout@v3"
@@ -194,16 +185,13 @@ jobs:
         strategy:
             matrix:
                 php-version:
+                    - "7.4"
                     - "8.1"
                     - "8.2"
 
                 dependencies:
                     - "highest"
 
-                symfony:
-                    - "^5.4"
-                    - "^6.0"
-
         steps:
             -   name: "Start MySQL"
                 run: "sudo /etc/init.d/mysql start"
@@ -218,7 +206,7 @@ jobs:
                     extensions: "${{ env.PHP_EXTENSIONS }}"
                     php-version: "${{ matrix.php-version }}"
                     tools: "flex"
-                    
+
             -   name: "Install composer dependencies"
                 uses: "ramsey/composer-install@v2"
                 env:
@@ -237,7 +225,7 @@ jobs:
 
             -   name: "Validate Doctrine mapping"
                 run: "(cd tests/Application && bin/console doctrine:schema:validate)"
-                
+
     code-coverage:
         name: "Code Coverage (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }})"
 

composer.json

@@ -11,13 +11,13 @@
         "google"
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=7.4",
         "ext-json": "*",
         "doctrine/collections": "^1.8",
         "knplabs/knp-menu": "^3.3",
         "psr/event-dispatcher": "^1.0",
-        "psr/log": "^2.0 || ^3.0",
-        "setono/composite-compiler-pass": "^1.0",
+        "psr/log": "^1.1 || ^2.0 || ^3.0",
+        "setono/composite-compiler-pass": "^1.1",
         "setono/google-analytics-bundle": "^1.0@alpha",
         "setono/google-analytics-measurement-protocol": "^1.0@alpha",
         "sylius/resource-bundle": "^1.8",
@@ -35,12 +35,13 @@
         "behat/behat": "^3.12",
         "matthiasnoback/symfony-config-test": "^4.3",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
+        "php-http/message-factory": "^1.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "setono/code-quality-pack": "^2.4",
-        "sylius/sylius": "~1.12.3",
+        "sylius/sylius": "~1.10.14",
         "symfony/debug-bundle": "^5.4 || ^6.0",
         "symfony/dotenv": "^5.4 || ^6.0",
         "symfony/intl": "^5.4 || ^6.0",

ecs.php

@@ -2,14 +2,16 @@
 
 declare(strict_types=1);
 
-use Symplify\EasyCodingStandard\Config\ECSConfig;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
 
-return static function (ECSConfig $config): void {
+return static function (ContainerConfigurator $config): void {
     $config->import('vendor/sylius-labs/coding-standard/ecs.php');
-    $config->paths([
-        'src', 'tests'
+    $config->parameters()->set(Option::PATHS, [
+        'src',
+        'tests'
     ]);
-    $config->skip([
-       'tests/Application/**'
+    $config->parameters()->set(Option::SKIP, [
+        'tests/Application/**'
     ]);
 };

rector.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\DowngradeLevelSetList;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    $rectorConfig->sets([
+        DowngradeLevelSetList::DOWN_TO_PHP_74
+    ]);
+    $rectorConfig->skip([
+        'tests/Application/**'
+    ]);
+};

src/Event/ItemListViewed.php

@@ -13,12 +13,21 @@
  */
 final class ItemListViewed
 {
-    public function __construct(
-        public string $listId,
-        public string $listName,
-        /** @var list<ProductInterface> $products */
-        public array $products,
-    ) {
+    public string $listId;
+
+    public string $listName;
+
+    /** @var list<ProductInterface> */
+    public array $products;
+
+    /**
+     * @param list<ProductInterface> $products
+     */
+    public function __construct(string $listId, string $listName, array $products)
+    {
+        $this->listId = $listId;
+        $this->listName = $listName;
+        $this->products = $products;
     }
 
     /**

src/Event/ItemResolved.php

@@ -11,10 +11,17 @@
  */
 final class ItemResolved
 {
-    public function __construct(
-        public Item $item,
-        /** @var array<string, mixed> $context */
-        public array $context = [],
-    ) {
+    public Item $item;
+
+    /** @var array<string, mixed> */
+    public array $context = [];
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    public function __construct(Item $item, array $context = [])
+    {
+        $this->item = $item;
+        $this->context = $context;
     }
 }

src/EventSubscriber/AddPaymentInfoSubscriber.php

@@ -23,11 +23,15 @@ final class AddPaymentInfoSubscriber implements EventSubscriberInterface, Logger
 
     private LoggerInterface $logger;
 
-    public function __construct(
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly ItemsResolverInterface $itemsResolver,
-    ) {
+    private EventDispatcherInterface $eventDispatcher;
+
+    private ItemsResolverInterface $itemsResolver;
+
+    public function __construct(EventDispatcherInterface $eventDispatcher, ItemsResolverInterface $itemsResolver)
+    {
         $this->logger = new NullLogger();
+        $this->eventDispatcher = $eventDispatcher;
+        $this->itemsResolver = $itemsResolver;
     }
 
     public static function getSubscribedEvents(): array
@@ -44,15 +48,21 @@ public function track(ResourceControllerEvent $resourceControllerEvent): void
             $order = $resourceControllerEvent->getSubject();
             Assert::isInstanceOf($order, OrderInterface::class);
 
-            $paymentMethod = $order->getLastPayment()?->getMethod()?->getCode();
+            $lastPayment = $order->getLastPayment();
+            Assert::notNull($lastPayment);
+
+            $paymentMethod = $lastPayment->getMethod();
             Assert::notNull($paymentMethod);
 
+            $paymentMethodCode = $paymentMethod->getCode();
+            Assert::notNull($paymentMethodCode);
+
             $this->eventDispatcher->dispatch(
                 new ClientSideEvent(
                     AddPaymentInfoEvent::create()
                         ->setValue(self::formatAmount($order->getTotal()))
                         ->setCurrency($order->getCurrencyCode())
-                        ->setPaymentType($paymentMethod)
+                        ->setPaymentType($paymentMethodCode)
                         ->setItems($this->itemsResolver->resolveFromOrder($order)),
                 ),
             );

src/EventSubscriber/AddShippingInfoSubscriber.php

@@ -23,11 +23,15 @@ final class AddShippingInfoSubscriber implements EventSubscriberInterface, Logge
 
     private LoggerInterface $logger;
 
-    public function __construct(
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly ItemsResolverInterface $itemsResolver,
-    ) {
+    private EventDispatcherInterface $eventDispatcher;
+
+    private ItemsResolverInterface $itemsResolver;
+
+    public function __construct(EventDispatcherInterface $eventDispatcher, ItemsResolverInterface $itemsResolver)
+    {
         $this->logger = new NullLogger();
+        $this->eventDispatcher = $eventDispatcher;
+        $this->itemsResolver = $itemsResolver;
     }
 
     public static function getSubscribedEvents(): array
@@ -44,18 +48,23 @@ public function track(ResourceControllerEvent $resourceControllerEvent): void
             $order = $resourceControllerEvent->getSubject();
             Assert::isInstanceOf($order, OrderInterface::class);
 
-            $shippingMethod = null;
+            $shippingMethodCode = null;
             foreach ($order->getShipments() as $shipment) {
-                $shippingMethod = $shipment->getMethod()?->getCode();
+                $shippingMethod = $shipment->getMethod();
+                if (null === $shippingMethod) {
+                    continue;
+                }
+
+                $shippingMethodCode = $shippingMethod->getCode();
             }
-            Assert::notNull($shippingMethod);
+            Assert::notNull($shippingMethodCode);
 
             $this->eventDispatcher->dispatch(
                 new ClientSideEvent(
                     AddShippingInfoEvent::create()
                         ->setValue(self::formatAmount($order->getTotal()))
                         ->setCurrency($order->getCurrencyCode())
-                        ->setShippingTier($shippingMethod)
+                        ->setShippingTier($shippingMethodCode)
                         ->setItems($this->itemsResolver->resolveFromOrder($order)),
                 ),
             );

src/EventSubscriber/AddToCartSubscriber.php

@@ -25,12 +25,21 @@ final class AddToCartSubscriber implements EventSubscriberInterface, LoggerAware
 
     private LoggerInterface $logger;
 
+    private EventDispatcherInterface $eventDispatcher;
+
+    private CartContextInterface $cartContext;
+
+    private ItemResolverInterface $itemResolver;
+
     public function __construct(
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly CartContextInterface $cartContext,
-        private readonly ItemResolverInterface $itemResolver,
+        EventDispatcherInterface $eventDispatcher,
+        CartContextInterface $cartContext,
+        ItemResolverInterface $itemResolver
     ) {
         $this->logger = new NullLogger();
+        $this->eventDispatcher = $eventDispatcher;
+        $this->cartContext = $cartContext;
+        $this->itemResolver = $itemResolver;
     }
 
     public static function getSubscribedEvents(): array

src/EventSubscriber/BeginCheckoutSubscriber.php

@@ -25,12 +25,21 @@ final class BeginCheckoutSubscriber implements EventSubscriberInterface, LoggerA
 
     private LoggerInterface $logger;
 
+    private EventDispatcherInterface $eventDispatcher;
+
+    private CartContextInterface $cartContext;
+
+    private ItemsResolverInterface $itemsResolver;
+
     public function __construct(
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly CartContextInterface $cartContext,
-        private readonly ItemsResolverInterface $itemsResolver,
+        EventDispatcherInterface $eventDispatcher,
+        CartContextInterface $cartContext,
+        ItemsResolverInterface $itemsResolver
     ) {
         $this->logger = new NullLogger();
+        $this->eventDispatcher = $eventDispatcher;
+        $this->cartContext = $cartContext;
+        $this->itemsResolver = $itemsResolver;
     }
 
     public static function getSubscribedEvents(): array

src/EventSubscriber/PurchaseSubscriber.php

@@ -25,12 +25,21 @@ final class PurchaseSubscriber implements EventSubscriberInterface, LoggerAwareI
 
     private LoggerInterface $logger;
 
+    private EventDispatcherInterface $eventDispatcher;
+
+    private OrderRepositoryInterface $orderRepository;
+
+    private ItemsResolverInterface $itemsResolver;
+
     public function __construct(
-        private readonly EventDispatcherInterface $eventDispatcher,
-        private readonly OrderRepositoryInterface $orderRepository,
-        private readonly ItemsResolverInterface $itemsResolver,
+        EventDispatcherInterface $eventDispatcher,
+        OrderRepositoryInterface $orderRepository,
+        ItemsResolverInterface $itemsResolver
     ) {
         $this->logger = new NullLogger();
+        $this->eventDispatcher = $eventDispatcher;
+        $this->orderRepository = $orderRepository;
+        $this->itemsResolver = $itemsResolver;
     }
 
     public static function getSubscribedEvents(): array