Skip to content

Commit 84a3079

Browse files
committed
MAGETWO-49469: Contribute Ogre Bugfixes and Stories for Sprint 44
- CR changes
1 parent b39565c commit 84a3079

File tree

2 files changed

+6
-5
lines changed
  • app/code/Magento

2 files changed

+6
-5
lines changed

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ public function __construct(
173173

174174
/**
175175
* @deprecated
176+
* @return \Magento\Search\Api\SearchInterface
176177
*/
177178
private function getSearch()
178179
{
@@ -186,7 +187,7 @@ private function getSearch()
186187
* @deprecated
187188
* @param \Magento\Search\Api\SearchInterface $object
188189
*/
189-
public function setSearch($object)
190+
public function setSearch(\Magento\Search\Api\SearchInterface $object)
190191
{
191192
$this->search = $object;
192193
}

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
2929

3030
$data = [
3131
'id' => 'system_full_page_cache_varnish_export_button_version' . $this->getVarnishVersion(),
32-
'label' => $this->_getLabel(),
33-
'onclick' => "setLocation('" . $this->_getUrl($params) . "')",
32+
'label' => $this->getLabel(),
33+
'onclick' => "setLocation('" . $this->getVarnishUrl($params) . "')",
3434
];
3535

3636
$html = $buttonBlock->setData($data)->toHtml();
@@ -50,7 +50,7 @@ public function getVarnishVersion()
5050
/**
5151
* @return \Magento\Framework\Phrase
5252
*/
53-
protected function _getLabel()
53+
private function getLabel()
5454
{
5555
return __('Export VCL for Varnish %1', $this->getVarnishVersion());
5656
}
@@ -60,7 +60,7 @@ protected function _getLabel()
6060
*
6161
* @return string
6262
*/
63-
protected function _getUrl($params = [])
63+
private function getVarnishUrl($params = [])
6464
{
6565
return $this->getUrl('*/PageCache/exportVarnishConfig', $params);
6666
}

0 commit comments

Comments
 (0)