Merge branch 'MAGETWO-28011' of github.corp.ebay.com:magento-firedrakes/magento2ce into MAGETWO-28011

Author: Michael Logvin

app/code/Magento/Config/Model/Config/Source/Locale/Timezone.php

@@ -11,6 +11,16 @@
 
 class Timezone implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * Timezones that works incorrect with php_intl extension
+     */
+    const IGNORED_TIMEZONES = [
+        'Antarctica/Troll',
+        'Asia/Chita',
+        'Asia/Srednekolymsk',
+        'Pacific/Bougainville'
+    ];
+
     /**
      * @var \Magento\Framework\Locale\ListsInterface
      */
@@ -29,6 +39,14 @@ public function __construct(\Magento\Framework\Locale\ListsInterface $localeList
      */
     public function toOptionArray()
     {
-        return $this->_localeLists->getOptionTimezones();
+        $timezones = $this->_localeLists->getOptionTimezones();
+        $timezones = array_filter($timezones, function($value) {
+            if (in_array($value['value'], static::IGNORED_TIMEZONES)) {
+                return false;
+            }
+            return true;
+        });
+
+        return $timezones;
     }
 }

app/code/Magento/Config/Test/Unit/Model/Config/Source/Locale/TimezoneTest.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Locale;
+
+class LoaderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $listMock;
+
+    /**
+     * @var \Magento\Config\Model\Config\Source\Locale\Timezone
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->listMock = $this->getMockBuilder('Magento\Framework\Locale\TranslatedLists')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = new \Magento\Config\Model\Config\Source\Locale\Timezone($this->listMock);
+    }
+
+    public function testToOptionArray()
+    {
+        $list = \DateTimeZone::listIdentifiers();
+        $preparedList = [];
+        foreach ($list as $value) {
+            $preparedList[] = ['value' => $value, 'label' => $value];
+        }
+        $this->listMock->expects($this->once())
+            ->method('getOptionTimezones')
+            ->willReturn($preparedList);
+        $result = $this->model->toOptionArray();
+        foreach ($result as $value) {
+            if (in_array($value['value'], \Magento\Config\Model\Config\Source\Locale\Timezone::IGNORED_TIMEZONES)) {
+                $this->fail('Locale ' . $value['value'] . ' shouldn\'t be presented');
+            }
+        }
+    }
+}

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

@@ -427,6 +427,7 @@ public function setCanSendNewEmailFlag($flag)
     /**
      * Load order by system increment identifier
      *
+     * @deprecated
      * @param string $incrementId
      * @return \Magento\Sales\Model\Order
      */

dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml

@@ -18,5 +18,6 @@
         <block name="currencyBlock" class="Magento\Directory\Test\Block\Currency\Switcher" locator=".switcher.currency" strategy="css selector" />
         <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
         <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".widget" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages" strategy="css selector"/>
     </page>
 </config>