MAGETWO-37616: Prepare PR

Author: Michael Logvin

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

@@ -14,7 +14,7 @@ class Timezone implements \Magento\Framework\Option\ArrayInterface
     /**
      * Timezones that works incorrect with php_intl extension
      */
-    const IGNORED_TIMEZONES = [
+    protected $ignoredTimezones = [
         'Antarctica/Troll',
         'Asia/Chita',
         'Asia/Srednekolymsk',
@@ -41,7 +41,7 @@ public function toOptionArray()
     {
         $timezones = $this->_localeLists->getOptionTimezones();
         $timezones = array_filter($timezones, function($value) {
-            if (in_array($value['value'], static::IGNORED_TIMEZONES)) {
+            if (in_array($value['value'], $this->ignoredTimezones)) {
                 return false;
             }
             return true;

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

@@ -27,6 +27,12 @@ protected function setUp()
 
     public function testToOptionArray()
     {
+        $ignoredTimezones = [
+            'Antarctica/Troll',
+            'Asia/Chita',
+            'Asia/Srednekolymsk',
+            'Pacific/Bougainville'
+        ];
         $list = \DateTimeZone::listIdentifiers();
         $preparedList = [];
         foreach ($list as $value) {
@@ -37,7 +43,7 @@ public function testToOptionArray()
             ->willReturn($preparedList);
         $result = $this->model->toOptionArray();
         foreach ($result as $value) {
-            if (in_array($value['value'], \Magento\Config\Model\Config\Source\Locale\Timezone::IGNORED_TIMEZONES)) {
+            if (in_array($value['value'], $ignoredTimezones)) {
                 $this->fail('Locale ' . $value['value'] . ' shouldn\'t be presented');
             }
         }