From 78fdec41fad4bfc68f54a1a814a804401810e4d4 Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Fri, 25 May 2018 08:38:54 +0200 Subject: [PATCH 1/2] [fix] getConfiguration() invoked with 1 parameter, 0 required --- app/code/Magento/Ui/Component/Bookmark.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/Component/Bookmark.php b/app/code/Magento/Ui/Component/Bookmark.php index aa1d7a9fb5c0a..db824f11bd4b1 100644 --- a/app/code/Magento/Ui/Component/Bookmark.php +++ b/app/code/Magento/Ui/Component/Bookmark.php @@ -82,11 +82,11 @@ public function prepare() } } - $this->setData('config', array_replace_recursive($config, $this->getConfiguration($this))); + $this->setData('config', array_replace_recursive($config, $this->getConfiguration())); parent::prepare(); - $jsConfig = $this->getConfiguration($this); + $jsConfig = $this->getConfiguration(); $this->getContext()->addComponentDefinition($this->getComponentName(), $jsConfig); } } From c261463fd26fe2b9c14da4ca488dfbb484c00983 Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Fri, 25 May 2018 08:41:52 +0200 Subject: [PATCH 2/2] [fix] Class Magento\Ui\Component\Control\ActionPool constructor invoked with 3 parameters, 2 required. --- .../Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php index e18155cd08c53..85226b780aac3 100644 --- a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php +++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php @@ -83,8 +83,7 @@ protected function setUp() $this->items[$this->key] = $this->createPartialMock(\Magento\Ui\Component\Control\Item::class, ['setData']); $this->actionPool = new ActionPool( $this->contextMock, - $this->itemFactoryMock, - $this->toolbarBlockMock + $this->itemFactoryMock ); }