Skip to content

Commit dfdb396

Browse files
committed
add return statement to render method, remove changes from EavSetup.php
1 parent f2cb302 commit dfdb396

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

app/code/Magento/Eav/Setup/EavSetup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ private function _getValue($array, $key, $default = null)
797797
if (isset($array[$key]) && is_bool($array[$key])) {
798798
$array[$key] = (int)$array[$key];
799799
}
800-
return $array[$key] ?? $default;
800+
return isset($array[$key]) ? $array[$key] : $default;
801801
}
802802

803803
/**
@@ -1102,7 +1102,7 @@ public function getAttribute($entityTypeId, $id, $field = null)
11021102

11031103
$row = $setupCache->get($mainTable, $entityTypeId, $id);
11041104
if ($field !== null) {
1105-
return $row[$field] ?? false;
1105+
return isset($row[$field]) ? $row[$field] : false;
11061106
}
11071107

11081108
return $row;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
*/
66
namespace Magento\Ui\Component;
77

8+
use Magento\Framework\Data\ValueSourceInterface;
89
use Magento\Framework\DataObject;
9-
use Magento\Framework\Exception\LocalizedException;
10-
use Magento\Framework\View\Element\UiComponentFactory;
11-
use Magento\Framework\View\Element\UiComponentInterface;
1210
use Magento\Framework\View\Element\UiComponent\ContextInterface;
1311
use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
1412
use Magento\Framework\View\Element\UiComponent\ObserverInterface;
15-
use Magento\Framework\Data\ValueSourceInterface;
13+
use Magento\Framework\View\Element\UiComponentInterface;
1614

1715
//phpcs:disable Magento2.Classes.AbstractApi
1816
/**
@@ -142,10 +140,12 @@ protected function prepareChildComponent(UiComponentInterface $component)
142140

143141
/**
144142
* Produce and return block's html output
143+
*
144+
* @return string
145145
*/
146146
public function toHtml()
147147
{
148-
$this->render();
148+
return $this->render();
149149
}
150150

151151
/**

0 commit comments

Comments
 (0)