Merge pull request #14 from nordcomputer/magento-coding-standard

Magento coding standard
nordcomputer · Mar 23, 2021 · fe54531 · fe54531
2 parents 8959e49 + b51fdd7
commit fe54531
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/...roduct/StockStatusBaseSelectProcessor.php → ...oduct/StockStatusBaseSelectProcessorN.php b/...roduct/StockStatusBaseSelectProcessor.php → ...oduct/StockStatusBaseSelectProcessorN.php
@@ -2,12 +2,12 @@
 namespace Nordcomputer\Showoutofstockprice\Model\ConfigurableProduct\ResourceModel\Product;
 
 use Magento\Framework\DB\Select;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor;
 
-class StockStatusBaseSelectProcessor extends \Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor
+class StockStatusBaseSelectProcessorN extends StockStatusBaseSelectProcessor
 {
     public function process(Select $select)
     {
         return $select;
     }
 }
-?>
diff --git a/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php b/Model/ResourceModel/Product/CompositeBaseSelectProcessor.php
@@ -9,19 +9,15 @@ public function __construct(
         array $baseSelectProcessors
     ) {
 
-
         // REMOVE THE STOCK STATUS PROCESSOR
         //...................................
-        $finalProcessors = array();
+        $finalProcessors = [];
         foreach ($baseSelectProcessors as $baseSelectProcessor) {
-            if(!is_a($baseSelectProcessor, StockStatusBaseSelectProcessor::class)) {
+            if (!is_a($baseSelectProcessor, StockStatusBaseSelectProcessor::class)) {
                 $finalProcessors[] = $baseSelectProcessor;
             }
         }
 
         parent::__construct($finalProcessors);
     }
-
 }
-
-?>
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "nordcomputer/showoutofstockprice",
     "description": "Adds price to out-of-stock products",
-    "version": "v0.4",
+    "version": "v0.4.1",
     "require": {
         "php": "^7.1|^7.2|^7.3|^7.4"
     },

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -3,7 +3,7 @@
     <preference for="Magento\ConfigurableProduct\Pricing\Render\FinalPriceBox" type="Nordcomputer\Showoutofstockprice\Pricing\Render\FinalPriceBox" />
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder">
     <arguments>
-        <argument name="baseSelectProcessor" xsi:type="object">Nordcomputer\Showoutofstockprice\Model\ConfigurableProduct\ResourceModel\Product\StockStatusBaseSelectProcessor</argument>
+        <argument name="baseSelectProcessor" xsi:type="object">Nordcomputer\Showoutofstockprice\Model\ConfigurableProduct\ResourceModel\Product\StockStatusBaseSelectProcessorN</argument>
     </arguments>
     </type>
 </config>
diff --git a/registration.php b/registration.php
@@ -1,6 +1,6 @@
 <?php
 \Magento\Framework\Component\ComponentRegistrar::register(
-	\Magento\Framework\Component\ComponentRegistrar::MODULE,
-	'Nordcomputer_Showoutofstockprice',
-	__DIR__
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Nordcomputer_Showoutofstockprice',
+    __DIR__
 );
diff --git a/view/frontend/templates/product/view/addtocart.phtml b/view/frontend/templates/product/view/addtocart.phtml
@@ -11,7 +11,7 @@
 
 <div class="box-tocart">
     <div class="fieldset">
-        <?php if ($block->shouldRenderQuantity()) :?>
+        <?php if ($block->shouldRenderQuantity()):?>
         <div class="field qty">
             <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">

diff --git a/view/frontend/templates/product/view/form.phtml b/view/frontend/templates/product/view/form.phtml
@@ -12,28 +12,27 @@
  * @var $block \Magento\Catalog\Block\Product\View
  */
 ?>
-<?php $_helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
     <form data-product-sku="<?= $block->escapeHtmlAttr($_product->getSku()) ?>"
           action="<?= $block->escapeUrl($block->getSubmitUrl($_product)) ?>" method="post"
-          id="product_addtocart_form"<?php if ($_product->getOptions()) :?> enctype="multipart/form-data"<?php endif; ?>>
+          id="product_addtocart_form"<?php if ($_product->getOptions()):?> enctype="multipart/form-data"<?php endif; ?>>
         <input type="hidden" name="product" value="<?= (int)$_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
         <input type="hidden" name="item"  value="<?= (int)$block->getRequest()->getParam('id') ?>" />
         <?= $block->getBlockHtml('formkey') ?>
         <?= $block->getChildHtml('form_top') ?>
-        <?php if (!$block->hasOptions()) :?>
+        <?php if (!$block->hasOptions()):?>
             <?= $block->getChildHtml('product_info_form_content') ?>
-        <?php else :?>
-            <?php if ($block->getOptionsContainer() == 'container1') :?>
+        <?php else:?>
+            <?php if ($block->getOptionsContainer() == 'container1'):?>
                 <?= $block->getChildChildHtml('options_container') ?>
             <?php endif;?>
         <?php endif; ?>
 
-        <?php if ($block->hasOptions() && $block->getOptionsContainer() == 'container2') :?>
+        <?php if ($block->hasOptions() && $block->getOptionsContainer() == 'container2'):?>
             <?= $block->getChildChildHtml('options_container') ?>
         <?php endif;?>
         <?= $block->getChildHtml('form_bottom') ?>