Skip to content

Commit be7c961

Browse files
committed
inject new dependency with backward compatibility
1 parent c3d700a commit be7c961

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

app/code/Magento/Backend/Block/Menu.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Backend\Block;
88

9+
910
/**
1011
* Backend menu block
1112
*
@@ -75,7 +76,7 @@ class Menu extends \Magento\Backend\Block\Template
7576
private $anchorRenderer;
7677

7778
/**
78-
* @var \Magento\Framework\App\Route\ConfigInterface
79+
* @var ConfigInterface
7980
*/
8081
private $routeConfig;
8182

@@ -86,7 +87,7 @@ class Menu extends \Magento\Backend\Block\Template
8687
* @param \Magento\Backend\Model\Auth\Session $authSession
8788
* @param \Magento\Backend\Model\Menu\Config $menuConfig
8889
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
89-
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
90+
* @param ConfigInterface $routeConfig
9091
* @param array $data
9192
* @param MenuItemChecker|null $menuItemChecker
9293
* @param AnchorRenderer|null $anchorRenderer
@@ -99,10 +100,10 @@ public function __construct(
99100
\Magento\Backend\Model\Auth\Session $authSession,
100101
\Magento\Backend\Model\Menu\Config $menuConfig,
101102
\Magento\Framework\Locale\ResolverInterface $localeResolver,
102-
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
103103
array $data = [],
104104
MenuItemChecker $menuItemChecker = null,
105-
AnchorRenderer $anchorRenderer = null
105+
AnchorRenderer $anchorRenderer = null,
106+
\Magento\Framework\App\Route\ConfigInterface $routeConfig = null
106107
) {
107108
$this->_url = $url;
108109
$this->_iteratorFactory = $iteratorFactory;
@@ -111,8 +112,9 @@ public function __construct(
111112
$this->_localeResolver = $localeResolver;
112113
$this->menuItemChecker = $menuItemChecker;
113114
$this->anchorRenderer = $anchorRenderer;
115+
$this->routeConfig = $routeConfig ?:
116+
\Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\App\Route\ConfigInterface::class);
114117
parent::__construct($context, $data);
115-
$this->routeConfig = $routeConfig;
116118
}
117119

118120
/**

0 commit comments

Comments
 (0)