🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

Accepted Community Pull Requests:
 - #23360: #23354 : Data saving problem error showing when leave blank qty and update it (by @konarshankar07)
 - #23496: Resolved + character issue in custom widget (by @sarfarazbheda)
 - #23310: magento/magento-2#23222: setup:upgrade should return failure when app� (by @ProcessEight)
 - #23529: Feature/9798 updating configurable product options based on produc id and sku (by @lpouwelse)
 - #23427: 23424: fixed search with 0 (by @jeysmook)


Fixed GitHub Issues:
 - #23354: Data saving problem error showing when leave blank qty and update it (reported by @bhavik43) has been fixed in #23360 by @konarshankar07 in 2.3-develop branch
   Related commits:
     1. 471fd85

 - #16234: Unable to enter `+` character in widget content (reported by @molovo) has been fixed in #23496 by @sarfarazbheda in 2.3-develop branch
   Related commits:
     1. 538f690
     2. bfa6074

 - #23222: setup:upgrade should return failure when app:config:import failed (reported by @stkrelax) has been fixed in #23310 by @ProcessEight in 2.3-develop branch
   Related commits:
     1. 8c4667a
     2. 671876e

 - #9798: Problem adding attribute options to configurable product via REST Api (reported by @troublediehard) has been fixed in #23529 by @lpouwelse in 2.3-develop branch
   Related commits:
     1. f6c957c
     2. c0a360f

 - #23424: Search by keyword didn't work properly with "0" value (reported by @engcom-Golf) has been fixed in #23427 by @jeysmook in 2.3-develop branch
   Related commits:
     1. 36190fb
     2. a8f5c0d
     3. dfd664e

Author: magento-engcom-team

app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Ui\DataProvider\Product;
 
-use Magento\Framework\Data\Collection;
 use Magento\CatalogSearch\Model\ResourceModel\Search\Collection as SearchCollection;
+use Magento\Framework\Data\Collection;
 use Magento\Ui\DataProvider\AddFilterToCollectionInterface;
 
 /**
@@ -30,14 +30,14 @@ public function __construct(SearchCollection $searchCollection)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function addFilter(Collection $collection, $field, $condition = null)
     {
         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
-        if (isset($condition['fulltext']) && !empty($condition['fulltext'])) {
+        if (isset($condition['fulltext']) && (string)$condition['fulltext'] !== '') {
             $this->searchCollection->addBackendSearchFilter($condition['fulltext']);
             $productIds = $this->searchCollection->load()->getAllIds();
             $collection->addIdFilter($productIds);

app/code/Magento/ConfigurableProduct/Model/OptionRepository.php

@@ -22,6 +22,7 @@
 use Magento\Store\Model\Store;
 
 /**
+ * Repository for performing CRUD operations for a configurable product's options.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
@@ -112,7 +113,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $id)
     {
@@ -131,7 +132,7 @@ public function get($sku, $id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
@@ -141,7 +142,7 @@ public function getList($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(OptionInterface $option)
     {
@@ -167,7 +168,7 @@ public function delete(OptionInterface $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($sku, $id)
     {
@@ -184,7 +185,7 @@ public function deleteById($sku, $id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function save($sku, OptionInterface $option)
@@ -213,6 +214,16 @@ public function save($sku, OptionInterface $option)
                 throw new \InvalidArgumentException('Incompatible product type');
             }
             $option->setProductId($product->getData($metadata->getLinkField()));
+            if (!empty($option->getProductId() && !empty($option->getAttributeId()))) {
+                $id = $this->optionResource->getIdByProductIdAndAttributeId(
+                    $option,
+                    $option->getProductId(),
+                    $option->getAttributeId()
+                );
+                if (!empty($id)) {
+                    $option->setId($id);
+                }
+            }
         }
 
         try {
@@ -296,6 +307,7 @@ public function validateNewOptionData(OptionInterface $option)
 
     /**
      * Get MetadataPool instance
+     *
      * @return MetadataPool
      */
     private function getMetadataPool()

app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

@@ -64,7 +64,7 @@
                                            size="2"
                                            min="0"
                                            class="input-text qty"
-                                           data-validate="{number: true,'validate-greater-than-zero':true}"/>
+                                           data-validate="{number: true, required:true, 'validate-greater-than-zero':true}"/>
                                 </div>
                             </div>
                         </td>

app/code/Magento/Ui/Component/Filters/Type/Search.php

@@ -6,6 +6,8 @@
 namespace Magento\Ui\Component\Filters\Type;
 
 /**
+ * Class Search
+ *
  * @api
  * @since 100.0.2
  */
@@ -34,7 +36,7 @@ protected function applyFilter()
     {
         $value = $this->getContext()->getRequestParam('search');
 
-        if ($value) {
+        if ((string)$value !== '') {
             $filter = $this->filterBuilder->setConditionType('fulltext')
                 ->setField($this->getName())
                 ->setValue($value)

dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php

@@ -10,6 +10,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Eav\Api\AttributeRepositoryInterface;
 
+/**
+ * Class OptionRepositoryTest for testing ConfigurableProductoption integration
+ */
 class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
@@ -210,6 +213,47 @@ public function testUpdate()
         $this->assertEquals($requestBody['option']['label'], $configurableAttribute[0]['label']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testUpdateWithoutOptionId()
+    {
+        $productSku = 'configurable';
+        /** @var AttributeRepositoryInterface $attributeRepository */
+
+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+        /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
+        $attribute = $attributeRepository->get('catalog_product', 'test_configurable');
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save'
+            ]
+        ];
+
+        $option = [
+            'attribute_id' => $attribute->getAttributeId(),
+            'label' => 'Update Test Configurable with sku and attribute_id',
+            'values' => [
+                [
+                    'value_index' => 1,
+                ]
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, ['sku' => $productSku, 'option' => $option]);
+        $this->assertGreaterThan(0, $result);
+        $configurableAttribute = $this->getConfigurableAttribute($productSku);
+        $this->assertEquals($option['label'], $configurableAttribute[0]['label']);
+    }
+
     /**
      * @param string $productSku
      * @return array

lib/internal/Magento/Framework/Filter/Template/Tokenizer/AbstractTokenizer.php

@@ -94,7 +94,7 @@ public function char()
      */
     public function setString($value)
     {
-        $this->_string = urldecode($value);
+        $this->_string = rawurldecode($value);
         $this->reset();
     }
 

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -126,7 +126,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
                 $arrayInput = new ArrayInput([]);
                 $arrayInput->setInteractive($input->isInteractive());
-                $importConfigCommand->run($arrayInput, $output);
+                $result = $importConfigCommand->run($arrayInput, $output);
+                if ($result === \Magento\Framework\Console\Cli::RETURN_FAILURE) {
+                    throw new \Magento\Framework\Exception\RuntimeException(__('%1 failed. See previous output.', ConfigImportCommand::COMMAND_NAME));
+                }
             }
 
             if (!$keepGenerated && $this->appState->getMode() === AppState::MODE_PRODUCTION) {