Merge remote-tracking branch 'remotes/github/MAGETWO-65232' into EPAM-PR-45

VeronikaYarats · VeronikaYarats · commit 281fb3be5d97 · 2019-04-01T18:22:29.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -70,13 +70,15 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
                 'feed' => 35
             ]
         ];
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 255,
             'align' => 'right',
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -70,13 +70,15 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
                 'feed' => 35
             ]
         ];
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 290,
             'align' => 'right',
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -69,6 +69,7 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),
                 'feed' => 100
             ]
@@ -79,6 +80,7 @@ public function draw()
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),
             'feed' => 565,
             'align' => 'right',

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public function draw()`
`69`	`69`	`// draw Product name`
`70`	`70`	`$lines[0] = [`
`71`	`71`	`[`
	`72`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`72`	`73`	`'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),`
`73`	`74`	`'feed' => 100`
`74`	`75`	`]`
`@@ -79,6 +80,7 @@ public function draw()`
`79`	`80`
`80`	`81`	`// draw SKU`
`81`	`82`	`$lines[0][] = [`
	`83`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`82`	`84`	`'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),`
`83`	`85`	`'feed' => 565,`
`84`	`86`	`'align' => 'right',`