Merge pull request #13 from magento-tango/MAGETWO-69935

MAGETWO-69935 - [Backport] Unable to save Scheduled Changes with Japanese locale due to Date formatting - 2.1

Author: kandy

lib/internal/Magento/Framework/View/Element/Html/Calendar.php

@@ -76,14 +76,31 @@ protected function _toHtml()
             ]
         );
 
-        // get months names
+        /**
+         * Month names in abbreviated format values was added to ICU Data tables
+         * starting ICU library version 52.1. For some OS, like CentOS, default
+         * installation version of ICU library is 50.1.2, which not contain
+         * 'abbreviated' key, and that may cause a PHP fatal error when passing
+         * as an argument of function 'iterator_to_array'. This issue affects
+         * locales like ja_JP, ko_KR etc.
+         *
+         * @see http://source.icu-project.org/repos/icu/tags/release-50-1-2/icu4c/source/data/locales/ja.txt
+         * @see http://source.icu-project.org/repos/icu/tags/release-52-1/icu4c/source/data/locales/ja.txt
+         * @var \ResourceBundle $monthsData
+         */
         $monthsData = $localeData['calendar']['gregorian']['monthNames'];
         $this->assign(
             'months',
             [
                 'wide' => $this->encoder->encode(array_values(iterator_to_array($monthsData['format']['wide']))),
                 'abbreviated' => $this->encoder->encode(
-                    array_values(iterator_to_array($monthsData['format']['abbreviated']))
+                    array_values(
+                        iterator_to_array(
+                            null !== $monthsData->get('format')->get('abbreviated')
+                            ? $monthsData['format']['abbreviated']
+                            : $monthsData['format']['wide']
+                        )
+                    )
                 ),
             ]
         );

lib/internal/Magento/Framework/View/Test/Unit/Element/Html/CalendarTest.php

@@ -5,49 +5,92 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\Html\Calendar;
+use Magento\Framework\View\Element\Template\Context;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @see Calendar
+ */
 class CalendarTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @see MAGETWO-60828
+     * @see Calendar::_toHtml
+     *
+     * @param string $locale
+     * @dataProvider localesDataProvider
      */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Framework\View\Element\Html\Calendar */
-    protected $block;
-
-    /** @var \Magento\Framework\View\Element\Template\Context */
-    protected $context;
+    public function testToHtmlWithDifferentLocales($locale)
+    {
+        $calendarBlock = (new ObjectManager($this))->getObject(
+            Calendar::class,
+            [
+                'localeResolver' => $this->getLocalResolver($locale)
+            ]
+        );
 
-    /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $localeDate;
+        $calendarBlock->toHtml();
+    }
 
-    protected function setUp()
+    /**
+     * @return array
+     */
+    public function localesDataProvider()
     {
-        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->localeDate = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
-            ->getMock();
+        return [
+            ['en_US'],
+            ['ja_JP'],
+            ['ko_KR'],
+        ];
+    }
 
-        /** @var  \Magento\Framework\View\Element\Template\Context $context */
-        $this->context = $this->objectManagerHelper->getObject(
-            'Magento\Framework\View\Element\Template\Context',
+    /**
+     * @see Calendar::getYearRange
+     */
+    public function testGetYearRange()
+    {
+        $calendarBlock = (new ObjectManager($this))->getObject(
+            Calendar::class,
             [
-                'localeDate' => $this->localeDate,
+                'context' => $this->getContext()
             ]
         );
 
-        /** @var \Magento\Framework\View\Element\Html\Links $block */
-        $this->block = $this->objectManagerHelper->getObject(
-            'Magento\Framework\View\Element\Html\Calendar',
-            ['context' => $this->context]
+        $testCurrentYear = (new \DateTime())->format('Y');
+        $this->assertEquals(
+            (int) $testCurrentYear - 100 . ':' . ($testCurrentYear + 100),
+            $calendarBlock->getYearRange()
         );
     }
 
     /**
-     * @test
+     * @param string $locale
+     * @return ResolverInterface|MockObject
      */
-    public function testGetYearRange()
+    private function getLocalResolver($locale)
     {
-        $testCurrentYear = (new \DateTime())->format('Y');
-        $this->assertEquals((int)$testCurrentYear - 100 . ':' . ($testCurrentYear + 100), $this->block->getYearRange());
+        $localResolver = $this->getMockBuilder(ResolverInterface::class)
+            ->getMockForAbstractClass();
+        $localResolver->method('getLocale')->willReturn($locale);
+
+        return $localResolver;
+    }
+
+    /**
+     * @return Context|Object
+     */
+    private function getContext()
+    {
+        $localeDate = $this->getMockBuilder(TimezoneInterface::class)
+            ->getMockForAbstractClass();
+
+        return (new ObjectManager($this))->getObject(
+            Context::class,
+            ['localeDate' => $localeDate]
+        );
     }
 }