Skip to content

Commit e43cd18

Browse files
author
Stanislav Idolov
authored
ENGCOM-1678: Fixes in ui module #15512
2 parents 9bfee87 + b8046e5 commit e43cd18

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

app/code/Magento/Ui/Component/Bookmark.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ public function prepare()
8282
}
8383
}
8484

85-
$this->setData('config', array_replace_recursive($config, $this->getConfiguration($this)));
85+
$this->setData('config', array_replace_recursive($config, $this->getConfiguration()));
8686

8787
parent::prepare();
8888

89-
$jsConfig = $this->getConfiguration($this);
89+
$jsConfig = $this->getConfiguration();
9090
$this->getContext()->addComponentDefinition($this->getComponentName(), $jsConfig);
9191
}
9292
}

app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ protected function setUp()
8383
$this->items[$this->key] = $this->createPartialMock(\Magento\Ui\Component\Control\Item::class, ['setData']);
8484
$this->actionPool = new ActionPool(
8585
$this->contextMock,
86-
$this->itemFactoryMock,
87-
$this->toolbarBlockMock
86+
$this->itemFactoryMock
8887
);
8988
}
9089

0 commit comments

Comments
 (0)