Code style improvements

Author: ihorvansach

Block/DataLayer/Purchase.php

@@ -63,7 +63,8 @@ protected function getDataLayer(): array
     /**
      * @return \Magento\Sales\Model\Order
      */
-    protected function getOrder() {
+    protected function getOrder()
+    {
         return $this->checkoutSession->getLastRealOrder();
     }
 }

Block/DataLayer/PurchaseGetOrderFromRequest.php

@@ -16,7 +16,8 @@ class PurchaseGetOrderFromRequest extends Purchase
     /**
      * @return \Magento\Sales\Model\Order|null
      */
-    protected function getOrder() {
+    protected function getOrder()
+    {
         $order = $this->getOrderFactory()->create()->loadByIncrementId($this->getOrderId());
 
         if (!$order->getId()) {
@@ -28,15 +29,17 @@ protected function getOrder() {
     /**
      * @return mixed
      */
-    protected function getOrderFactory() {
+    protected function getOrderFactory()
+    {
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         return $objectManager->get(\Magento\Sales\Model\OrderFactory::class);
     }
 
     /**
      * @return string
      */
-    protected function getOrderId() {
+    protected function getOrderId()
+    {
         $request = $this->getRequest();
 
         if ($request) {
@@ -45,4 +48,4 @@ protected function getOrderId() {
 
         return 0;
     }
-}
+}

Model/DataLayer/Purchase.php

@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function get(Order $order,string $requester = ''): array
+    public function get(Order $order, string $requester = ''): array
     {
         if ($order) {
             $items = [];

Model/ResourceModel/Transaction.php

@@ -21,4 +21,3 @@ protected function _construct()
         $this->_init('magefan_gtm_transaction', 'id');
     }
 }
-

Model/ResourceModel/Transaction/Collection.php

@@ -29,4 +29,3 @@ protected function _construct()
         );
     }
 }
-

Model/Transaction.php

@@ -21,4 +21,3 @@ public function _construct()
         $this->_init(\Magefan\GoogleTagManager\Model\ResourceModel\Transaction::class);
     }
 }
-

Model/TransactionRepository.php

@@ -71,4 +71,4 @@ public function get($transactionId)
         }
         return $transaction;
     }
-}
+}

Plugin/Magefan/GoogleTagManager/Model/DataLayer/Purchase.php

@@ -49,8 +49,7 @@ public function __construct(
         TransactionFactory $transactionFactory,
         TransactionRepository $transactionRepository,
         LoggerInterface $logger
-    )
-    {
+    ) {
         $this->transactionCollectionFactory = $transactionCollectionFactory;
         $this->transactionFactory = $transactionFactory;
         $this->transactionRepository = $transactionRepository;
@@ -64,12 +63,12 @@ public function __construct(
      * @param string $requester
      * @return array|mixed
      */
-    public function aroundGet(Subject $subject, $proceed, Order $order, string $requester = '') {
+    public function aroundGet(Subject $subject, $proceed, Order $order, string $requester = '')
+    {
         if ($this->isTransactionIdUniqueForRequester($requester, $order)) {
             $this->logTransaction($order, $requester);
             return $proceed($order, $requester);
-        }
-        else {
+        } else {
             return [];
         }
     }
@@ -79,13 +78,17 @@ public function aroundGet(Subject $subject, $proceed, Order $order, string $requ
      * @param string $transactionId
      * @return bool
      */
-    protected function isTransactionIdUniqueForRequester(string $requester, Order $order): bool {
+    protected function isTransactionIdUniqueForRequester(string $requester, Order $order): bool
+    {
         $transactionsForRequesterByTransactionId = $this->transactionCollectionFactory->create()->addFieldToFilter(
-            'requester', $requester
+            'requester',
+            $requester
         )->addFieldToFilter(
-            'transaction_id', (string)$order->getIncrementId()
+            'transaction_id',
+            (string)$order->getIncrementId()
         )->addFieldToFilter(
-            'store_id', (int)$order->getStoreId()
+            'store_id',
+            (int)$order->getStoreId()
         );
 
         if (count($transactionsForRequesterByTransactionId)) {
@@ -100,7 +103,8 @@ protected function isTransactionIdUniqueForRequester(string $requester, Order $o
      * @param string $requester
      * @return void
      */
-    protected function logTransaction(Order $order, string $requester) {
+    protected function logTransaction(Order $order, string $requester)
+    {
         $transactionModel = $this->transactionFactory->create();
 
         $transactionModel->setTransactionId((string)$order->getIncrementId());
@@ -109,11 +113,9 @@ protected function logTransaction(Order $order, string $requester) {
 
         try {
             $this->transactionRepository->save($transactionModel);
-        }
-        catch (CouldNotSaveException $e) {
+        } catch (CouldNotSaveException $e) {
             $this->logger->log("Magefan_GoogleTagManager error while logging transaction id: " . $order->getIncrementId()
-                . ' and requester: ' . $requester
-            );
+                . ' and requester: ' . $requester);
         }
     }
-}
+}

view/frontend/templates/js_code.phtml

@@ -97,7 +97,7 @@ if (!isset($escaper)) {
             'https:<?= '/' . '/' ?>www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
         })(window,document,'script','dataLayer','<?= $escaper->escapeHtml($block->getPublicId()) ?>');
         <?php } elseif ('use_head_and_body_script' === $block->getConfig()->getInstallGtm()) { ?>
-        <?= $block->getGtmScript(); ?>
+            <?= $block->getGtmScript(); ?>
         <?php } ?>
     }