Add template files to checks

.github/workflows/check-files.yml

@@ -9,6 +9,9 @@ on:
       php:
         description: "Count changed PHP files"
         value: ${{ jobs.check.outputs.php }}
+      phtml:
+        description: "Count changed Template files"
+        value: ${{ jobs.check.outputs.phtml }}
       xml:
         description: "Count changed XML files"
         value: ${{ jobs.check.outputs.xml }}
@@ -43,6 +46,7 @@ jobs:
     outputs:
       composer: ${{ steps.all.outputs.composer }}
       php: ${{ steps.all.outputs.php }}
+      phtml: ${{ steps.all.outputs.phtml }}
       xml: ${{ steps.all.outputs.xml }}
       workflow: ${{ steps.all.outputs.workflow }}
       phpcs: ${{ steps.all.outputs.phpcs }}
@@ -77,6 +81,7 @@ jobs:
             composer.*
             *.php
             **/*.php
+            **/*.phtml
             **/*.xml
             .github/workflows/**
             **phpcs**
@@ -100,6 +105,10 @@ jobs:
           echo "$count PHP file(s) changed"
           echo "php=$count" >> $GITHUB_OUTPUT
 
+          count="$(grep -oE "*.phtml" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count Template file(s) changed"
+          echo "phtml=$count" >> $GITHUB_OUTPUT
+
           count="$(grep -oE "*.xml" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count XML file(s) changed"
           echo "xml=$count" >> $GITHUB_OUTPUT

.github/workflows/workflow.yml

@@ -7,6 +7,7 @@ on:
       - 'composer.json'
       - 'composer.lock'
       - '**.php'
+      - '**.phtml'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
       - '.phpcs.xml.dist'
@@ -21,6 +22,7 @@ on:
       - 'composer.json'
       - 'composer.lock'
       - '**.php'
+      - '**.phtml'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
       - '.phpcs.xml.dist'
@@ -66,6 +68,7 @@ jobs:
     needs: [check, composer]
     if: |
       needs.check.outputs.php > 0 ||
+      needs.check.outputs.phtml > 0 ||
       needs.check.outputs.php-cs-fixer > 0 ||
       needs.check.outputs.composer > 0 ||
       needs.check.outputs.workflow > 0
@@ -76,6 +79,7 @@ jobs:
     needs: [check, composer, phpcs, php-cs-fixer]
     if: |
       needs.check.outputs.php > 0 ||
+      needs.check.outputs.phtml > 0 ||
       needs.check.outputs.phpstan > 0 ||
       needs.check.outputs.composer > 0 ||
       needs.check.outputs.workflow > 0

.php-cs-fixer.dist.php

@@ -46,7 +46,7 @@
         // There should be no empty lines after class opening brace.
         'no_blank_lines_after_class_opening' => true,
         // There must be a comment when fall-through is intentional in a non-empty case body.
-        'no_break_comment' => true,
+        'no_break_comment' => false,
         // The closing `? >` tag MUST be omitted from files containing only PHP.
         'no_closing_tag' => true,
         // Remove leading slashes in `use` clauses.
@@ -96,12 +96,14 @@
         PhpCsFixer\Finder::create()
             ->in([
                 'app/code/core/Mage/',
+                'app/design/',
                 'lib/Mage/',
                 'lib/Magento/',
                 'lib/Varien/',
                 'shell/',
             ])
             ->name('*.php')
+            ->name('*.phtml')
             ->ignoreDotFiles(true)
             ->ignoreVCS(true)
     );

app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml

@@ -22,7 +22,7 @@
 <script type="text/javascript">
 <!--
 <?php $myBlock = $this->getLayout()->getBlock('roleUsersGrid'); ?>
-<?php if( is_object($myBlock) && $myBlock->getJsObjectName() ): ?>
+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
     var checkBoxes = $H({});
     var warning = false;
     var inRoleUsers = $H(<?php echo $myBlock->_getUsers(true) ?>);

app/design/adminhtml/default/default/template/api/roleinfo.phtml

@@ -17,13 +17,13 @@
  * @copyright   Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */
+/** @var Mage_Adminhtml_Block_Api_Tab_Roleinfo $this */
 
 ?>
 <div class="content-header">
     <table cellspacing="0">
         <tr>
-            <td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0 ) ? ($this->__('Edit Role') . " '{$this->escapeHtml($this->getRoleInfo()->getRoleName())}'") : $this->__('Add New Role') ?></h3></td>
+            <td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo ($this->getRoleId() > 0) ? ($this->__('Edit Role') . " '{$this->escapeHtml($this->getRoleInfo()->getRoleName())}'") : $this->__('Add New Role') ?></h3></td>
             <td class="form-buttons">
             <?php echo $this->getBackButtonHtml() ?>
             <?php echo $this->getResetButtonHtml() ?>

app/design/adminhtml/default/default/template/api/rolesedit.phtml

@@ -29,8 +29,8 @@
         <span class="field-row">
             <label for="all"><?php echo $this->__('Resource Access') ?></label>
             <select id="all" name="all" onchange="$('resources_container').toggle()" class="select">
-                <option value="0" <?php echo ($this->getEverythingAllowed()?'':'selected="selected"'); ?>><?php echo $this->__('Custom') ?></option>
-                <option value="1" <?php echo ($this->getEverythingAllowed()?'selected="selected"':''); ?>><?php echo $this->__('All') ?></option>
+                <option value="0" <?php echo($this->getEverythingAllowed() ? '' : 'selected="selected"'); ?>><?php echo $this->__('Custom') ?></option>
+                <option value="1" <?php echo($this->getEverythingAllowed() ? 'selected="selected"' : ''); ?>><?php echo $this->__('All') ?></option>
             </select>
         </span>
 
@@ -45,7 +45,7 @@
 </div>
 <!-- Draw Resources Tree -->
 <script type="text/javascript">
-<?php if($this->getEverythingAllowed()): ?>
+<?php if ($this->getEverythingAllowed()): ?>
     $('resources_container').hide();
 <?php endif ?>
 Ext.EventManager.onDocumentReady(function() {

app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml

@@ -22,7 +22,7 @@
 <script type="text/javascript">
 <!--
 <?php $myBlock = $this->getLayout()->getBlock('user.roles.grid'); ?>
-<?php if( is_object($myBlock) && $myBlock->getJsObjectName()): ?>
+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
     var radioBoxes = $H({});
     var warning = false;
     var userRoles = $H(<?php echo $myBlock->_getSelectedRoles(true) ?>);

app/design/adminhtml/default/default/template/api/userinfo.phtml

@@ -24,7 +24,7 @@
         <tr>
             <td style="width:50%;">
                 <h3>
-                  <?php if($this->getUser()->getUserId()): ?>
+                  <?php if ($this->getUser()->getUserId()): ?>
                   <?php $_userName = $this->getUser()->getFirstname() . ' ' . $this->getUser()->getLastname() ?>
                   <?php echo $this->__("Edit User '%s'", $_userName) ?>
                   <?php else: ?>

app/design/adminhtml/default/default/template/api/userroles.phtml

@@ -27,14 +27,13 @@
     <?php foreach ($roles as $role): ?>
     <?php
         $checked = false;
-        foreach( $user_roles->getItems() as $user_role )
-        {
-            if( $user_role->getParentId() == $role->getRoleId() ) {
+        foreach ($user_roles->getItems() as $user_role) {
+            if ($user_role->getParentId() == $role->getRoleId()) {
                 $checked = true;
             }
         }
     ?>
-        <input type="checkbox" value="<?php echo $role->getRoleId(); ?>" <?php echo ($checked ? "checked" : ""); ?> name="roles[]" id="_<?php echo $role->getRoleId(); ?>" /> <label for="_<?php echo $role->getRoleId(); ?>" class="normal"><?php echo $role->getRoleName(); ?></label><br />
+        <input type="checkbox" value="<?php echo $role->getRoleId(); ?>" <?php echo($checked ? "checked" : ""); ?> name="roles[]" id="_<?php echo $role->getRoleId(); ?>" /> <label for="_<?php echo $role->getRoleId(); ?>" class="normal"><?php echo $role->getRoleName(); ?></label><br />
     <?php endforeach ?>
     </fieldset>
 </div>

app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml

@@ -17,7 +17,7 @@
  * @copyright   Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/** @var $this Mage_Api2_Block_Adminhtml_Attribute_Buttons */
+/** @var Mage_Api2_Block_Adminhtml_Attribute_Buttons $this */
 
 ?>
 <div class="content-header">

app/design/adminhtml/default/default/template/api2/attribute/resource.phtml

@@ -38,8 +38,8 @@
         <span class="field-row">
             <label for="all"><?php echo $this->__('Resource Access') ?></label>
             <select id="all" name="all" onchange="$('resources_container').toggle()" class="select">
-                <option value="0" <?php echo ($this->getEverythingAllowed()?'':'selected'); ?>><?php echo $this->__('Custom') ?></option>
-                <option value="1" <?php echo ($this->getEverythingAllowed()?'selected':''); ?>><?php echo $this->__('All') ?></option>
+                <option value="0" <?php echo($this->getEverythingAllowed() ? '' : 'selected'); ?>><?php echo $this->__('Custom') ?></option>
+                <option value="1" <?php echo($this->getEverythingAllowed() ? 'selected' : ''); ?>><?php echo $this->__('All') ?></option>
             </select>
         </span>
 
@@ -59,7 +59,7 @@
 <!-- Draw Resources Tree -->
 <script type="text/javascript">
 //<![CDATA[
-<?php if($this->getEverythingAllowed()): ?>
+<?php if ($this->getEverythingAllowed()): ?>
     $('resources_container').hide();
 <?php endif ?>
 Ext.EventManager.onDocumentReady(function() {

app/design/adminhtml/default/default/template/api2/role/buttons.phtml

@@ -18,7 +18,7 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php /** @var $this Mage_Adminhtml_Block_Api_Tab_Roleinfo */ ?>
+<?php /** @var Mage_Adminhtml_Block_Api_Tab_Roleinfo $this */ ?>
 <div class="content-header">
     <table cellspacing="0">
         <tr>

app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml

@@ -23,7 +23,7 @@
 <script type="text/javascript">
 //<![CDATA[
 <?php
-    /** @var $myBlock Mage_Api2_Block_Adminhtml_Roles_Tab_Users */
+    /** @var Mage_Api2_Block_Adminhtml_Roles_Tab_Users $myBlock */
     $myBlock = $this->getLayout()->getBlock('adminhtml.role.edit.tab.users');
     $name = $myBlock->getJsObjectName();
 ?>

app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml

@@ -20,12 +20,12 @@
  */
 
 /**
- * @var $this Mage_Authorizenet_Block_Directpost_Iframe
+ * @var Mage_Authorizenet_Block_Directpost_Iframe $this
  */
 ?>
 <?php
 $_params = $this->getParams();
-/* @var $_helper Mage_Authorizenet_Helper_Admin  */
+/** @var Mage_Authorizenet_Helper_Admin $_helper */
 $_helper = $this->helper('authorizenet/admin');
 ?>
 <html>

app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml

@@ -42,7 +42,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderAdminUrl();
             <?php $_ccType = $_form->getInfoData('cc_type') ?>
                 <option value=""></option>
             <?php foreach ($_form->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                <option value="<?php echo $_typeCode ?>" <?php if($_typeCode==$_ccType): ?>selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                <option value="<?php echo $_typeCode ?>" <?php if ($_typeCode==$_ccType): ?>selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
             <?php endforeach ?>
             </select>
         </div>
@@ -59,18 +59,18 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderAdminUrl();
             <select id="<?php echo $_code ?>_expiration" style="width:140px;" name="payment[cc_exp_month]" class="validate-cc-exp required-entry">
             <?php $_ccExpMonth = $_form->getInfoData('cc_exp_month') ?>
             <?php foreach ($_form->getCcMonths() as $k=>$v): ?>
-                <option value="<?php echo $k ?>" <?php if($k==$_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                <option value="<?php echo $k ?>" <?php if ($k==$_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
             <?php endforeach ?>
             </select>
             <?php $_ccExpYear = $_form->getInfoData('cc_exp_year') ?>
             <select id="<?php echo $_code ?>_expiration_yr" style="width:103px;" name="payment[cc_exp_year]" class="required-entry">
             <?php foreach ($_form->getCcYears() as $k=>$v): ?>
-                <option value="<?php echo $k ? $k : '' ?>" <?php if($k==$_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                <option value="<?php echo $k ? $k : '' ?>" <?php if ($k==$_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
             <?php endforeach ?>
             </select>
         </div>
     </li>
-    <?php if($_form->hasVerification()): ?>
+    <?php if ($_form->hasVerification()): ?>
     <li>
         <div class="input-box">
             <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml

@@ -20,7 +20,7 @@
  */
 ?>
 
-<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Bundle */ ?>
+<?php /** @var Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Bundle $this */ ?>
 <?php $options = Mage::helper('core')->decorateArray($this->getOptions()); ?>
 <?php if (count($options)): ?>
 <div id="catalog_product_composite_configure_fields_bundle" class="<?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml

@@ -20,22 +20,32 @@
  */
 
 ?>
-<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox */ ?>
+<?php /** @var Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox $this */ ?>
 <?php $_option = $this->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
-<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
+<dt><label<?php if ($_option->getRequired()) {
+    echo ' class="required"';
+} ?>><?php if ($_option->getRequired()) {
+    echo '<em>*</em>';
+} ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
+<dd<?php if ($_option->decoratedIsLast) {?> class="last"<?php }?>>
     <div class="input-box">
     <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
         <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" price="<?php echo $this->getSelectionPrice($_selections[0]) ?>"'/>
     <?php else: ?>
         <ul class="options-list">
-        <?php foreach($_selections as $_selection): ?>
-            <li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->_isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>"/>
+        <?php foreach ($_selections as $_selection): ?>
+            <li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) {
+    echo 'validate-one-required-by-name';
+} ?>" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->_isSelected($_selection)) {
+    echo ' checked="checked"';
+} ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
+    echo ' disabled="disabled"';
+} ?> value="<?php echo $_selection->getSelectionId() ?>" onclick="ProductConfigure.bundleControl.changeSelection(this)" price="<?php echo $this->getSelectionPrice($_selection) ?>"/>
                 <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
-                <?php if($_option->getRequired()): ?>
+                <?php if ($_option->getRequired()): ?>
                     <?php echo $this->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
                 <?php endif ?>
             </li>

app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml

@@ -20,23 +20,33 @@
  */
 
 ?>
-<?php /* @var $this Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi */ ?>
+<?php /** @var Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi $this */ ?>
 <?php $_option = $this->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php if ($_option->getRequired()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
-<dd<?php if ($_option->decoratedIsLast){?> class="last"<?php }?>>
+<dt><label<?php if ($_option->getRequired()) {
+    echo ' class="required"';
+} ?>><?php if ($_option->getRequired()) {
+    echo '<em>*</em>';
+} ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
+<dd<?php if ($_option->decoratedIsLast) {?> class="last"<?php }?>>
     <div class="input-box">
     <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
         <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
         <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" price="<?php echo $this->getSelectionPrice($_selections[0]) ?>"/>
     <?php else: ?>
-        <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> bundle-option-select multiselect change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
-        <?php if(!$_option->getRequired()): ?>
+        <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) {
+    echo ' required-entry';
+} ?> bundle-option-select multiselect change-container-classname" onchange="ProductConfigure.bundleControl.changeSelection(this)">
+        <?php if (!$_option->getRequired()): ?>
             <option value=""><?php echo $this->__('None') ?></option>
         <?php endif ?>
         <?php foreach ($_selections as $_selection): ?>
-            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $this->getSelectionPrice($_selection) ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
+            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->_isSelected($_selection)) {
+    echo ' selected="selected"';
+} ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
+    echo ' disabled="disabled"';
+} ?> price="<?php echo $this->getSelectionPrice($_selection) ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
         <?php endforeach ?>
         </select>
     <?php endif ?>