Skip to content

Commit 855fd2d

Browse files
ENGCOM-4498: Removed extra whitespaces #21740
- Merge Pull Request #21740 from yogeshsuhagiya/magento2:2.3-develop-PR-yogesh-12 - Merged commits: 1. 28d5335
2 parents a4039fe + 28d5335 commit 855fd2d

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ protected function _prepareForm()
110110

111111
/** @var \Magento\Framework\Data\Form $form */
112112
$form = $this->_formFactory->create(
113-
114113
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
115114
);
116115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
10631063
return $this;
10641064
}
10651065
}
1066-
1066+
10671067
$attributeId = $this->getAttributeId($entityTypeId, $id);
10681068
if (false === $attributeId) {
10691069
throw new LocalizedException(__('Attribute with ID: "%1" does not exist', $id));

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,11 @@ public function addValueSortToCollectionDataProvider()
101101
'expectedJoinCondition' => [
102102
0 => [
103103
'requisites' => ['code_t1' => "table"],
104-
'condition' =>
105-
"e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
104+
'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
106105
],
107106
1 => [
108107
'requisites' => ['code_t2' => "table"],
109-
'condition' =>
110-
"e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
108+
'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
111109
],
112110
],
113111
'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -118,13 +116,11 @@ public function addValueSortToCollectionDataProvider()
118116
'expectedJoinCondition' => [
119117
0 => [
120118
'requisites' => ['code_t1' => "table"],
121-
'condition' =>
122-
"e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
119+
'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
123120
],
124121
1 => [
125122
'requisites' => ['code_t2' => "table"],
126-
'condition' =>
127-
"e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
123+
'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
128124
],
129125
],
130126
'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -135,8 +131,7 @@ public function addValueSortToCollectionDataProvider()
135131
'expectedJoinCondition' => [
136132
0 => [
137133
'requisites' => ['code_t' => "table"],
138-
'condition' =>
139-
"e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
134+
'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
140135
],
141136
],
142137
'expectedOrder' => 'code_t.value DESC',
@@ -147,8 +142,7 @@ public function addValueSortToCollectionDataProvider()
147142
'expectedJoinCondition' => [
148143
0 => [
149144
'requisites' => ['code_t' => "table"],
150-
'condition' =>
151-
"e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
145+
'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
152146
],
153147
],
154148
'expectedOrder' => 'code_t.value ASC',

0 commit comments

Comments
 (0)