ENGCOM-9208: Remove casting to int on increment ID which can be prefixed by a string #33369

Author: sidolov

app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml

@@ -14,7 +14,7 @@
 <?php foreach ($_invoices as $_invoice) : ?>
 <div class="order-details-items invoice">
     <div class="order-title">
-        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= (int) $_invoice->getIncrementId() ?></strong>
+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
     </div>
     <div class="table-wrapper table-order-items invoice">
         <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">

dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php

@@ -117,6 +117,7 @@ public function testPrintInvoice(): void
         $order = $this->orderFactory->create()->loadByIncrementId('100000555');
         $invoice = $order->getInvoiceCollection()->getFirstItem();
         $this->assertNotNull($invoice->getId());
+        $this->assertTrue(is_numeric($invoice->getIncrementId()));
         $this->registerOrder($order);
         $this->registerInvoice($invoice);
         $blockHtml = $this->renderPrintInvoiceBlock();
@@ -125,11 +126,41 @@ public function testPrintInvoice(): void
             Xpath::getElementsCountForXpath(
                 sprintf(
                     "//div[contains(@class, 'order-title')]/strong[contains(text(), '%s')]",
-                    __('Invoice #%1', (int)$invoice->getIncrementId())
+                    __('Invoice #%1', $invoice->getIncrementId())
                 ),
                 $blockHtml
             ),
-            sprintf('Title for %s was not found.', __('Invoice #%1', (int)$invoice->getIncrementId()))
+            sprintf('Title for %s was not found.', __('Invoice #%1', $invoice->getIncrementId()))
+        );
+        $this->assertOrderInformation($order, $blockHtml);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/invoices_for_items.php
+     *
+     * @return void
+     */
+    public function testPrintInvoiceWithStringPrefix(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId('100000555');
+        $invoice = $order->getInvoiceCollection()->getFirstItem();
+        $this->assertNotNull($invoice->getId());
+        // set text prefix to increment id
+        $invoice->setIncrementId('prefix-' . $invoice->getIncrementId());
+        $this->assertFalse(is_numeric($invoice->getIncrementId()));
+        $this->registerOrder($order);
+        $this->registerInvoice($invoice);
+        $blockHtml = $this->renderPrintInvoiceBlock();
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(
+                sprintf(
+                    "//div[contains(@class, 'order-title')]/strong[contains(text(), '%s')]",
+                    __('Invoice #%1', $invoice->getIncrementId())
+                ),
+                $blockHtml
+            ),
+            sprintf('Title for %s was not found.', __('Invoice #%1', $invoice->getIncrementId()))
         );
         $this->assertOrderInformation($order, $blockHtml);
     }