Skip to content

rector: ChangeSwitchToMatchRector #4835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 7, 2025
Merged

rector: ChangeSwitchToMatchRector #4835

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59ee94a
rector: `ChangeSwitchToMatchRector`
sreichel Jun 20, 2025
c688ade
sonar
sreichel Jun 26, 2025
00545e5
sonar
sreichel Jun 26, 2025
2abbdc8
phpstan
sreichel Jun 26, 2025
f881c0a
Merge branch 'main' into rector/php80/ChangeSwitchToMatchRector
sreichel Jun 28, 2025
fab15ff
simpler
sreichel Jul 5, 2025
e489901
Merge remote-tracking branch 'origin/rector/php80/ChangeSwitchToMatch…
sreichel Jul 5, 2025
624ae7c
Merge branch 'main' into rector/php80/ChangeSwitchToMatchRector
sreichel Jul 6, 2025
110da31
Merge branch 'main' into rector/php80/ChangeSwitchToMatchRector
sreichel Jul 6, 2025
2b9c35b
fix
sreichel Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2628,12 +2628,6 @@ parameters:
count: 2
path: app/code/core/Mage/Core/Model/Domainpolicy.php

-
message: '#^Method Zend_Mail\:\:addBcc\(\) invoked with 2 parameters, 1 required\.$#'
identifier: arguments.count
count: 1
path: app/code/core/Mage/Core/Model/Email/Queue.php

-
message: '#^Method Mage_Core_Model_Email_Template\:\:getProcessedTemplate\(\) invoked with 2 parameters, 0\-1 required\.$#'
identifier: arguments.count
Expand Down
1 change: 1 addition & 0 deletions .rector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
DeadCode\ClassMethod\RemoveUselessReturnTagRector::class,
DeadCode\Property\RemoveUselessVarTagRector::class,
DeadCode\StaticCall\RemoveParentCallWithoutParentRector::class,
Php80\Switch_\ChangeSwitchToMatchRector::class,
])
->withPreparedSets(
deadCode: false,
Expand Down
32 changes: 10 additions & 22 deletions app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,20 +177,12 @@ protected function _addColumnFilterToCollection($column)
$collection = $this->getCollection();
$value = $column->getFilter()->getValue();
if ($collection && $value) {
switch ($column->getId()) {
case 'product_name':
$collection->addProductNameFilter($value);
break;
case 'store':
$collection->addStoreFilter($value);
break;
case 'days':
$collection->addDaysFilter($value);
break;
default:
$collection->addFieldToFilter($column->getIndex(), $column->getFilter()->getCondition());
break;
}
match ($column->getId()) {
'product_name' => $collection->addProductNameFilter($value),
'store' => $collection->addStoreFilter($value),
'days' => $collection->addDaysFilter($value),
default => $collection->addFieldToFilter($column->getIndex(), $column->getFilter()->getCondition()),
};
}
return $this;
}
Expand All @@ -205,14 +197,10 @@ protected function _setCollectionOrder($column)
{
$collection = $this->getCollection();
if ($collection) {
switch ($column->getId()) {
case 'product_name':
$collection->setOrderByProductName($column->getDir());
break;
default:
parent::_setCollectionOrder($column);
break;
}
match ($column->getId()) {
'product_name' => $collection->setOrderByProductName($column->getDir()),
default => parent::_setCollectionOrder($column),
};
}
return $this;
}
Expand Down
38 changes: 12 additions & 26 deletions app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,13 @@ protected function _getFormat()
try {
$localeCode = Mage::app()->getLocale()->getLocaleCode();
$localeData = new Zend_Locale_Data();
switch ($this->getColumn()->getPeriodType()) {
case 'month':
self::$_format = $localeData::getContent($localeCode, 'dateitem', 'yM');
break;

case 'year':
self::$_format = $localeData::getContent($localeCode, 'dateitem', 'y');
break;

default:
self::$_format = Mage::app()->getLocale()->getDateFormat(
Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
);
break;
}
self::$_format = match ($this->getColumn()->getPeriodType()) {
'month' => $localeData::getContent($localeCode, 'dateitem', 'yM'),
'year' => $localeData::getContent($localeCode, 'dateitem', 'y'),
default => Mage::app()->getLocale()->getDateFormat(
Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
),
};
} catch (Exception $e) {
}
}
Expand All @@ -58,17 +50,11 @@ protected function _getFormat()
public function render(Varien_Object $row)
{
if ($data = $row->getData($this->getColumn()->getIndex())) {
switch ($this->getColumn()->getPeriodType()) {
case 'month':
$dateFormat = 'yyyy-MM';
break;
case 'year':
$dateFormat = 'yyyy';
break;
default:
$dateFormat = Varien_Date::DATE_INTERNAL_FORMAT;
break;
}
$dateFormat = match ($this->getColumn()->getPeriodType()) {
'month' => 'yyyy-MM',
'year' => 'yyyy',
default => Varien_Date::DATE_INTERNAL_FORMAT,
};

$format = $this->_getFormat();
try {
Expand Down
28 changes: 12 additions & 16 deletions app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,18 @@ public function getSubmitUrl()

public function canSendCommentEmail()
{
switch ($this->getParentType()) {
case 'invoice':
return Mage::helper('sales')->canSendInvoiceCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
);
case 'shipment':
return Mage::helper('sales')->canSendShipmentCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
);
case 'creditmemo':
return Mage::helper('sales')->canSendCreditmemoCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
);
}

return true;
return match ($this->getParentType()) {
'invoice' => Mage::helper('sales')->canSendInvoiceCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
),
'shipment' => Mage::helper('sales')->canSendShipmentCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
),
'creditmemo' => Mage::helper('sales')->canSendCreditmemoCommentEmail(
$this->getEntity()->getOrder()->getStore()->getId(),
),
default => true,
};
}

/**
Expand Down
16 changes: 6 additions & 10 deletions app/code/core/Mage/Adminhtml/Block/System/Config/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,16 +588,12 @@ protected function _canShowField($field)
if ($ifModuleEnabled && !$this->isModuleEnabled($ifModuleEnabled)) {
return false;
}

switch ($this->getScope()) {
case self::SCOPE_DEFAULT:
return (bool) (int) $field->show_in_default;
case self::SCOPE_WEBSITES:
return (bool) (int) $field->show_in_website;
case self::SCOPE_STORES:
return (bool) (int) $field->show_in_store;
}
return true;
return match ($this->getScope()) {
self::SCOPE_DEFAULT => (bool) (int) $field->show_in_default,
self::SCOPE_WEBSITES => (bool) (int) $field->show_in_website,
self::SCOPE_STORES => (bool) (int) $field->show_in_store,
default => true,
};
}

/**
Expand Down
18 changes: 5 additions & 13 deletions app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,15 @@ public function __construct()
{
parent::__construct();

switch ($this->getRequest()->getParam('ret')) {
case 'all':
$url = $this->getUrl('*/*/');
break;

case 'pending':
$url = $this->getUrl('*/*/pending');
break;

default:
$url = $this->getUrl('*/*/');
}
$route = match ($this->getRequest()->getParam('ret')) {
'pending' => '*/*/pending',
default => '*/*/',
};

$this->_block = 'tag_customer';
$this->_controller = 'tag_customer';
$this->_removeButton('add');
$this->setBackUrl($url);
$this->setBackUrl($this->getUrl($route));
$this->_addBackButton();

$tagInfo = Mage::getModel('tag/tag')
Expand Down
18 changes: 5 additions & 13 deletions app/code/core/Mage/Adminhtml/Block/Tag/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,15 @@ public function __construct()
{
parent::__construct();

switch ($this->getRequest()->getParam('ret')) {
case 'all':
$url = $this->getUrl('*/*/');
break;

case 'pending':
$url = $this->getUrl('*/*/pending');
break;

default:
$url = $this->getUrl('*/*/');
}
$route = match ($this->getRequest()->getParam('ret')) {
'pending' => '*/*/pending',
default => '*/*/',
};

$this->_block = 'tag_product';
$this->_controller = 'tag_product';
$this->_removeButton('add');
$this->setBackUrl($url);
$this->setBackUrl($this->getUrl($route));
$this->_addBackButton();

$tagInfo = Mage::getModel('tag/tag')
Expand Down
138 changes: 35 additions & 103 deletions app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,67 +245,27 @@ protected function _getRendererByType()
if (is_array($renderers) && isset($renderers[$type])) {
return $renderers[$type];
}

switch ($type) {
case 'date':
$rendererClass = 'adminhtml/widget_grid_column_renderer_date';
break;
case 'datetime':
$rendererClass = 'adminhtml/widget_grid_column_renderer_datetime';
break;
case 'number':
$rendererClass = 'adminhtml/widget_grid_column_renderer_number';
break;
case 'currency':
$rendererClass = 'adminhtml/widget_grid_column_renderer_currency';
break;
case 'price':
$rendererClass = 'adminhtml/widget_grid_column_renderer_price';
break;
case 'country':
$rendererClass = 'adminhtml/widget_grid_column_renderer_country';
break;
case 'concat':
$rendererClass = 'adminhtml/widget_grid_column_renderer_concat';
break;
case 'action':
$rendererClass = 'adminhtml/widget_grid_column_renderer_action';
break;
case 'options':
$rendererClass = 'adminhtml/widget_grid_column_renderer_options';
break;
case 'checkbox':
$rendererClass = 'adminhtml/widget_grid_column_renderer_checkbox';
break;
case 'massaction':
$rendererClass = 'adminhtml/widget_grid_column_renderer_massaction';
break;
case 'radio':
$rendererClass = 'adminhtml/widget_grid_column_renderer_radio';
break;
case 'input':
$rendererClass = 'adminhtml/widget_grid_column_renderer_input';
break;
case 'select':
$rendererClass = 'adminhtml/widget_grid_column_renderer_select';
break;
case 'text':
$rendererClass = 'adminhtml/widget_grid_column_renderer_longtext';
break;
case 'store':
$rendererClass = 'adminhtml/widget_grid_column_renderer_store';
break;
case 'wrapline':
$rendererClass = 'adminhtml/widget_grid_column_renderer_wrapline';
break;
case 'theme':
$rendererClass = 'adminhtml/widget_grid_column_renderer_theme';
break;
default:
$rendererClass = 'adminhtml/widget_grid_column_renderer_text';
break;
}
return $rendererClass;
return match ($type) {
'date' => 'adminhtml/widget_grid_column_renderer_date',
'datetime' => 'adminhtml/widget_grid_column_renderer_datetime',
'number' => 'adminhtml/widget_grid_column_renderer_number',
'currency' => 'adminhtml/widget_grid_column_renderer_currency',
'price' => 'adminhtml/widget_grid_column_renderer_price',
'country' => 'adminhtml/widget_grid_column_renderer_country',
'concat' => 'adminhtml/widget_grid_column_renderer_concat',
'action' => 'adminhtml/widget_grid_column_renderer_action',
'options' => 'adminhtml/widget_grid_column_renderer_options',
'checkbox' => 'adminhtml/widget_grid_column_renderer_checkbox',
'massaction' => 'adminhtml/widget_grid_column_renderer_massaction',
'radio' => 'adminhtml/widget_grid_column_renderer_radio',
'input' => 'adminhtml/widget_grid_column_renderer_input',
'select' => 'adminhtml/widget_grid_column_renderer_select',
'text' => 'adminhtml/widget_grid_column_renderer_longtext',
'store' => 'adminhtml/widget_grid_column_renderer_store',
'wrapline' => 'adminhtml/widget_grid_column_renderer_wrapline',
'theme' => 'adminhtml/widget_grid_column_renderer_theme',
default => 'adminhtml/widget_grid_column_renderer_text',
};
}

/**
Expand Down Expand Up @@ -346,48 +306,20 @@ protected function _getFilterByType()
if (is_array($filters) && isset($filters[$type])) {
return $filters[$type];
}

switch ($type) {
case 'datetime':
$filterClass = 'adminhtml/widget_grid_column_filter_datetime';
break;
case 'date':
$filterClass = 'adminhtml/widget_grid_column_filter_date';
break;
case 'range':
case 'number':
case 'currency':
$filterClass = 'adminhtml/widget_grid_column_filter_range';
break;
case 'price':
$filterClass = 'adminhtml/widget_grid_column_filter_price';
break;
case 'country':
$filterClass = 'adminhtml/widget_grid_column_filter_country';
break;
case 'options':
$filterClass = 'adminhtml/widget_grid_column_filter_select';
break;
case 'massaction':
$filterClass = 'adminhtml/widget_grid_column_filter_massaction';
break;
case 'checkbox':
$filterClass = 'adminhtml/widget_grid_column_filter_checkbox';
break;
case 'radio':
$filterClass = 'adminhtml/widget_grid_column_filter_radio';
break;
case 'store':
$filterClass = 'adminhtml/widget_grid_column_filter_store';
break;
case 'theme':
$filterClass = 'adminhtml/widget_grid_column_filter_theme';
break;
default:
$filterClass = 'adminhtml/widget_grid_column_filter_text';
break;
}
return $filterClass;
return match ($type) {
'datetime' => 'adminhtml/widget_grid_column_filter_datetime',
'date' => 'adminhtml/widget_grid_column_filter_date',
'range', 'number', 'currency' => 'adminhtml/widget_grid_column_filter_range',
'price' => 'adminhtml/widget_grid_column_filter_price',
'country' => 'adminhtml/widget_grid_column_filter_country',
'options' => 'adminhtml/widget_grid_column_filter_select',
'massaction' => 'adminhtml/widget_grid_column_filter_massaction',
'checkbox' => 'adminhtml/widget_grid_column_filter_checkbox',
'radio' => 'adminhtml/widget_grid_column_filter_radio',
'store' => 'adminhtml/widget_grid_column_filter_store',
'theme' => 'adminhtml/widget_grid_column_filter_theme',
default => 'adminhtml/widget_grid_column_filter_text',
};
}

/**
Expand Down
Loading
Loading