Skip to content

Commit 844d121

Browse files
sreichelhirale
authored andcommitted
rector: SingularSwitchToIfRector (OpenMage#4861)
* rector: `SingularSwitchToIfRector` - see https://getrector.com/rule-detail/singular-switch-to-if-rector * sonar
1 parent 09f5e74 commit 844d121

File tree

12 files changed

+51
-80
lines changed

12 files changed

+51
-80
lines changed

.rector.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
CodeQuality\If_\SimplifyIfReturnBoolRector::class,
6565
CodeQuality\Include_\AbsolutizeRequireAndIncludePathRector::class, # todo: TMP
6666
CodeQuality\Isset_\IssetOnPropertyObjectToPropertyExistsRector::class, # todo: TMP
67-
CodeQuality\Switch_\SingularSwitchToIfRector::class, # todo: TMP
6867
CodeQuality\Ternary\NumberCompareToMaxFuncCallRector::class, # todo: TMP
6968
CodeQuality\Ternary\SwitchNegatedTernaryRector::class, # todo: TMP
7069
CodeQuality\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector::class, # todo: TMP

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,9 @@ protected function _prepareForm()
8989
*/
9090
protected function _addAdditionalFormElementData(Varien_Data_Form_Element_Abstract $element)
9191
{
92-
switch ($element->getId()) {
93-
case 'email':
94-
$element->setRequired(0);
95-
$element->setClass('validate-email');
96-
break;
92+
if ($element->getId() === 'email') {
93+
$element->setRequired(0);
94+
$element->setClass('validate-email');
9795
}
9896
return $this;
9997
}

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,8 @@ protected function &_applyDecorators($value, $decorators)
213213
if ((!is_array($decorators)) || empty($decorators)) {
214214
return $value;
215215
}
216-
switch (array_shift($decorators)) {
217-
case 'nobr':
218-
$value = '<span class="nobr">' . $value . '</span>';
219-
break;
216+
if (array_shift($decorators) === 'nobr') {
217+
$value = '<span class="nobr">' . $value . '</span>';
220218
}
221219
if (!empty($decorators)) {
222220
return $this->_applyDecorators($value, $decorators);

app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,18 @@ protected function _registerEvent(Event $event)
176176
*/
177177
protected function _registerCatalogCategoryEvent(Event $event)
178178
{
179-
switch ($event->getType()) {
180-
case Event::TYPE_SAVE:
181-
/** @var Category $category */
182-
$category = $event->getDataObject();
183-
184-
/**
185-
* Check if category has another affected category ids (category move result)
186-
*/
187-
$affectedCategoryIds = $category->getAffectedCategoryIds();
188-
if ($affectedCategoryIds) {
189-
$event->addNewData('catalog_category_flat_affected_category_ids', $affectedCategoryIds);
190-
} else {
191-
$event->addNewData('catalog_category_flat_category_id', $category->getId());
192-
}
193-
194-
break;
179+
if ($event->getType() === Event::TYPE_SAVE) {
180+
/** @var Category $category */
181+
$category = $event->getDataObject();
182+
/**
183+
* Check if category has another affected category ids (category move result)
184+
*/
185+
$affectedCategoryIds = $category->getAffectedCategoryIds();
186+
if ($affectedCategoryIds) {
187+
$event->addNewData('catalog_category_flat_affected_category_ids', $affectedCategoryIds);
188+
} else {
189+
$event->addNewData('catalog_category_flat_category_id', $category->getId());
190+
}
195191
}
196192
return $this;
197193
}

app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ protected function _registerEvent(Mage_Index_Model_Event $event)
100100
break;
101101
}
102102
} elseif ($entity == Mage_Catalog_Model_Resource_Eav_Attribute::ENTITY) {
103-
switch ($event->getType()) {
104-
case Mage_Index_Model_Event::TYPE_SAVE:
105-
$this->_registerCatalogAttributeSaveEvent($event);
106-
break;
103+
if ($event->getType() === Mage_Index_Model_Event::TYPE_SAVE) {
104+
$this->_registerCatalogAttributeSaveEvent($event);
107105
}
108106
} elseif ($entity == Mage_Catalog_Model_Convert_Adapter_Product::ENTITY) {
109107
$event->addNewData('catalog_product_eav_reindex_all', true);

app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,8 @@ protected function _registerEvent(Mage_Index_Model_Event $event)
192192
$process->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX);
193193
break;
194194
case Mage_Catalog_Model_Product_Flat_Indexer::ENTITY:
195-
switch ($event->getType()) {
196-
case Mage_Catalog_Model_Product_Flat_Indexer::EVENT_TYPE_REBUILD:
197-
$event->addNewData('id', $event->getDataObject()->getId());
195+
if ($event->getType() === Mage_Catalog_Model_Product_Flat_Indexer::EVENT_TYPE_REBUILD) {
196+
$event->addNewData('id', $event->getDataObject()->getId());
198197
}
199198
break;
200199
}

app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,8 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event)
206206
*/
207207
protected function _registerCatalogInventoryStockItemEvent(Mage_Index_Model_Event $event)
208208
{
209-
switch ($event->getType()) {
210-
case Mage_Index_Model_Event::TYPE_SAVE:
211-
$this->_registerStockItemSaveEvent($event);
212-
break;
209+
if ($event->getType() === Mage_Index_Model_Event::TYPE_SAVE) {
210+
$this->_registerStockItemSaveEvent($event);
213211
}
214212
}
215213

app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,22 +208,20 @@ protected function _registerEvent(Mage_Index_Model_Event $event)
208208
*/
209209
protected function _registerCatalogCategoryEvent(Mage_Index_Model_Event $event)
210210
{
211-
switch ($event->getType()) {
212-
case Mage_Index_Model_Event::TYPE_SAVE:
213-
/** @var Mage_Catalog_Model_Category $category */
214-
$category = $event->getDataObject();
215-
$productIds = $category->getAffectedProductIds();
216-
if ($productIds) {
217-
$event->addNewData('catalogsearch_category_update_product_ids', $productIds);
218-
$event->addNewData('catalogsearch_category_update_category_ids', [$category->getId()]);
219-
} else {
220-
$movedCategoryId = $category->getMovedCategoryId();
221-
if ($movedCategoryId) {
222-
$event->addNewData('catalogsearch_category_update_product_ids', []);
223-
$event->addNewData('catalogsearch_category_update_category_ids', [$movedCategoryId]);
224-
}
211+
if ($event->getType() === Mage_Index_Model_Event::TYPE_SAVE) {
212+
/** @var Mage_Catalog_Model_Category $category */
213+
$category = $event->getDataObject();
214+
$productIds = $category->getAffectedProductIds();
215+
if ($productIds) {
216+
$event->addNewData('catalogsearch_category_update_product_ids', $productIds);
217+
$event->addNewData('catalogsearch_category_update_category_ids', [$category->getId()]);
218+
} else {
219+
$movedCategoryId = $category->getMovedCategoryId();
220+
if ($movedCategoryId) {
221+
$event->addNewData('catalogsearch_category_update_product_ids', []);
222+
$event->addNewData('catalogsearch_category_update_category_ids', [$movedCategoryId]);
225223
}
226-
break;
224+
}
227225
}
228226

229227
return $this;

app/code/core/Mage/Eav/Model/Attribute/Data/File.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,11 @@ public function outputValue($format = Mage_Eav_Model_Attribute_Data::OUTPUT_FORM
252252
{
253253
$output = '';
254254
$value = $this->getEntity()->getData($this->getAttribute()->getAttributeCode());
255-
if ($value) {
256-
switch ($format) {
257-
case Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_JSON:
258-
$output = [
259-
'value' => $value,
260-
'url_key' => Mage::helper('core')->urlEncode($value),
261-
];
262-
break;
263-
}
255+
if ($value && $format === Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_JSON) {
256+
$output = [
257+
'value' => $value,
258+
'url_key' => Mage::helper('core')->urlEncode($value),
259+
];
264260
}
265261

266262
return $output;

app/code/core/Mage/Persistent/Model/Persistent/Config.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ public function fire()
8686
continue;
8787
}
8888
foreach ($elements as $info) {
89-
switch ($type) {
90-
case 'blocks':
91-
$this->fireOne($info, Mage::getSingleton('core/layout')->getBlock($info['name_in_layout']));
92-
break;
89+
if ($type === 'blocks') {
90+
$this->fireOne($info, Mage::getSingleton('core/layout')->getBlock($info['name_in_layout']));
9391
}
9492
}
9593
}

0 commit comments

Comments
 (0)