diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index 9521071027e7e..c290177baeaf6 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -211,9 +211,12 @@ protected function _renderItemCssClass($menuItem, $level) protected function _renderAnchor($menuItem, $level) { if ($level == 1 && $menuItem->getUrl() == '#') { - $output = '' - . '' . $this->_getAnchorLabel($menuItem) . '' - . ''; + $output = ''; + if ($menuItem->hasChildren()) { + $output = '' + . '' . $this->_getAnchorLabel($menuItem) . '' + . ''; + } } else { $output = '_renderItemAnchorTitle( $menuItem 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()) { diff --git a/lib/internal/Magento/Framework/Data/SearchResultProcessor.php b/lib/internal/Magento/Framework/Data/SearchResultProcessor.php index 5321ce06755cf..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 null $valueField - * @param null $labelField + * @param string|null $valueField + * @param string|null $labelField * @param array $additional * @return array */ diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php index 11019c1658783..550f1ce7590d8 100644 --- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php +++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php @@ -155,7 +155,8 @@ protected function _getMethodInfo(\ReflectionMethod $method) $parameterNames = []; $parameters = []; foreach ($method->getParameters() as $parameter) { - $parameterNames[] = '$' . $parameter->getName(); + $name = $parameter->isVariadic() ? '... $' . $parameter->getName() : '$' . $parameter->getName(); + $parameterNames[] = $name; $parameters[] = $this->_getMethodParameterInfo($parameter); }