MC-15250: Explicit product sorting in PageBuilder Products Content type

Author: eug123

app/code/Magento/PageBuilder/Model/Catalog/Sorting.php

@@ -24,7 +24,7 @@ class Sorting
     private $factory;
 
     /**
-     * @var Sorting\SortInterface[]
+     * @var Sorting\OptionInterface[]
      */
     private $sortInstances = [];
 
@@ -62,9 +62,9 @@ public function getSortingOptions(): array
      * Get the instance of the first option which is None
      *
      * @param string $sortOption
-     * @return Sorting\SortInterface
+     * @return Sorting\OptionInterface
      */
-    public function getSortingInstance($sortOption): Sorting\SortInterface
+    public function getSortingInstance($sortOption): Sorting\OptionInterface
     {
         if (isset($this->sortInstances[$sortOption])) {
             return $this->sortInstances[$sortOption];

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Factory.php

@@ -31,16 +31,16 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $className
      * @param array $data
-     * @return SortInterface
+     * @return OptionInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function create($className, array $data = []): SortInterface
+    public function create($className, array $data = []): OptionInterface
     {
         $instance = $this->_objectManager->create($className, $data);
 
-        if (!$instance instanceof \Magento\PageBuilder\Model\Catalog\Sorting\SortInterface) {
+        if (!$instance instanceof \Magento\PageBuilder\Model\Catalog\Sorting\OptionInterface) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('%1 doesn\'t implement SortInterface', $className)
+                __('%1 doesn\'t implement OptionInterface', $className)
             );
         }
         return $instance;

app/code/Magento/PageBuilder/Model/Catalog/Sorting/SortInterface.php renamed to app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php

@@ -9,9 +9,9 @@
 namespace Magento\PageBuilder\Model\Catalog\Sorting;
 
 /**
- * Interface SortInterface
+ * Interface OptionInterface
  */
-interface SortInterface
+interface OptionInterface
 {
     /**
      * Sort products in product widget collection according to specified option.

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php

@@ -13,7 +13,7 @@
 /**
  * Class for sorting by price
  */
-class Price implements SortInterface
+class Price implements OptionInterface
 {
     /**
      * @var string

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Attribute.php renamed to app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php

@@ -13,7 +13,7 @@
 /**
  * Class for sorting by specified attribute
  */
-class Attribute implements SortInterface
+class SimpleOption implements OptionInterface
 {
     /**
      * @var string

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Stock.php

@@ -13,7 +13,7 @@
 /**
  * Class for sorting by stock
  */
-class Stock implements SortInterface
+class Stock implements OptionInterface
 {
     /**
      * @var string

app/code/Magento/PageBuilder/etc/di.xml

@@ -144,42 +144,42 @@
     <type name="Magento\Framework\Session\SidResolver">
         <plugin name="pagebuilder_preview_sid_resolving" type="Magento\PageBuilder\Plugin\Framework\Session\SidResolver" />
     </type>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Date\NewestTop" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Date\NewestTop" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">Newest products first</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_DESC</argument>
             <argument name="attribute_field" xsi:type="string">entity_id</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Date\OldestTop" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Date\OldestTop" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">Oldest products first</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_ASC</argument>
             <argument name="attribute_field" xsi:type="string">entity_id</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Name\Ascending" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Name\Ascending" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">Name: A - Z</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_ASC</argument>
             <argument name="attribute_field" xsi:type="string">name</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Name\Descending" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Name\Descending" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">Name: Z - A</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_DESC</argument>
             <argument name="attribute_field" xsi:type="string">name</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Sku\Ascending" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Sku\Ascending" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">SKU: ascending</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_ASC</argument>
             <argument name="attribute_field" xsi:type="string">sku</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Sku\Descending" type="Magento\PageBuilder\Model\Catalog\Sorting\Attribute">
+    <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Sku\Descending" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">SKU: descending</argument>
             <argument name="sortDirection" xsi:type="const">\Magento\Framework\DB\Select::SQL_DESC</argument>