From 63ebb61a6278e74590644226a5311fe8435f7259 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Wed, 6 Jun 2018 15:51:04 +0530 Subject: [PATCH 1/4] Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\Data\SearchResultProcessor.php --- lib/internal/Magento/Framework/Data/SearchResultProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php index 5321ce06755cf..8bb4c3dcde474 100644 --- 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 $labelField + * @param string $labelField * @param array $additional * @return array */ From 3c583901308169425d88c7c1064ea4d67f532e86 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Wed, 6 Jun 2018 15:54:52 +0530 Subject: [PATCH 2/4] Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\Data\SearchResultProcessor.php #2 --- lib/internal/Magento/Framework/Data/SearchResultProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php index 8bb4c3dcde474..fc7cc2f98a1ef 100644 --- 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 string $labelField - * @param string $labelField + * @param string|null $valueField + * @param string|null $labelField * @param array $additional * @return array */ From f3108a35c0127b77b65608d55150d255b14d9e4a Mon Sep 17 00:00:00 2001 From: Jakub Idziak Date: Fri, 18 May 2018 16:07:40 +0200 Subject: [PATCH 3/4] ISSUE-11477 - fixed Swagger response for searchCriteria - added zero index to array signifier --- app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php index 9a4c174c3b88e..747c16b8d3179 100644 --- 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. From 063840f809aa622d48803548a0c9a1c03e0f5f82 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Wed, 6 Jun 2018 15:36:35 +0530 Subject: [PATCH 4/4] No need to pass method parameter as method definition does not require it --- app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php index d18060abe2245..1fcabe71bd5d8 100644 --- 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()) {