rector: added template files (#4765)

sreichel · web-flow · commit f04ef67fa029 · 2025-04-23T17:16:59.000+03:00
diff --git a/.rector.php b/.rector.php
@@ -21,6 +21,7 @@
 
 try {
     return RectorConfig::configure()
+        ->withFileExtensions(['php', 'phtml'])
         ->withCache(
             cacheDirectory: '.rector.result.cache',
             cacheClass: FileCacheStorage::class,
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
@@ -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">
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
@@ -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">
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
@@ -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[
diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
@@ -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>
diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml b/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
@@ -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 ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
@@ -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;
 ?>
@@ -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()): ?>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml b/app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml
@@ -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
@@ -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()): ?>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/base/default/template/bundle/sales/order/shipment/items/renderer.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml b/app/design/frontend/base/default/template/catalog/product/view/options/type/file.phtml
@@ -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[
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml
@@ -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 ?>
diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
@@ -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>
diff --git a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/rwd/default/template/bundle/sales/order/items/renderer.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/rwd/default/template/downloadable/sales/order/items/renderer/downloadable.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -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>
diff --git a/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/rwd/default/template/sales/order/items/renderer/default.phtml
@@ -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 ?>
