Skip to content

Commit 91a26a9

Browse files
authored
ENGCOM-4498: Removed extra whitespaces #21740
2 parents 28ee51d + 2a4b53b commit 91a26a9

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Product attribute add/edit form main tab
9-
*
10-
* @author Magento Core Team <[email protected]>
11-
*/
127
namespace Magento\Eav\Block\Adminhtml\Attribute\Edit\Main;
138

149
use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
1510

11+
/**
12+
* Product attribute add/edit form main tab
13+
*/
1614
abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
1715
{
1816
/**
@@ -110,7 +108,6 @@ protected function _prepareForm()
110108

111109
/** @var \Magento\Framework\Data\Form $form */
112110
$form = $this->_formFactory->create(
113-
114111
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
115112
);
116113

@@ -280,10 +277,11 @@ protected function _initFormValues()
280277
}
281278

282279
/**
283-
* Processing block html after rendering
280+
* Processing block html after rendering.
281+
*
284282
* Adding js block to the end of this block
285283
*
286-
* @param string $html
284+
* @param string $html
287285
* @return string
288286
*/
289287
protected function _afterToHtml($html)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
1111
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
1212
use Magento\Framework\App\CacheInterface;
13-
use Magento\Framework\App\ObjectManager;
14-
use Magento\Framework\App\ResourceConnection;
1513
use Magento\Framework\Exception\LocalizedException;
1614
use Magento\Framework\Setup\ModuleDataSetupInterface;
1715

1816
/**
17+
* Base eav setup class.
18+
*
1919
* @api
2020
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2121
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -101,7 +101,8 @@ public function __construct(
101101
}
102102

103103
/**
104-
* Gets setup model
104+
* Gets setup model.
105+
*
105106
* @deprecated
106107
* @return ModuleDataSetupInterface
107108
*/
@@ -568,6 +569,8 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
568569
}
569570

570571
/**
572+
* Convert group name to attribute group code.
573+
*
571574
* @param string $groupName
572575
* @return string
573576
* @since 100.1.0
@@ -1063,7 +1066,7 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
10631066
return $this;
10641067
}
10651068
}
1066-
1069+
10671070
$attributeId = $this->getAttributeId($entityTypeId, $id);
10681071
if (false === $attributeId) {
10691072
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ 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'"
105+
. " AND code_t1.store_id='0'",
106106
],
107107
1 => [
108108
'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'",
109+
'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
110+
. " AND code_t2.store_id='12'",
111111
],
112112
],
113113
'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -118,13 +118,13 @@ public function addValueSortToCollectionDataProvider()
118118
'expectedJoinCondition' => [
119119
0 => [
120120
'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'",
121+
'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
122+
. " AND code_t1.store_id='0'",
123123
],
124124
1 => [
125125
'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'",
126+
'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
127+
. " AND code_t2.store_id='12'",
128128
],
129129
],
130130
'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -135,8 +135,8 @@ public function addValueSortToCollectionDataProvider()
135135
'expectedJoinCondition' => [
136136
0 => [
137137
'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'",
138+
'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
139+
. " AND code_t.store_id='0'",
140140
],
141141
],
142142
'expectedOrder' => 'code_t.value DESC',
@@ -147,8 +147,8 @@ public function addValueSortToCollectionDataProvider()
147147
'expectedJoinCondition' => [
148148
0 => [
149149
'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'",
150+
'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
151+
. " AND code_t.store_id='0'",
152152
],
153153
],
154154
'expectedOrder' => 'code_t.value ASC',

0 commit comments

Comments
 (0)