Release: v1.2.0

Author: vlmed

.github/workflows/magento-ci.yml

@@ -6,8 +6,9 @@ env:
   DB_DATABASE: magento
   DB_USER: root
   DB_PASSWORD: root
-  ES_VERSION: 7.10.0
-  PHP_VERSION: 8.3
+  OS_VERSION: 2.19.0
+  PHP_VERSION: 8.4
+  COMPOSER_VERSION: 2.8.9
 
 
 on: [pull_request]
@@ -23,15 +24,15 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ env.PHP_VERSION }}
-          tools: composer
+          tools: composer:${{ env.COMPOSER_VERSION }}, symfony-cli
           extensions: mbstring, gd, bcmath, soap, dom, xml, json, tokenizer, mysql, zip, xdebug
 
       # Use composer cache
       - name: Setup - Get Composer Cache Directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -48,17 +49,17 @@ jobs:
         run: |
           sudo /etc/init.d/mysql start
           mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }}
-        # Set Up ElasticSearch
+        # Set Up OpenSearch
       - name: Setup - Configure sysctl limits
         run: |
           sudo swapoff -a
           sudo sysctl -w vm.swappiness=1
           sudo sysctl -w fs.file-max=262144
           sudo sysctl -w vm.max_map_count=262144
-      - name: Setup - ElasticSearch
-        uses: elastic/elastic-github-actions/elasticsearch@master
+      - name: Setup - OpenSearch
+        uses: ankane/setup-opensearch@v1
         with:
-          stack-version: ${{ env.ES_VERSION }}
+          opensearch-version: ${{ env.OS_VERSION }}
 
         # Install the latest Magento Open Source via composer
       - name: Setup - Install Magento Codebase
@@ -74,6 +75,12 @@ jobs:
       - name: Setup - Copy `install-config-mysql` file
         run: cp ./vendor/bloomreach/bloomreach-engagement-connector-magento/.github/config/mysql-config.php ./dev/tests/integration/etc/install-config-mysql.php
 
+      # Security checks
+      - name: "[Security Check] Composer Audit"
+        run: COMPOSER_AUDIT_ABANDONED=ignore composer audit
+      - name: "[Security Check] Security Check"
+        run: symfony check:security
+
       # Run tests
       - name: Test - Magento Coding Standart
         if: always()

Block/Adminhtml/System/Config/ModuleVersion.php

@@ -44,8 +44,8 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         ResourceInterface $moduleResource,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct(

Console/Command/AddToExportQueue.php

@@ -39,7 +39,7 @@ class AddToExportQueue extends Command
     public function __construct(
         QueueProcessor $queueProcessor,
         State $appState,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
         $this->queueProcessor = $queueProcessor;

Console/Command/StartExport.php

@@ -48,7 +48,7 @@ public function __construct(
         ExportProcessor $exportProcessor,
         State $appState,
         StartApiImportService $startApiImportService,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
         $this->exportProcessor = $exportProcessor;
@@ -80,7 +80,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 );
 
                 $output->writeln('Status: ' . $result->getStatusCode());
-                $output->writeln('Message: ' . $result->getReasonPhrase());
+
+                if ($result->getStatusCode() !== 200) {
+                    $output->writeln('Message: ' . $result->getErrorMessage());
+                } else {
+                    $output->writeln('Message: Successful');
+                }
             } catch (Exception $e) {
                 $output->writeln($e->getMessage());
                 return Cli::RETURN_FAILURE;

Exception/ExportRequestException.php

@@ -30,7 +30,7 @@ class ExportRequestException extends LocalizedException
     public function __construct(
         Phrase $phrase,
         bool $isNeedUpdateRetryCounter = true,
-        Exception $cause = null,
+        ?Exception $cause = null,
         $code = 0
     ) {
         $this->isNeedUpdateRetryCounter = $isNeedUpdateRetryCounter;

Model/Config/Backend/ValidateCatalog.php

@@ -72,8 +72,8 @@ public function __construct(
         EntityType $entityType,
         ConfigProvider $configProvider,
         LoggerInterface $logger,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->configProvider = $configProvider;

Model/DataMapping/FieldValueRenderer/OrderItem/DiscountAmount.php

@@ -40,6 +40,8 @@ public function __construct(OrderItemDiscountAmount $discountAmount)
      */
     public function render($entity, string $fieldCode)
     {
-        return $this->discountAmount->getBaseDiscountAmountPerUnit($entity);
+        return (float) $entity->getQtyOrdered() !== 0.0
+            ? $this->discountAmount->getBaseDiscountAmountPerUnit($entity)
+            : 0.0;
     }
 }

Model/DataMapping/FieldValueRenderer/OrderItem/ItemPrice.php

@@ -40,6 +40,10 @@ public function __construct(OrderItemTotalPrice $orderItemTotalPrice)
      */
     public function render($entity, string $fieldCode)
     {
+        if ((float) $entity->getQtyOrdered() === 0.0) {
+            return 0.0;
+        }
+
         return round($this->orderItemTotalPrice->getTotalPriceBaseCurrency($entity) / $entity->getQtyOrdered(), 2);
     }
 }

Model/DataMapping/FieldValueRenderer/OrderItem/ItemPriceLocalCurrency.php

@@ -40,6 +40,10 @@ public function __construct(OrderItemTotalPrice $orderItemTotalPrice)
      */
     public function render($entity, string $fieldCode)
     {
+        if ((float) $entity->getQtyOrdered() === 0.0) {
+            return 0.0;
+        }
+
         return round($this->orderItemTotalPrice->getTotalPriceLocalCurrency($entity) / $entity->getQtyOrdered(), 2);
     }
 }

Model/DataMapping/FieldValueRenderer/Product/Boolean.php

@@ -7,13 +7,16 @@
 
 namespace Bloomreach\EngagementConnector\Model\DataMapping\FieldValueRenderer\Product;
 
+use Bloomreach\EngagementConnector\Model\DataMapping\FieldValueRenderer\Product\Status as StatusRenderer;
 use Bloomreach\EngagementConnector\Model\DataMapping\FieldValueRenderer\RenderInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Api\AbstractSimpleObject;
 use Magento\Framework\Model\AbstractModel;
 
 /**
  * The class is responsible to render boolean field
+ * @deprecated
+ * @see StatusRenderer
  */
 class Boolean implements RenderInterface
 {