Fix Arabic & Hebrew in invoices

Revert MC-13880 and bring back MAGETWO-95816

This reverts commit 1c0549e

Author: ihor-sviziev

app/code/Magento/Sales/Model/Order/Address/Renderer.php

@@ -9,6 +9,8 @@
 use Magento\Customer\Model\Address\Config as AddressConfig;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Sales\Model\Order\Address;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Renderer used for formatting an order address
@@ -27,18 +29,26 @@ class Renderer
      */
     protected $eventManager;
 
+    /**
+     * @var StringUtils
+     */
+    private $stringUtils;
+
     /**
      * Constructor
      *
      * @param AddressConfig $addressConfig
      * @param EventManager $eventManager
+     * @param StringUtils $stringUtils
      */
     public function __construct(
         AddressConfig $addressConfig,
-        EventManager $eventManager
+        EventManager $eventManager,
+        StringUtils $stringUtils = null
     ) {
         $this->addressConfig = $addressConfig;
         $this->eventManager = $eventManager;
+        $this->stringUtils = $stringUtils ?: ObjectManager::getInstance()->get(StringUtils::class);
     }
 
     /**
@@ -58,4 +68,50 @@ public function format(Address $address, $type)
         $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
         return $formatType->getRenderer()->renderArray($address->getData());
     }
+
+    /**
+     * Detect an input string is Arabic
+     *
+     * @param string $subject
+     * @return bool
+     */
+    public function isArabic(string $subject): bool
+    {
+        return (preg_match('/\p{Arabic}/u', $subject) > 0);
+    }
+
+    /**
+     * Reverse text with Arabic characters
+     *
+     * @param string $string
+     * @return string
+     */
+    public function reverseArabicText($string)
+    {
+        $splitText = explode(' ', $string);
+        for ($i = 0; $i < count($splitText); $i++) {
+            if ($this->isArabic($splitText[$i])) {
+                for ($j = $i + 1; $j < count($splitText); $j++) {
+                    $tmp = ($this->isArabic($splitText[$j]))
+                        ? $this->stringUtils->strrev($splitText[$j]) : $splitText[$j];
+                    $splitText[$j] = ($this->isArabic($splitText[$i]))
+                        ? $this->stringUtils->strrev($splitText[$i]) : $splitText[$i];
+                    $splitText[$i] = $tmp;
+                }
+            }
+        }
+        return implode(' ', $splitText);
+    }
+
+    /**
+     * Check and revert arabic text
+     *
+     * @param string $string
+     * @return string
+     */
+    public function processArabicText($string)
+    {
+        return ($this->isArabic($string))
+            ? $this->reverseArabicText($string) : $string;
+    }
 }

app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php

@@ -501,7 +501,8 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
             if ($value !== '') {
                 $text = [];
                 foreach ($this->string->split($value, 45, true, true) as $_value) {
-                    $text[] = $_value;
+                    $text[] = ($this->addressRenderer->isArabic($_value))
+                        ? $this->addressRenderer->reverseArabicText($_value) : $_value;
                 }
                 foreach ($text as $part) {
                     $page->drawText(strip_tags(ltrim($part)), 35, $this->y, 'UTF-8');
@@ -518,7 +519,8 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
                 if ($value !== '') {
                     $text = [];
                     foreach ($this->string->split($value, 45, true, true) as $_value) {
-                        $text[] = $_value;
+                        $text[] = ($this->addressRenderer->isArabic($_value))
+                            ? $this->addressRenderer->reverseArabicText($_value) : $_value;
                     }
                     foreach ($text as $part) {
                         $page->drawText(strip_tags(ltrim($part)), 285, $this->y, 'UTF-8');

app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php

@@ -7,6 +7,9 @@
 
 namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\Order\Address\Renderer;
+
 /**
  * Sales Order Invoice Pdf default items renderer
  */
@@ -19,6 +22,11 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      */
     protected $string;
 
+    /**
+     * @var \Magento\Sales\Model\Order\Address\Renderer
+     */
+    private $renderer;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -29,6 +37,8 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Sales\Model\Order\Address\Renderer $renderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -39,7 +49,8 @@ public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Renderer $renderer = null
     ) {
         $this->string = $string;
         parent::__construct(
@@ -52,6 +63,7 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->renderer = $renderer ?: ObjectManager::getInstance()->get(Renderer::class);
     }
 
     /**
@@ -71,15 +83,15 @@ public function draw()
         $lines[0] = [
             [
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
+                'text' => $this->string->split($this->renderer->processArabicText(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),
+            'text' => $this->string->split($this->renderer->processArabicText(html_entity_decode($this->getSku($item))), 17),
             'feed' => 290,
             'align' => 'right',
         ];