diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php index f349e94235a9c..5b0723463d354 100644 --- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php @@ -1,7 +1,7 @@ _getCustomerGroups() as $groupId => $groupLabel) { + // phpcs:ignore Magento2.Functions.DiscouragedFunction $this->addOption($groupId, addslashes($groupLabel)); } } diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php index 5008836c2997b..0e79cfeebc3c7 100644 --- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php @@ -1,7 +1,7 @@ _groupRenderer) { $this->_groupRenderer = $this->getLayout()->createBlock( - \Magento\CatalogInventory\Block\Adminhtml\Form\Field\Customergroup::class, - '', - ['data' => ['is_render_to_js_template' => true]] + \Magento\CatalogInventory\Block\Adminhtml\Form\Field\Customergroup::class ); $this->_groupRenderer->setClass('customer_group_select admin__control-select'); } @@ -69,6 +68,8 @@ protected function _prepareToRender() * * @param \Magento\Framework\DataObject $row * @return void + * @deprecated + * @see Nothing */ protected function _prepareArrayRow(\Magento\Framework\DataObject $row) { diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php index cc6b7e4b441dc..094d2453befbb 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php @@ -1,7 +1,7 @@ - * @api * @since 100.0.2 */ abstract class AbstractFieldArray extends \Magento\Config\Block\System\Config\Form\Field @@ -126,10 +125,12 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract * @return void * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ + // @codingStandardsIgnoreStart protected function _prepareArrayRow(\Magento\Framework\DataObject $row) { // override in descendants } + // @codingStandardsIgnoreEnd /** * Obtain existing data from form element @@ -196,16 +197,23 @@ protected function _getCellInputElementName($columnName) public function renderCellTemplate($columnName) { if (empty($this->_columns[$columnName])) { + // phpcs:ignore Magento2.Exceptions.DirectThrow throw new \Exception('Wrong column name specified.'); } $column = $this->_columns[$columnName]; $inputName = $this->_getCellInputElementName($columnName); + $inputId = $this->_getCellInputElementId('<%- _id %>', $columnName); if ($column['renderer']) { - return $column['renderer']->setInputName( + return $column['renderer']->setName( + $inputName + )->setId( + $inputId + // setInputName() and setInputId() are called for BC. + )->setInputName( $inputName )->setInputId( - $this->_getCellInputElementId('<%- _id %>', $columnName) + $inputId )->setColumnName( $columnName )->setColumn( @@ -213,10 +221,7 @@ public function renderCellTemplate($columnName) )->toHtml(); } - return ''; + $this->assertEquals($expectedResult, $this->_block->_toHtml()); } }