🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests: - #15943: [Backport] Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D� (by @vgelani) - #15945: [Backport] ISSUE-11477 - fixed Swagger response for searchCriteria - added zero � (by @vgelani) - #15949: [Backport]No need to pass method parameter as method definition does not requir� (by @saurabh-aureate) Fixed GitHub Issues: - #11477: Magento REST API Schema (Swagger) is not compatible with Search Criteria (reported by @careys7) has been fixed in #15945 by @vgelani in 2.1-develop branch Related commits: 1. f3108a3
magento · Jun 11, 2018 · 4d1b832 · 4d1b832
2 parents 08ec01b + e3df7d5
commit 4d1b832
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
@@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
         }
 
         if ($this->_getProduct()->getId()) {
-            $this->_addProductLinkBlock($this->_getProduct());
+            $this->_addProductLinkBlock();
         }
 
         if ($this->_getCategory()->getId()) {

diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -39,7 +39,7 @@ class Generator extends AbstractSchemaGenerator
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
     /** Array signifier */
-    const ARRAY_SIGNIFIER = '[]';
+    const ARRAY_SIGNIFIER = '[0]';
 
     /**
      * Swagger factory instance.

diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php
@@ -188,8 +188,8 @@ public function toArray($arrRequiredFields = [])
     }
 
     /**
-     * @param null $valueField
-     * @param null $labelField
+     * @param string|null $valueField
+     * @param string|null $labelField
      * @param array $additional
      * @return array
      */