Merge pull request #660 from PowerSync/develop-2.4.4

Develop 2.4.4
TechNWeb · Jan 12, 2023 · dab4204 · dab4204
2 parents eb65587 + fc185c9
commit dab4204
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/Api/Service/Model/Grid/Executor/ByCollection/CreateCollectionInterface.php b/Api/Service/Model/Grid/Executor/ByCollection/CreateCollectionInterface.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © 2022 TechNWeb, Inc. All rights reserved.
+ * See TNW_LICENSE.txt for license details.
+ */
+namespace TNW\Salesforce\Api\Service\Model\Grid\Executor\ByCollection;
+use Magento\Framework\Data\Collection;
+
+/**
+ * Interface GetIdsFilteredByCustomerGroupConfigurationInterface
+ */
+interface CreateCollectionInterface
+{
+
+    /**
+     * @param array|null $entityIds
+     * @return Collection
+     */
+    public function execute(array $entityIds = null): Collection;
+}
diff --git a/Service/Model/Grid/Executor/ByCollection/CreateCollection.php b/Service/Model/Grid/Executor/ByCollection/CreateCollection.php
@@ -13,8 +13,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use TNW\Salesforce\Api\Model\Grid\GetColumnsDataItems\Executor\ByCollection\CreateCollection\ModifierInterface;
+use TNW\Salesforce\Api\Service\Model\Grid\Executor\ByCollection\CreateCollectionInterface;
 
-class CreateCollection
+class CreateCollection implements CreateCollectionInterface
 {
     /** @var string */
     private $collectionClassName;

diff --git a/Service/Model/Grid/Executor/GetColumnDataByCollection.php b/Service/Model/Grid/Executor/GetColumnDataByCollection.php
@@ -12,15 +12,15 @@
 use TNW\Salesforce\Api\ChunkSizeInterface;
 use TNW\Salesforce\Api\CleanableInstanceInterface;
 use TNW\Salesforce\Api\Model\Grid\GetColumnsDataItems\ExecutorInterface;
-use TNW\Salesforce\Service\Model\Grid\Executor\ByCollection\CreateCollection;
+use TNW\Salesforce\Api\Service\Model\Grid\Executor\ByCollection\CreateCollectionInterface;
 
 class GetColumnDataByCollection implements ExecutorInterface, CleanableInstanceInterface
 {
     public const RESULT_TYPE_INT = 1;
     public const RESULT_TYPE_STRING = 2;
     public const RESULT_TYPE_BOOLEAN = 3;
 
-    /** @var CreateCollection */
+    /** @var CreateCollectionInterface */
     private $createCollection;
 
     /** @var array */
@@ -39,12 +39,12 @@ class GetColumnDataByCollection implements ExecutorInterface, CleanableInstanceI
     private $allowNull;
 
     /**
-     * @param CreateCollection $createCollection
+     * @param CreateCollectionInterface $createCollection
      * @param string|null      $resultType
      * @param bool             $allowNull
      */
     public function __construct(
-        CreateCollection $createCollection,
+        CreateCollectionInterface $createCollection,
         string           $resultType = null,
         bool             $allowNull = true
     ) {

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "gpl-3.0"
     ],
     "type": "magento2-module",
-    "version": "2.10.8",
+    "version": "2.10.9",
     "autoload": {
         "files": [
             "registration.php"