Skip to content

rector: added phtml-files #4765

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 4 commits into from
Apr 23, 2025
Merged

rector: added phtml-files #4765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b2e907
rector: added template files
sreichel Apr 11, 2025
b2f796a
Merge branch 'OpenMage:main' into rector-phtml
sreichel Apr 20, 2025
6d94080
Merge branch 'main' into rector-phtml
sreichel Apr 21, 2025
8b34d12
Merge branch 'main' into rector-phtml
sreichel Apr 21, 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
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 @@ -21,6 +21,7 @@

try {
return RectorConfig::configure()
->withFileExtensions(['php', 'phtml'])
->withCache(
cacheDirectory: '.rector.result.cache',
cacheClass: FileCacheStorage::class,
Expand Down
2 changes: 1 addition & 1 deletion ...nhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
<?php [$_defaultQty, $_canChangeQty] = $this->_getDefaultValues(); ?>

<dt>
<span class="qty-holder">
Expand Down
2 changes: 1 addition & 1 deletion ...html/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
<?php [$_defaultQty, $_canChangeQty] = $this->_getDefaultValues(); ?>

<dt>
<span class="qty-holder">
Expand Down
2 changes: 1 addition & 1 deletion ...nhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<?php $_fieldNameAction = $_fileName . '_action'; ?>
<?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
<?php $_fileNamed = $_fileName . '_name'; ?>
<?php $_rand = rand(); ?>
<?php $_rand = random_int(0, mt_getrandmax()); ?>

<script type="text/javascript">
//<![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<th><?php echo Mage::helper('catalog')->__('Label') ?></th>
<th><?php echo Mage::helper('catalog')->__('Sort Order') ?></th>
<?php foreach ($this->getImageTypes() as $typeId => $type): ?>
<th><?php echo $this->escapeHtml($type['label'], array('br')); ?></th>
<th><?php echo $this->escapeHtml($type['label'], ['br']); ?></th>
<?php endforeach ?>
<th><?php echo Mage::helper('catalog')->__('Exclude') ?></th>
<th class="last"><?php echo Mage::helper('catalog')->__('Remove') ?></th>
Expand Down
4 changes: 2 additions & 2 deletions app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ $_rates = ( $_newRates ) ? $_newRates : $_oldRates;
<?php if( ++$_j == 1 ): ?>
<td class="a-right"><strong><?php echo $this->escapeHtml($_currencyCode) ?></strong></td>
<td class="a-right">
<input type="text" name="rate[<?php echo $this->escapeHtml($_currencyCode) ?>][<?php echo $this->escapeHtml($_rate) ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
<input type="text" name="rate[<?php echo $this->escapeHtml($_currencyCode) ?>][<?php echo $this->escapeHtml($_rate) ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : ($_oldRates[$_currencyCode][$_rate] ?? '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
<?php if( isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate]) ): ?>
<br /><span class="old-rate"><?php echo $this->__('Old rate:') ?> <?php echo $_oldRates[$_currencyCode][$_rate] ?></span>
<?php endif ?>
</td>
<?php else: ?>
<td class="a-right">
<input type="text" name="rate[<?php echo $this->escapeHtml($_currencyCode) ?>][<?php echo $this->escapeHtml($_rate) ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
<input type="text" name="rate[<?php echo $this->escapeHtml($_currencyCode) ?>][<?php echo $this->escapeHtml($_rate) ?>]" value="<?php echo ( $_currencyCode == $_rate ) ? '1.0000' : ($_value>0 ? $_value : ($_oldRates[$_currencyCode][$_rate] ?? '')) ?>" <?php echo ( $_currencyCode == $_rate ) ? 'class="input-text input-text-disabled" readonly="true"' : 'class="input-text"' ?> />
<?php if( isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate]) ): ?>
<br /><span class="old-rate"><?php echo $this->__('Old rate:') ?> <?php echo $_oldRates[$_currencyCode][$_rate] ?></span>
<?php endif ?>
Expand Down
6 changes: 3 additions & 3 deletions app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ $_taxHelper = $this->helper('tax');
$_product = $this->getProduct();
$_priceModel = $_product->getPriceModel();

list($_minimalPriceTax, $_maximalPriceTax) = $_priceModel->getTotalPrices($_product, null, null, false);
list($_minimalPriceInclTax, $_maximalPriceInclTax) = $_priceModel->getTotalPrices($_product, null, true, false);
[$_minimalPriceTax, $_maximalPriceTax] = $_priceModel->getTotalPrices($_product, null, null, false);
[$_minimalPriceInclTax, $_maximalPriceInclTax] = $_priceModel->getTotalPrices($_product, null, true, false);

$_weeeTaxAmount = 0;
?>
Expand Down Expand Up @@ -117,7 +117,7 @@ if ($_product->getPriceType() == 1) {
<?php endif ?>
</p>
<?php else: ?>
<?php if ($_minimalPriceTax <> $_maximalPriceTax): ?>
<?php if ($_minimalPriceTax != $_maximalPriceTax): ?>
<p class="price-from">
<span class="price-label"><?php echo $this->__('From') ?>:</span>
<?php if ($this->displayBothPrices()): ?>
Expand Down
2 changes: 1 addition & 1 deletion ...frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $_option = $this->getOption(); ?>
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
<?php [$_defaultQty, $_canChangeQty] = $this->_getDefaultValues(); ?>
<?php $tierPriceHtml = ''; ?>

<dt>
Expand Down
2 changes: 1 addition & 1 deletion ...rontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $_option = $this->getOption(); ?>
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
<?php [$_defaultQty, $_canChangeQty] = $this->_getDefaultValues(); ?>
<?php $tierPriceHtml = ''; ?>

<dt>
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
?>

<?php $_product = $this->getProduct() ?>
<?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
<?php [$_minimalPrice, $_maximalPrice] = $_product->getPriceModel()->getPrices($_product) ?>
<?php $_id = $_product->getId() ?>

<?php
Expand Down Expand Up @@ -122,7 +122,7 @@ if ($_product->getPriceType() == 1) {
<?php endif ?>
</p>
<?php else: ?>
<?php if ($_minimalPrice <> $_maximalPrice): ?>
<?php if ($_minimalPrice != $_maximalPrice): ?>
<p class="price-from">
<span class="price-label"><?php echo $this->__('From') ?>:</span>
<?php if ($this->helper('tax')->displayBothPrices()): ?>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
<dd><?php echo $this->escapeHtml( ($_option['print_value'] ?? $_option['value']) ) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
<dd><?php echo $this->escapeHtml( ($_option['print_value'] ?? $_option['value']) ) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<?php $_fieldNameAction = $_fileName . '_action'; ?>
<?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
<?php $_fileNamed = $_fileName . '_name'; ?>
<?php $_rand = rand(); ?>
<?php $_rand = random_int(0, mt_getrandmax()); ?>

<script type="text/javascript">
//<![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion ...se/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion .../base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion ...frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion ...design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dd>
<?php else: ?>
<dd>
<?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
<?php echo nl2br($this->escapeHtml( ($_option['print_value'] ?? $_option['value']) )) ?>
</dd>
<?php endif ?>
<?php endforeach ?>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
<dd><?php echo $this->escapeHtml( ($_option['print_value'] ?? $_option['value']) ) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/base/default/template/shipping/tracking/popup.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@
<?php $_detailDate = (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?>
<?php $_detailTime = (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime'], $_detail['deliverydate']) : '') ?>
<tr>
<td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
<td><?php echo ($_detail['deliverylocation'] ?? ''); ?></td>
<td><span class="nobr"><?php echo $_detailDate ?></span></td>
<td><span class="nobr"><?php echo $_detailTime ?></span></td>
<td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
<td><?php echo ($_detail['activity'] ?? '') ?></td>
</tr>
<?php endforeach ?>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion ...frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $_option = $this->getOption(); ?>
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->_getDefaultValues(); ?>
<?php [$_defaultQty, $_canChangeQty] = $this->_getDefaultValues(); ?>
<?php $tierPriceHtml = ''; ?>

<dt>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
<dd><?php echo $this->escapeHtml( ($_option['print_value'] ?? $_option['value']) ) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion .../frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<?php endif ?>
</dd>
<?php else: ?>
<dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<dd><?php echo $this->escapeHtml(($_option['print_value'] ?? $_option['value'])) ?></dd>
<?php endif ?>
<?php endforeach ?>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dd>
<?php else: ?>
<dd>
<?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
<?php echo nl2br($this->escapeHtml( ($_option['print_value'] ?? $_option['value']) )) ?>
</dd>
<?php endif ?>
<?php endforeach ?>
Expand Down
Loading