Fix error in PHP code sniffer

Author: srenon

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -246,7 +246,8 @@ public function testRenderMsrpEnabled()
 
         //assert price wrapper
         $this->assertEquals(
-            '<div class="price-box price-final_price" data-role="priceBox" data-product-id="" data-price-box="product-id-">test</div>',
+            '<div class="price-box price-final_price" data-role="priceBox" data-product-id="" ' .
+            'data-price-box="product-id-">test</div>',
             $result
         );
     }

app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml

@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
-<div class="swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>" data-role="swatch-option-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>"></div>
+<?php
+    /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
+    $productId = $block->getProduct()->getId();
+?>
+<div class="swatch-opt-<?= /* @escapeNotVerified */ $productId ?>" data-role="swatch-option-<?= /* @escapeNotVerified */ $productId ?>"></div>
 
 <script type="text/x-magento-init">
     {
-        "[data-role=swatch-option-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>]": {
+        "[data-role=swatch-option-<?= /* @escapeNotVerified */ $productId ?>]": {
             "Magento_Swatches/js/swatch-renderer": {
                 "selectorProduct": ".product-item-details",
                 "onlySwatches": true,
@@ -25,7 +28,7 @@
 
 <script type="text/x-magento-init">
     {
-        "[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $block->escapeHtml($block->getProduct()->getId()) ?>]": {
+        "[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $productId ?>]": {
             "priceBox": {
                 "priceConfig": {
                     "priceFormat": <?= /* @escapeNotVerified */ $block->getPriceFormatJson(); ?>,