Merge branch 'develop'

mageplaza · Oct 26, 2020 · 56e05f1 · 56e05f1
2 parents 1f62b8b + 3194abc
commit 56e05f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Model/Resolver/Brands/FilterArgument/EntityAttributesForAst.php b/Model/Resolver/Brands/FilterArgument/EntityAttributesForAst.php
@@ -23,6 +23,7 @@
 namespace Mageplaza\ShopbybrandGraphQl\Model\Resolver\Brands\FilterArgument;
 
 use Magento\Framework\GraphQl\Query\Resolver\Argument\FieldEntityAttributesInterface;
+use Mageplaza\Shopbybrand\Helper\Data;
 
 /**
  * Class EntityAttributesForAst
@@ -41,14 +42,22 @@ class EntityAttributesForAst implements FieldEntityAttributesInterface
         'tdv.value',
         'tdv.default_value'
     ];
+    /**
+     * @var Data
+     */
+    protected $helperData;
 
     /**
      * EntityAttributesForAst constructor.
      *
+     * @param Data $helperData
      * @param array $additionalAttributes
      */
-    public function __construct(array $additionalAttributes = [])
-    {
+    public function __construct(
+        Data $helperData,
+        array $additionalAttributes = []
+    ) {
+        $this->helperData = $helperData;
         $this->additionalAttributes = array_merge($this->additionalAttributes, $additionalAttributes);
     }
 
@@ -62,6 +71,10 @@ public function getEntityAttributes(): array
             $fields[$attribute] = 'String';
         }
 
+        if ($this->helperData->versionCompare('2.3.4')) {
+            return $fields;
+        }
+
         return array_keys($fields);
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "mageplaza/module-shop-by-brand-graphql",
   "description": "Magento 2 Shop By Brand GraphQl Extension",
   "type": "magento2-module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "license": "proprietary",
   "authors": [
     {