From efd713d327c383e41eb397d9cef9472220533dac Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 19:59:39 +0100
Subject: [PATCH 1/9] Add is Saleable special attribute and modify IsInStock to
 only return products with qty

---
 .../Product/SpecialAttribute/IsInStock.php    |  32 ++++-
 .../Product/SpecialAttribute/IsSaleable.php   | 128 ++++++++++++++++++
 .../etc/di.xml                                |   1 +
 .../etc/elasticsuite_indices.xml              |   1 +
 4 files changed, 157 insertions(+), 5 deletions(-)
 create mode 100644 src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index 12b0c1e06..b07dfc8ec 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -13,8 +13,11 @@
  */
 namespace Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute;
 
+use Magento\Config\Model\Config\Source\Yesno;
 use Smile\ElasticsuiteCatalogRule\Api\Rule\Condition\Product\SpecialAttributeInterface;
 use Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product as ProductCondition;
+use Smile\ElasticsuiteCore\Search\Request\QueryInterface;
+use Smile\ElasticsuiteCore\Search\Request\Query\QueryFactory;
 
 /**
  * Special "is_in_stock" attribute class.
@@ -26,18 +29,26 @@
 class IsInStock implements SpecialAttributeInterface
 {
     /**
-     * @var \Magento\Config\Model\Config\Source\Yesno
+     * @var Yesno
      */
     private $booleanSource;
+    /**
+     * @var QueryFactory
+     */
+    private QueryFactory $queryFactory;
 
     /**
      * IsInStock constructor.
      *
-     * @param \Magento\Config\Model\Config\Source\Yesno $booleanSource Boolean Source
+     * @param Yesno $booleanSource Boolean Source
      */
-    public function __construct(\Magento\Config\Model\Config\Source\Yesno $booleanSource)
+    public function __construct(
+        Yesno $booleanSource,
+        QueryFactory $queryFactory
+    )
     {
         $this->booleanSource = $booleanSource;
+        $this->queryFactory   = $queryFactory;
     }
 
     /**
@@ -54,8 +65,19 @@ public function getAttributeCode()
      */
     public function getSearchQuery(ProductCondition $condition)
     {
-        // Query can be computed directly with the attribute code and value. (stock.is_in_stock = true).
-        return null;
+        $queryParams = [];
+
+        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_RANGE, [
+            'bounds' => ['gt' => (float) 0], 'field' => 'stock.qty'
+        ]);
+
+        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_TERM, [
+            'value' => true, 'field' => 'stock.is_in_stock'
+        ]);
+
+        return $this->queryFactory->create(QueryInterface::TYPE_BOOL, [
+            'must' => $queryParams
+        ]);
     }
 
     /**
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
new file mode 100644
index 000000000..2e745ab5b
--- /dev/null
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Smile ElasticSuite to newer
+ * versions in the future.
+ *
+ * @category  Smile
+ * @package   Smile\ElasticsuiteCatalogRule
+ * @author    Romain Ruaud <romain.ruaud@smile.fr>
+ * @copyright 2020 Smile
+ * @license   Open Software License ("OSL") v. 3.0
+ */
+namespace Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute;
+
+use Magento\Config\Model\Config\Source\Yesno\Magento\Config\Model\Config\Source\Yesno;
+use Smile\ElasticsuiteCatalogRule\Api\Rule\Condition\Product\SpecialAttributeInterface;
+use Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product as ProductCondition;
+use Smile\ElasticsuiteCore\Search\Request\QueryInterface;
+use Smile\ElasticsuiteCore\Search\Request\Query\QueryFactory;
+
+/**
+ * Special "is_saleable" attribute class.
+ *
+ * @category Smile
+ * @package  Smile\ElasticsuiteCatalogRule
+ */
+class IsSaleable implements SpecialAttributeInterface
+{
+    /**
+     * @var Yesno
+     */
+    private $booleanSource;
+
+    /**
+     * @var QueryFactory
+     */
+    private QueryFactory $queryFactory;
+
+    /**
+     * IsSaleable constructor.
+     *
+     * @param Yesno $booleanSource Boolean Source
+     */
+    public function __construct(Yesno $booleanSource,
+    QueryFactory $queryFactory)
+    {
+        $this->booleanSource = $booleanSource;
+        $this->queryFactory   = $queryFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttributeCode()
+    {
+        return 'is_saleable';
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getSearchQuery(ProductCondition $condition)
+    {
+        return $this->queryFactory->create(QueryInterface::TYPE_TERM, [
+            'value' => true, 'field' => 'stock.is_in_stock'
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOperatorName()
+    {
+        return ' ';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInputType()
+    {
+        return 'select';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getValueElementType()
+    {
+        return 'hidden';
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getValueName($value)
+    {
+        return ' ';
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getValue($value)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getValueOptions()
+    {
+        return $this->booleanSource->toOptionArray();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLabel()
+    {
+        return __('Only saleable products');
+    }
+}
diff --git a/src/module-elasticsuite-catalog-rule/etc/di.xml b/src/module-elasticsuite-catalog-rule/etc/di.xml
index 4cc808cbd..507b5c541 100644
--- a/src/module-elasticsuite-catalog-rule/etc/di.xml
+++ b/src/module-elasticsuite-catalog-rule/etc/di.xml
@@ -22,6 +22,7 @@
         <arguments>
             <argument name="attributes" xsi:type="array">
                 <item name="has_image" xsi:type="object">Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute\HasImage</item>
+                <item name="is_saleable" xsi:type="object">Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute\IsSaleable</item>
                 <item name="stock.is_in_stock" xsi:type="object">Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute\IsInStock</item>
                 <item name="price.is_discount" xsi:type="object">Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute\IsDiscount</item>
                 <item name="is_bundle" xsi:type="object">isBundleProduct</item>
diff --git a/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml b/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml
index f956b1669..4d37c2795 100644
--- a/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml
+++ b/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml
@@ -40,6 +40,7 @@
                 <field name="children_ids" type="integer" />
                 <field name="configurable_attributes" type="keyword" />
                 <field name="indexed_attributes" type="keyword" />
+                <field name="is_saleable" type="integer" />
 
                 <!-- Static fields handled by the "prices" datasource -->
                 <field name="price.price" type="double" nestedPath="price" />

From ec1e30a81e2e42cc2d1f07f4b4460f4c77b2ca78 Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:03:49 +0100
Subject: [PATCH 2/9] Fix typo

---
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index 2e745ab5b..f164668d9 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -13,7 +13,7 @@
  */
 namespace Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product\SpecialAttribute;
 
-use Magento\Config\Model\Config\Source\Yesno\Magento\Config\Model\Config\Source\Yesno;
+use Magento\Config\Model\Config\Source\Yesno;
 use Smile\ElasticsuiteCatalogRule\Api\Rule\Condition\Product\SpecialAttributeInterface;
 use Smile\ElasticsuiteCatalogRule\Model\Rule\Condition\Product as ProductCondition;
 use Smile\ElasticsuiteCore\Search\Request\QueryInterface;

From ff9b19a1fba83a774fedf4941bb2379e96a0aa70 Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:05:16 +0100
Subject: [PATCH 3/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index f164668d9..679a4c64f 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -42,8 +42,10 @@ class IsSaleable implements SpecialAttributeInterface
      *
      * @param Yesno $booleanSource Boolean Source
      */
-    public function __construct(Yesno $booleanSource,
-    QueryFactory $queryFactory)
+    public function __construct(
+        Yesno $booleanSource,
+        QueryFactory $queryFactory
+    )
     {
         $this->booleanSource = $booleanSource;
         $this->queryFactory   = $queryFactory;

From 5f4e2e90f2d1282d368fac067fa483aec8e1aafe Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:37:32 +0100
Subject: [PATCH 4/9] CS

---
 .../Product/SpecialAttribute/IsInStock.php    | 22 +++++++++----------
 .../Product/SpecialAttribute/IsSaleable.php   |  9 ++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index b07dfc8ec..44c0a0cf0 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -32,6 +32,7 @@ class IsInStock implements SpecialAttributeInterface
      * @var Yesno
      */
     private $booleanSource;
+
     /**
      * @var QueryFactory
      */
@@ -45,10 +46,9 @@ class IsInStock implements SpecialAttributeInterface
     public function __construct(
         Yesno $booleanSource,
         QueryFactory $queryFactory
-    )
-    {
+    ) {
         $this->booleanSource = $booleanSource;
-        $this->queryFactory   = $queryFactory;
+        $this->queryFactory = $queryFactory;
     }
 
     /**
@@ -67,17 +67,15 @@ public function getSearchQuery(ProductCondition $condition)
     {
         $queryParams = [];
 
-        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_RANGE, [
-            'bounds' => ['gt' => (float) 0], 'field' => 'stock.qty'
-        ]);
+        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_RANGE, 
+            ['bounds' => ['gt' => (float) 0], 'field' => 'stock.qty']
+        );
 
-        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_TERM, [
-            'value' => true, 'field' => 'stock.is_in_stock'
-        ]);
+        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_TERM, 
+            ['value' => true, 'field' => 'stock.is_in_stock']
+        );
 
-        return $this->queryFactory->create(QueryInterface::TYPE_BOOL, [
-            'must' => $queryParams
-        ]);
+        return $this->queryFactory->create(QueryInterface::TYPE_BOOL, ['must' => $queryParams]);
     }
 
     /**
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index 679a4c64f..cd6c18848 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -45,8 +45,7 @@ class IsSaleable implements SpecialAttributeInterface
     public function __construct(
         Yesno $booleanSource,
         QueryFactory $queryFactory
-    )
-    {
+    ) {
         $this->booleanSource = $booleanSource;
         $this->queryFactory   = $queryFactory;
     }
@@ -65,9 +64,9 @@ public function getAttributeCode()
      */
     public function getSearchQuery(ProductCondition $condition)
     {
-        return $this->queryFactory->create(QueryInterface::TYPE_TERM, [
-            'value' => true, 'field' => 'stock.is_in_stock'
-        ]);
+        return $this->queryFactory->create(QueryInterface::TYPE_TERM, 
+            ['value' => true, 'field' => 'stock.is_in_stock']
+        );
     }
 
     /**

From c868ad7f8f688770f7009e330471dbf70a76e7d2 Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:46:09 +0100
Subject: [PATCH 5/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsInStock.php  | 7 +++++--
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index 44c0a0cf0..850b819bc 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -42,6 +42,7 @@ class IsInStock implements SpecialAttributeInterface
      * IsInStock constructor.
      *
      * @param Yesno $booleanSource Boolean Source
+     * @param QueryFactory $queryFactory Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
@@ -67,11 +68,13 @@ public function getSearchQuery(ProductCondition $condition)
     {
         $queryParams = [];
 
-        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_RANGE, 
+        $queryParams[] = $this->queryFactory->create(
+            QueryInterface::TYPE_RANGE,
             ['bounds' => ['gt' => (float) 0], 'field' => 'stock.qty']
         );
 
-        $queryParams[] = $this->queryFactory->create(QueryInterface::TYPE_TERM, 
+        $queryParams[] = $this->queryFactory->create(
+            QueryInterface::TYPE_TERM,
             ['value' => true, 'field' => 'stock.is_in_stock']
         );
 
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index cd6c18848..75afe8c84 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -41,13 +41,14 @@ class IsSaleable implements SpecialAttributeInterface
      * IsSaleable constructor.
      *
      * @param Yesno $booleanSource Boolean Source
+     * @param QueryFactory $queryFactory Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
         QueryFactory $queryFactory
     ) {
         $this->booleanSource = $booleanSource;
-        $this->queryFactory   = $queryFactory;
+        $this->queryFactory = $queryFactory;
     }
 
     /**
@@ -64,7 +65,8 @@ public function getAttributeCode()
      */
     public function getSearchQuery(ProductCondition $condition)
     {
-        return $this->queryFactory->create(QueryInterface::TYPE_TERM, 
+        return $this->queryFactory->create(
+            QueryInterface::TYPE_TERM,
             ['value' => true, 'field' => 'stock.is_in_stock']
         );
     }

From 935cabc154055a5dcf8ece6fac1a1c5f10d09b1a Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:54:00 +0100
Subject: [PATCH 6/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsInStock.php     | 4 ++--
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index 850b819bc..177f6e4fc 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -41,8 +41,8 @@ class IsInStock implements SpecialAttributeInterface
     /**
      * IsInStock constructor.
      *
-     * @param Yesno $booleanSource Boolean Source
-     * @param QueryFactory $queryFactory Query Factory
+     * @param Yesno         $booleanSource Boolean Source
+     * @param QueryFactory  $queryFactory Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index 75afe8c84..2df710998 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -40,8 +40,8 @@ class IsSaleable implements SpecialAttributeInterface
     /**
      * IsSaleable constructor.
      *
-     * @param Yesno $booleanSource Boolean Source
-     * @param QueryFactory $queryFactory Query Factory
+     * @param Yesno         $booleanSource Boolean Source
+     * @param QueryFactory  $queryFactory Query Factory
      */
     public function __construct(
         Yesno $booleanSource,

From fecaff2f318d0674954c250dda869d73bfe57c2e Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 20:54:56 +0100
Subject: [PATCH 7/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsInStock.php     | 4 ++--
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index 177f6e4fc..f502575f4 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -41,8 +41,8 @@ class IsInStock implements SpecialAttributeInterface
     /**
      * IsInStock constructor.
      *
-     * @param Yesno         $booleanSource Boolean Source
-     * @param QueryFactory  $queryFactory Query Factory
+     * @param Yesno         $booleanSource  Boolean Source
+     * @param QueryFactory  $queryFactory   Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index 2df710998..887961908 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -40,8 +40,8 @@ class IsSaleable implements SpecialAttributeInterface
     /**
      * IsSaleable constructor.
      *
-     * @param Yesno         $booleanSource Boolean Source
-     * @param QueryFactory  $queryFactory Query Factory
+     * @param Yesno         $booleanSource  Boolean Source
+     * @param QueryFactory  $queryFactory   Query Factory
      */
     public function __construct(
         Yesno $booleanSource,

From 2cc5b61cd2fde84498994e9fce108217a8885c0e Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 21:12:45 +0100
Subject: [PATCH 8/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsInStock.php     | 4 ++--
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index f502575f4..23aade66b 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -41,8 +41,8 @@ class IsInStock implements SpecialAttributeInterface
     /**
      * IsInStock constructor.
      *
-     * @param Yesno         $booleanSource  Boolean Source
-     * @param QueryFactory  $queryFactory   Query Factory
+     * @param Yesno         $booleanSource Boolean Source
+     * @param QueryFactory  $queryFactory  Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index 887961908..b11be0cae 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -40,8 +40,8 @@ class IsSaleable implements SpecialAttributeInterface
     /**
      * IsSaleable constructor.
      *
-     * @param Yesno         $booleanSource  Boolean Source
-     * @param QueryFactory  $queryFactory   Query Factory
+     * @param Yesno         $booleanSource Boolean Source
+     * @param QueryFactory  $queryFactory  Query Factory
      */
     public function __construct(
         Yesno $booleanSource,

From a365ef37538020cc57f7659b4b5d9978d2206e83 Mon Sep 17 00:00:00 2001
From: Victor <vseager@gmail.com>
Date: Wed, 13 Jul 2022 21:28:21 +0100
Subject: [PATCH 9/9] CS

---
 .../Rule/Condition/Product/SpecialAttribute/IsInStock.php     | 4 ++--
 .../Rule/Condition/Product/SpecialAttribute/IsSaleable.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
index 23aade66b..a7b92276f 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsInStock.php
@@ -41,8 +41,8 @@ class IsInStock implements SpecialAttributeInterface
     /**
      * IsInStock constructor.
      *
-     * @param Yesno         $booleanSource Boolean Source
-     * @param QueryFactory  $queryFactory  Query Factory
+     * @param Yesno        $booleanSource Boolean Source
+     * @param QueryFactory $queryFactory  Query Factory
      */
     public function __construct(
         Yesno $booleanSource,
diff --git a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
index b11be0cae..1f67205ba 100644
--- a/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
+++ b/src/module-elasticsuite-catalog-rule/Model/Rule/Condition/Product/SpecialAttribute/IsSaleable.php
@@ -40,8 +40,8 @@ class IsSaleable implements SpecialAttributeInterface
     /**
      * IsSaleable constructor.
      *
-     * @param Yesno         $booleanSource Boolean Source
-     * @param QueryFactory  $queryFactory  Query Factory
+     * @param Yesno        $booleanSource Boolean Source
+     * @param QueryFactory $queryFactory  Query Factory
      */
     public function __construct(
         Yesno $booleanSource,