Fix newlines after comments

jissereitsma · jissereitsma · commit a42cfe17bffd · 2025-08-18T16:32:21.000+02:00
diff --git a/view/adminhtml/templates/form.phtml b/view/adminhtml/templates/form.phtml
@@ -17,24 +17,20 @@ if (!isset($viewModel)) {
 }
 ?>
 <div class="loki-form form">
-    <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.form.actions', ['view_model' => $viewModel]) ?>
+    <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.actions', ['view_model' => $viewModel]) ?>
 
     <div class="page-columns">
         <div class="main-col">
-            <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.form.spinner') ?>
-            <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.form.inner') ?>
+            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.spinner') ?>
+            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.inner') ?>
 
             <div class="entry-edit form-inline">
                 <div class="fieldset-wrapper">
                     <h1><?= $escaper->escapeHtml($block->getLabel()) ?></h1>
                     <div class="admin__fieldset-wrapper-content">
                         <fieldset class="admin__fieldset">
                             <?php foreach ($viewModel->getFields() as $field) : ?>
-                                <?= /* @noEscape */
-$templateRenderer->html(
+                                <?= /* @noEscape */ $templateRenderer->html(
                                     $block,
                                     'Loki_AdminComponents::form/field.phtml',
                                     ['field' => $field]
diff --git a/view/adminhtml/templates/form/field.phtml b/view/adminhtml/templates/form/field.phtml
@@ -26,8 +26,7 @@ if (false === $field instanceof Field) {
     </div>
 
     <div class="admin__field-control">
-        <?= /* @noEscape */
-$templateRenderer->html(
+        <?= /* @noEscape */ $templateRenderer->html(
             $block,
             $field->getFieldType()->getTemplate(),
             ['field' => $field]
diff --git a/view/adminhtml/templates/form/field_type/select.phtml b/view/adminhtml/templates/form/field_type/select.phtml
@@ -30,8 +30,7 @@ $fieldType = $field->getFieldType();
     @change="setValue"
 >
     <?php if (!empty($emptyOption)): ?>
-        <?= /* @noEscape */
-$templateRenderer->html(
+        <?= /* @noEscape */ $templateRenderer->html(
             $block,
             'Loki_AdminComponents::form/field_type/select/option.phtml',
             [
@@ -45,8 +44,7 @@ $templateRenderer->html(
     <?php endif; ?>
     <?php foreach ($options->toOptionArray() as $option) : ?>
         <?= $option['level'] = 0; ?>
-        <?= /* @noEscape */
-        $templateRenderer->html(
+        <?= /* @noEscape */ $templateRenderer->html(
             $block,
             'Loki_AdminComponents::form/field_type/select/option.phtml',
             ['option' => $option]
diff --git a/view/adminhtml/templates/form/field_type/select/option.phtml b/view/adminhtml/templates/form/field_type/select/option.phtml
@@ -14,8 +14,7 @@ $option = $block->getOption();
     <optgroup label="<?= $escaper->escapeHtml(str_repeat('&nbsp;', $option['level'])) ?><?= $option['label'] ?>"></optgroup>
     <?php foreach ($option['value'] as $suboption): ?>
         <?= $suboption['level'] = $option['level'] + 1; ?>
-        <?= /* @noEscape */
-$templateRenderer->html(
+        <?= /* @noEscape */ $templateRenderer->html(
             $block,
             'Loki_AdminComponents::form/field_type/select/option.phtml',
             ['option' => $suboption]
diff --git a/view/adminhtml/templates/form/field_type/text.phtml b/view/adminhtml/templates/form/field_type/text.phtml
@@ -26,9 +26,7 @@ if (isset($htmlAttributes['type'])) {
     name="<?= $escaper->escapeHtml($field->getCode()) ?>"
     data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
     <?php foreach ($htmlAttributes as $htmlAttributeName => $htmlAttributeValue) : ?>
-        <?= /* @noEscape */
-$htmlAttributeName ?>="<?= /* @noEscape */
-$htmlAttributeValue ?>"
+        <?= /* @noEscape */ $htmlAttributeName ?>="<?= /* @noEscape */ $htmlAttributeValue ?>"
     <?php endforeach; ?>
     :value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
     @change="setValue"
diff --git a/view/adminhtml/templates/form/fieldset.phtml b/view/adminhtml/templates/form/fieldset.phtml
@@ -10,8 +10,7 @@ use Magento\Framework\View\Element\Template;
         <h1><?= $escaper->escapeHtml($block->getLabel()) ?></h1>
         <div class="admin__fieldset-wrapper-content">
             <fieldset class="admin__fieldset">
-                <?= /* @noEscape */
-$block->getChildHtml() ?>
+                <?= /* @noEscape */ $block->getChildHtml() ?>
             </fieldset>
         </div>
     </div>
diff --git a/view/adminhtml/templates/form/inner.phtml b/view/adminhtml/templates/form/inner.phtml
@@ -7,6 +7,5 @@ use Magento\Framework\View\Element\Template;
 
 ?>
 <div class="form-inner">
-    <?= /* @noEscape */
-$block->getChildHtml() ?>
+    <?= /* @noEscape */ $block->getChildHtml() ?>
 </div>
diff --git a/view/adminhtml/templates/grid.phtml b/view/adminhtml/templates/grid.phtml
@@ -15,46 +15,37 @@ if (!isset($viewModel)) {
 ?>
 <div class="loki-grid grid">
     <?php if ($viewModel->allowActions()): ?>
-    <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.actions') ?>
+    <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.actions') ?>
     <?php endif; ?>
 
     <div class="page-columns">
         <div class="main-col">
             <div class="admin__data-grid-outer-wrap">
-                <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.spinner') ?>
+                <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.spinner') ?>
 
                 <div class="admin__data-grid-header">
                     <div class="admin__data-grid-header-row">
-                        <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.filters') ?>
+                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.filters') ?>
                     </div>
                     <div class="admin__data-grid-header-row">
-                        <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.search') ?>
+                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.search') ?>
                     </div>
                     <div class="admin__data-grid-header-row row row-gutter">
-                        <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.massactions') ?>
-                        <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.pager') ?>
-                        <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.records') ?>
+                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.massactions') ?>
+                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.pager') ?>
+                        <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.records') ?>
                     </div>
                 </div>
 
                 <div class="admin__data-grid-header-row row row-gutter">
                     <div class="col-xs-2">
                         <div class="action-select-wrap">
-                            <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.row-actions') ?>
+                            <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.row-actions') ?>
                         </div>
                     </div>
                 </div>
 
-                <?= /* @noEscape */
-$blockRenderer->html($block, 'loki-admin.grid.table') ?>
+                <?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.grid.table') ?>
             </div>
         </div>
     </div>
diff --git a/view/adminhtml/templates/grid/actions.phtml b/view/adminhtml/templates/grid/actions.phtml
@@ -17,8 +17,7 @@ $buttons = $viewModel->getButtons();
         <div class="page-actions-inner">
             <div class="page-actions-buttons">
                 <?php foreach ($buttons as $button): ?>
-                    <?= /* @noEscape */
-$templateRenderer->html(
+                    <?= /* @noEscape */ $templateRenderer->html(
                         $block,
                         'Loki_AdminComponents::ui/button.phtml',
                         ['button' => $button]
diff --git a/view/adminhtml/templates/grid/cell/product_image.phtml b/view/adminhtml/templates/grid/cell/product_image.phtml
@@ -15,16 +15,14 @@ $item = $block->getItem();
 ?>
 <span class="thumbnail-container" x-data="LokiModal">
     <span class="thumbnail-wrapper">
-        <img @click="toggleModal" class="admin__control-thumbnail" src="<?= /* @noEscape */
-$productImage->getThumbnailUrl($item) ?>"
+        <img @click="toggleModal" class="admin__control-thumbnail" src="<?= /* @noEscape */ $productImage->getThumbnailUrl($item) ?>"
              loading="lazy" alt="<?= $escaper->escapeHtml($item->getName()) ?>"/>
     </span>
 
     <dialog x-ref="modal" @click="toggleModal">
     <span class="">
         <h2><?= $escaper->escapeHtml($item->getName()) ?></h2>
-        <img src="<?= /* @noEscape */
-$productImage->getImageUrl($item) ?>" loading="lazy" alt="<?= $escaper->escapeHtml($item->getName()) ?>"/>
+        <img src="<?= /* @noEscape */ $productImage->getImageUrl($item) ?>" loading="lazy" alt="<?= $escaper->escapeHtml($item->getName()) ?>"/>
     </span>
     </dialog>
 </span>
diff --git a/view/adminhtml/templates/grid/filters.phtml b/view/adminhtml/templates/grid/filters.phtml
@@ -29,8 +29,7 @@ if (empty($filterFields)) {
     <fieldset class="admin__fieldset admin__data-grid-filters">
         <?php foreach ($filterFields as $filterField): ?>
             <fieldset class="admin__form-field">
-                <?= /* @noEscape */
-$filterField->getBlock()->toHtml() ?>
+                <?= /* @noEscape */ $filterField->getBlock()->toHtml() ?>
             </fieldset>
         <?php endforeach; ?>
 
diff --git a/view/adminhtml/templates/grid/massactions.phtml b/view/adminhtml/templates/grid/massactions.phtml
@@ -23,8 +23,7 @@ if (empty($massActions)) {
         <div class="action-menu-items" x-cloak x-show="showMassActions" style="z-index:300">
             <ul class="action-menu">
                 <?php foreach ($massActions as $massAction): ?>
-                    <li @click="massAction" data-url="<?= /* @noEscape */
-$massAction->getUrl() ?>">
+                    <li @click="massAction" data-url="<?= /* @noEscape */ $massAction->getUrl() ?>">
                         <span class="action-menu-item"><?= $escaper->escapeHtml($massAction->getLabel()) ?></span>
                     </li>
                 <?php endforeach; ?>
@@ -35,9 +34,7 @@ $massAction->getUrl() ?>">
     <form method="post" x-ref="massActionForm">
         <input type="hidden" name="selected[]" x-ref="massActionFormIds" />
         <input type="hidden" name="namespace" value="<?= $escaper->escapeHtml($viewModel->getNamespace()) ?>" />
-        <input type="hidden" name="loki_redirect_url" value="<?= /* @noEscape */
-$viewModel->getIndexUrl() ?>" />
-        <?php echo /* @noEscape */
-$block->getBlockHtml('formkey') ?>
+        <input type="hidden" name="loki_redirect_url" value="<?= /* @noEscape */ $viewModel->getIndexUrl() ?>" />
+        <?php echo /* @noEscape */ $block->getBlockHtml('formkey') ?>
     </form>
 </div>
diff --git a/view/adminhtml/templates/grid/pager.phtml b/view/adminhtml/templates/grid/pager.phtml
@@ -11,8 +11,6 @@ use Loki\Components\Util\Block\ChildRenderer;
 $viewModel = $block->getViewModel();
 ?>
 <div class="admin__data-grid-pager-wrap">
-    <?= /* @noEscape */
-$childRenderer->html($block, 'limit') ?>
-    <?= /* @noEscape */
-$childRenderer->html($block, 'pagination') ?>
+    <?= /* @noEscape */ $childRenderer->html($block, 'limit') ?>
+    <?= /* @noEscape */ $childRenderer->html($block, 'pagination') ?>
 </div>
diff --git a/view/adminhtml/templates/grid/table.phtml b/view/adminhtml/templates/grid/table.phtml
@@ -97,8 +97,7 @@ $state = $viewModel->getState();
                         <div class="data-grid-cell-content">
                             <?php $cellTemplate = $viewModel->getCellTemplate($item, $columnName) ?>
                             <?php $value = $viewModel->getValueFromItem($item, $columnName); ?>
-                            <?= /* @noEscape */
-                    $templateRenderer->html($block, $cellTemplate, [
+                            <?= /* @noEscape */ $templateRenderer->html($block, $cellTemplate, [
                                 'item' => $item,
                                 'value' => $value,
                                 'column_name' => $columnName,
@@ -112,8 +111,7 @@ $state = $viewModel->getState();
                             <ul>
                                 <?php foreach ($cellActions as $cellAction): ?>
                                     <li>
-                                        <a href="<?= /* @noEscape */
-                            $cellAction->getUrl() ?>"><?= $escaper->escapeHtml($cellAction->getLabel()) ?></a>
+                                        <a href="<?= /* @noEscape */ $cellAction->getUrl() ?>"><?= $escaper->escapeHtml($cellAction->getLabel()) ?></a>
                                     </li>
                                 <?php endforeach; ?>
                             </ul>
diff --git a/view/adminhtml/templates/script/alpine-sort.phtml b/view/adminhtml/templates/script/alpine-sort.phtml
@@ -7,5 +7,4 @@ declare(strict_types=1);
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
 ?>
-<script defer src="<?= /* @noEscape */
-$escaper->escapeUrl($block->getViewFileUrl("Loki_AdminComponents::js/alpine-sort.min.js")) ?>"></script>
+<script defer src="<?= /* @noEscape */ $escaper->escapeUrl($block->getViewFileUrl("Loki_AdminComponents::js/alpine-sort.min.js")) ?>"></script>
diff --git a/view/adminhtml/templates/ui/button.phtml b/view/adminhtml/templates/ui/button.phtml
@@ -14,8 +14,7 @@ $button = $block->getButton();
             @click="<?= $escaper->escapeHtml(__($button->getMethod())) ?>"
             title="<?= $escaper->escapeHtml(__($button->getLabel())) ?>"
             <?php if ($button->getUrl()): ?>
-                data-url="<?= /* @noEscape */
-$button->getUrl() ?>"
+                data-url="<?= /* @noEscape */ $button->getUrl() ?>"
             <?php endif; ?>
             class="action-default <?= $escaper->escapeHtml(__($button->getCssClass())) ?>"
         >
@@ -36,8 +35,7 @@ $button->getUrl() ?>"
                     <span
                         @click="<?= $escaper->escapeHtml(__($subButton->getMethod())) ?>"
                         <?php if ($button->getUrl()): ?>
-                            data-url="<?= /* @noEscape */
-$button->getUrl() ?>"
+                            data-url="<?= /* @noEscape */ $button->getUrl() ?>"
                         <?php endif; ?>
                         title="<?= $escaper->escapeHtml(__($subButton->getLabel())) ?>"
                         class="item"
@@ -53,8 +51,7 @@ $button->getUrl() ?>"
     <button
         @click="<?= $escaper->escapeHtml($button->getMethod()) ?>"
         <?php if ($button->getUrl()): ?>
-            data-url="<?= /* @noEscape */
-$button->getUrl() ?>"
+            data-url="<?= /* @noEscape */ $button->getUrl() ?>"
         <?php endif; ?>
         title="<?= $escaper->escapeHtml(__($button->getLabel())) ?>"
         type="button"
