Merge branch 'feature/v2-update' of github.com:justbetter/magento2-akeneo-bundle into feature/v2-update

Author: claudio-ferraro

.github/workflows/analyse.yml

@@ -49,22 +49,17 @@ jobs:
         run: composer analyse
 
   phpcs:
-    name: Code Style (PHP ${{ matrix.php-version }})
+    name: Code Style
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['8.2', '8.3']
-    
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: '8.2'
           extensions: bcmath, ctype, curl, dom, gd, hash, iconv, intl, mbstring, openssl, pdo_mysql, simplexml, soap, xsl, zip
           coverage: none
 
@@ -76,8 +71,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-php${{ matrix.php-version }}-composer-
+          key: ${{ runner.os }}-php-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-php-composer-
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-interaction

Job/RunSlackMessage.php

@@ -43,7 +43,7 @@ protected function getLogs(): Log\Collection
 
         return $this->logCollection
             ->addFieldToFilter('created_at', ['gteq' => date('Y-m-d')])
-            ->addFieldToFilter('created_at', ['lt' => date('Y-m-d', $tomorrow !== false ? $tomorrow : time() + 86400)]);
+            ->addFieldToFilter('created_at', ['lt' => date('Y-m-d', $tomorrow !== false ? $tomorrow : strtotime('tomorrow'))]);
     }
 
     protected function getLogsByStatus(int $status): Log\Collection

README.md

@@ -1,7 +1,7 @@
 <a href="https://github.com/justbetter/magento2-akeneo-bundle" title="JustBetter Magento 2 Akeneo Bundle">
     <img src="./.github/assets/banner.svg" alt="JustBetter Magento 2 Akeneo Bundle - Essential features the Akeneo Connector is missing">
 </a>
-<h1>JustBeter - Magento 2 Akeneo Bundle</h1>
+<h1>JustBetter - Magento 2 Akeneo Bundle</h1>
 <a id="readme-top"></a>
 
 [![Latest Version on Packagist][packagist-version-shield]][packagist-version-url]
@@ -18,7 +18,7 @@
     <img src="https://raw.githubusercontent.com/justbetter/art/master/justbetter-logo.png" alt="JustBetter Logo" width="200">
   </a>
 
-  <h3 align="center">JustBeter - Magento 2 Akeneo Bundle</h3>
+  <h3 align="center">JustBetter - Magento 2 Akeneo Bundle</h3>
 
   <p align="center">
     Extends the official <a href="https://github.com/akeneo/magento2-connector-community">Akeneo Connector</a> with several features and optimizations.

Service/SetTaxClassId.php

@@ -66,18 +66,15 @@ public function execute(string $code): void
         $connection = $this->entitiesHelper->getConnection();
 
         foreach ($taxColumns as $taxIdColumn) {
-            try {
-                $taxQuery = $this->createQuery($taxIdColumn, $tmpTable);
-                $connection->query($taxQuery);
-            } catch (Exception $e) {
-                throw $e;
-            }
+            $taxQuery = $this->createQuery($taxIdColumn, $tmpTable);
+            $connection->query($taxQuery);
         }
     }
 
     protected function createQuery(string $taxIdColumn, string $tableName): string
     {
-        $query = "UPDATE `" . $tableName . "` SET `" . $taxIdColumn . "` = ";
+        $connection = $this->entitiesHelper->getConnection();
+        $query = "UPDATE " . $connection->quoteIdentifier($tableName) . " SET " . $connection->quoteIdentifier($taxIdColumn) . " = ";
 
         return $this->addCase($query, $taxIdColumn);
     }
@@ -93,13 +90,14 @@ protected function addCase(string $query, string $taxIdColumn): string
             return $query;
         }
 
+        $connection = $this->entitiesHelper->getConnection();
         $query .= "CASE ";
 
         foreach ($unserializedMappings as $mapping) {
             if (!is_array($mapping)) {
                 continue;
             }
-            $query .= "WHEN `" . $taxIdColumn . "` = '" . $mapping['akeneo'] . "' then '" . $mapping['magento'] . "' ";
+            $query .= "WHEN " . $connection->quoteIdentifier($taxIdColumn) . " = " . $connection->quote($mapping['akeneo']) . " THEN " . $connection->quote($mapping['magento']) . " ";
         }
 
         $query .= 'END';