fix(compatibility): [PCMT-1080] Fix Shopware 6.7 compatibility issues (Vue 3, Entity, DBAL, State Management, Payment Methods)

src/Entity/Lengow/Action/ActionEntity.php

@@ -52,14 +52,14 @@ class ActionEntity extends Entity
     protected $state;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $updatedAt;
+    protected ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @return ShopwareOrderEntity

src/Entity/Lengow/Order/OrderEntity.php

@@ -163,14 +163,14 @@ class OrderEntity extends Entity
     protected $message;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $updatedAt;
+    protected ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @var DateTimeInterface|null

src/Entity/Lengow/OrderError/OrderErrorEntity.php

@@ -42,14 +42,14 @@ class OrderErrorEntity extends Entity
     protected $mail;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $updatedAt;
+    protected ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @return LengowOrderEntity

src/Entity/Lengow/OrderLine/OrderLineEntity.php

@@ -33,14 +33,14 @@ class OrderLineEntity extends Entity
     protected $orderLineId;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
-     * @var DateTimeInterface|null
+     * @var \DateTimeInterface|null
      */
-    protected $updatedAt;
+    protected ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @return ShopwareOrderEntity

src/Entity/Lengow/Product/ProductEntity.php

@@ -26,9 +26,9 @@ class ProductEntity extends Entity
     protected $salesChannel;
 
     /**
-     * @var DateTimeInterface
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
      * @return string
@@ -63,17 +63,17 @@ public function setSalesChannel(ShopwareSalesChannelEntity $salesChannel): void
     }
 
     /**
-     * @return DateTimeInterface
+     * @return \DateTimeInterface|null
      */
-    public function getCreatedAt(): DateTimeInterface
+    public function getCreatedAt(): ?DateTimeInterface
     {
         return $this->createdAt;
     }
 
     /**
-     * @param DateTimeInterface $createdAt
+     * @param \DateTimeInterface|null $createdAt
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): void
+    public function setCreatedAt(?DateTimeInterface $createdAt): void
     {
         $this->createdAt = $createdAt;
     }

src/Entity/Lengow/Settings/SettingsEntity.php

@@ -32,14 +32,14 @@ class SettingsEntity extends Entity
     protected $value;
 
     /**
-     * @var DateTimeInterface
+     * @var \DateTimeInterface|null
      */
-    protected $createdAt;
+    protected ?\DateTimeInterface $createdAt = null;
 
     /**
-     * @var DateTimeInterface
+     * @var \DateTimeInterface|null
      */
-    protected $updatedAt;
+    protected ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @return ShopwareSalesChannelEntity|null
@@ -90,33 +90,33 @@ public function setValue(?string $value): void
     }
 
     /**
-     * @return DateTimeInterface
+     * @return \DateTimeInterface|null
      */
-    public function getCreatedAt(): DateTimeInterface
+    public function getCreatedAt(): ?DateTimeInterface
     {
         return $this->createdAt;
     }
 
     /**
-     * @param DateTimeInterface $createdAt
+     * @param \DateTimeInterface|null $createdAt
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): void
+    public function setCreatedAt(?DateTimeInterface $createdAt): void
     {
         $this->createdAt = $createdAt;
     }
 
     /**
-     * @return DateTimeInterface
+     * @return \DateTimeInterface|null
      */
-    public function getUpdatedAt(): DateTimeInterface
+    public function getUpdatedAt(): ?DateTimeInterface
     {
         return $this->updatedAt;
     }
 
     /**
-     * @param DateTimeInterface $updatedAt
+     * @param \DateTimeInterface|null $updatedAt
      */
-    public function setUpdatedAt(DateTimeInterface $updatedAt): void
+    public function setUpdatedAt(?DateTimeInterface $updatedAt): void
     {
         $this->updatedAt = $updatedAt;
     }

src/EntityExtension/Extension/ProductExtension.php

@@ -31,4 +31,12 @@ public function getDefinitionClass(): string
     {
         return ProductDefinition::class;
     }
+
+    /**
+     * @return string
+     */
+    public function getEntityName(): string
+    {
+        return 'product';
+    }
 }

src/LengowConnector.php

@@ -70,9 +70,9 @@ public function uninstall(UninstallContext $uninstallContext): void
         if (!$uninstallContext->keepUserData()) {
             $connection = $this->container->get(Connection::class);
 
-            $connection->executeUpdate('DROP TABLE IF EXISTS `lengow_order`, `lengow_order_line`, `lengow_order_error`, `lengow_action`, `lengow_settings`, `lengow_product`;');
+            $connection->executeStatement('DROP TABLE IF EXISTS `lengow_order`, `lengow_order_line`, `lengow_order_error`, `lengow_action`, `lengow_settings`, `lengow_product`;');
 
-            $connection->executeUpdate('
+            $connection->executeStatement('
             DELETE FROM state_machine_transition 
             WHERE to_state_id = (
                 SELECT id FROM state_machine_state WHERE technical_name = "lengow_technical_error"
@@ -81,7 +81,7 @@ public function uninstall(UninstallContext $uninstallContext): void
             );
         ');
 
-            $connection->executeUpdate('
+            $connection->executeStatement('
             DELETE FROM state_machine_state 
             WHERE technical_name = "lengow_technical_error";
         ');
@@ -106,6 +106,7 @@ private function addPaymentMethod(Context $context): void
             // payment handler will be selected by the identifier
             'handlerIdentifier' => LengowPayment::class,
             'name' => 'Lengow payment',
+            'technicalName' => 'lengow_payment',
             'description' => 'Lengow payment, DO NOT activate NOR delete',
             'pluginId' => $pluginId,
             'afterOrderEnabled' => false,

src/Migration/Migration1606313662Init.php

@@ -21,7 +21,7 @@ public function update(Connection $connection): void
          * order (FK order_id)
          * sales_channel (FK sales_channel_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_order` (
                 `id`                   BINARY(16)    NOT NULL,
                 `order_id`             BINARY(16)    NULL DEFAULT NULL,
@@ -73,7 +73,7 @@ public function update(Connection $connection): void
          * order (FK order_id)
          * product (FK product_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_order_line` (
                 `id`            BINARY(16)   NOT NULL,
                 `order_id`      BINARY(16)   NOT NULL,
@@ -91,7 +91,7 @@ public function update(Connection $connection): void
          * this table reference another lengow table :
          * lengow_order (FK lengow_order_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_order_error` (
                 `id`              BINARY(16)  NOT NULL,
                 `lengow_order_id` BINARY(16)  NOT NULL,
@@ -111,7 +111,7 @@ public function update(Connection $connection): void
          * this table reference 1 shopware base table :
          * order (FK order_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_action` (
                 `id`             BINARY(16)   NOT NULL,
                 `order_id`       BINARY(16)   NOT NULL,
@@ -133,7 +133,7 @@ public function update(Connection $connection): void
          * this table reference 1 shopware base table :
          * sales_channel (FK sales_channel_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_settings` (
                 `id`               BINARY(16)   NOT NULL,
                 `sales_channel_id` BINARY(16)   NULL DEFAULT NULL,
@@ -153,7 +153,7 @@ public function update(Connection $connection): void
          * product (FK product_id)
          * sales_channel (FK sales_channel_id)
          */
-        $connection->executeUpdate('
+        $connection->executeStatement('
             CREATE TABLE IF NOT EXISTS `lengow_product` (
                 `id`               BINARY(16)  NOT NULL,
                 `product_id`       BINARY(16)  NOT NULL,
@@ -171,7 +171,7 @@ public function update(Connection $connection): void
          * order state are linked to state_machine (order.state here)
          */
         $StateUuid = Uuid::randomHex(); // Generate new uuid for insert
-        $connection->executeUpdate('
+        $connection->executeStatement('
             INSERT IGNORE INTO state_machine_state VALUES (
                 UNHEX("' . $StateUuid . '"),
                 "lengow_technical_error",
@@ -197,7 +197,7 @@ public function update(Connection $connection): void
              */
             $uuid = Uuid::randomHex(); // Generate new uuid for insert
             $availableStateUuid = Uuid::fromBytesToHex($state['id']);
-            $connection->executeUpdate('
+            $connection->executeStatement('
                 INSERT IGNORE INTO state_machine_transition VALUES (
                     UNHEX("' . $uuid . '"),
                     "technical_error",
@@ -219,7 +219,7 @@ public function update(Connection $connection): void
             ');
         }
         $uuid = Uuid::randomHex(); // Generate new uuid for insert
-        $connection->executeUpdate('
+        $connection->executeStatement('
             INSERT IGNORE INTO state_machine_transition VALUES (
                 UNHEX("' . $uuid . '"),
                 "cancel_technical_error",
@@ -252,7 +252,7 @@ public function update(Connection $connection): void
         foreach ($languageAvailable as $language) {
             $languageId = Uuid::fromBytesToHex($language['id']);
             if ($languageId) {
-                $connection->executeUpdate('
+                $connection->executeStatement('
                     INSERT IGNORE INTO state_machine_state_translation VALUES (
                         UNHEX("' . $languageId . '"),
                         (
@@ -272,7 +272,7 @@ public function update(Connection $connection): void
 
     public function updateDestructive(Connection $connection): void
     {
-        $connection->executeUpdate('
+        $connection->executeStatement('
             DROP TABLE IF EXISTS
             `lengow_settings`,
             `lengow_product`,

src/Migration/Migration1624606589Update102.php

@@ -15,7 +15,7 @@ public function getCreationTimestamp(): int
     public function update(Connection $connection): void
     {
         // modifying the value field to be able to store JSON data
-        $connection->executeUpdate('ALTER TABLE `lengow_settings` CHANGE `value` `value` TEXT NULL DEFAULT NULL');
+        $connection->executeStatement('ALTER TABLE `lengow_settings` CHANGE `value` `value` TEXT NULL DEFAULT NULL');
     }
 
     public function updateDestructive(Connection $connection): void

src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-button/lgw-action-button.html.twig

@@ -1,21 +1,19 @@
 {% block lgw_action_button %}
-    <template>
-        <div class="lgw-action-button">
-            <sw-button v-show="!isLoading"
-                       @click="clickButton(buttonAction)"
-                       size="x-small"
-                       class="lgw-action-tooltip">
-                {{ buttonContent }}
-                <span>
-                    {{ tooltipTitle }}
-                    <ul>
-                        <li v-for="error in errors">
-                            {{ error }}
-                        </li>
-                    </ul>
-                </span>
-            </sw-button>
-            <sw-loader v-show="isLoading" size="14px"></sw-loader>
-        </div>
-    </template>
+    <div class="lgw-action-button">
+        <sw-button v-show="!isLoading"
+                   @click="clickButton(buttonAction)"
+                   size="x-small"
+                   class="lgw-action-tooltip">
+            {{ buttonContent }}
+            <span>
+                {{ tooltipTitle }}
+                <ul>
+                    <li v-for="error in errors">
+                        {{ error }}
+                    </li>
+                </ul>
+            </span>
+        </sw-button>
+        <sw-loader v-show="isLoading" size="14px"></sw-loader>
+    </div>
 {% endblock %}

src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-label/lgw-action-label.html.twig

@@ -1,10 +1,8 @@
 {% block lgw_action_label %}
-    <template>
-        <div class="lgw-action-label">
-            <span v-show="hasActiveAction && !isLoading" :title="labelTitle">
-                {{ labelContent }}
-            </span>
-            <sw-loader v-show="isLoading" size="14px"></sw-loader>
-        </div>
-    </template>
+    <div class="lgw-action-label">
+        <span v-show="hasActiveAction && !isLoading" :title="labelTitle">
+            {{ labelContent }}
+        </span>
+        <sw-loader v-show="isLoading" size="14px"></sw-loader>
+    </div>
 {% endblock %}