Skip to content

[Backport] Adding support for variadic arguments' method in generated proxy c… #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gelanivishal merged 13 commits into from
Jun 13, 2018
Merged

[Backport] Adding support for variadic arguments' method in generated proxy c… #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4caef44
Do not display anchor if menu has no children
rogyar Jun 7, 2018
7c6fc56
ENGCOM-1921: Do not display anchor if admin submenu has no children #…
magento-engcom-team Jun 7, 2018
063840f
No need to pass method parameter as method definition does not requir…
Jun 6, 2018
1824663
ENGCOM-1921: Do not display anchor if admin submenu has no children #…
Jun 8, 2018
08ec01b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.1-develop
Jun 11, 2018
198aa06
ENGCOM-1932: [Backport]No need to pass method parameter as method def…
magento-engcom-team Jun 11, 2018
ed12778
ENGCOM-1935: [Backport] ISSUE-11477 - fixed Swagger response for sear…
magento-engcom-team Jun 11, 2018
b9d8953
ENGCOM-1937: [Backport] Wrong annotation in _toOptionArray : lib\inte…
magento-engcom-team Jun 11, 2018
0af2aa9
ENGCOM-1937: [Backport] Wrong annotation in _toOptionArray : lib\inte…
Jun 11, 2018
a7696f9
ENGCOM-1935: [Backport] ISSUE-11477 - fixed Swagger response for sear…
Jun 11, 2018
e3df7d5
ENGCOM-1932: [Backport]No need to pass method parameter as method def…
Jun 11, 2018
4d1b832
:arrows_clockwise: [EngCom] Public Pull Requests - 2.1-develop
Jun 11, 2018
7091665
Adding support for variadic arguments fro method in generated proxy c…
May 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/code/Magento/Backend/Block/Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,12 @@ protected function _renderItemCssClass($menuItem, $level)
protected function _renderAnchor($menuItem, $level)
{
if ($level == 1 && $menuItem->getUrl() == '#') {
$output = '<strong class="submenu-group-title" role="presentation">'
. '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
. '</strong>';
$output = '';
if ($menuItem->hasChildren()) {
$output = '<strong class="submenu-group-title" role="presentation">'
. '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
. '</strong>';
}
} else {
$output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
$menuItem
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
}

if ($this->_getProduct()->getId()) {
$this->_addProductLinkBlock($this->_getProduct());
$this->_addProductLinkBlock();
}

if ($this->_getCategory()->getId()) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down