MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation

slavvka · slavvka · commit 0781afe79cb6 · 2015-03-11T17:29:29.000+02:00
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -774,8 +774,8 @@ protected function getStoreDate($storeId, $date = null)
         }
 
         if (!$this->dateTime->isEmptyDate($date)) {
-            list($dateObj, $format) = $this->dates[$storeId];
             /** @var \DateTime $dateObj */
+            $dateObj = $this->dates[$storeId];
             return $this->localeDate->formatDateTime($dateObj, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE);
         }
 
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -3,8 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\CurrencySymbol\Model\System;
+
 use Magento\Framework\Locale\Bundle\CurrencyBundle;
 
 /**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer;
+
 use Magento\Framework\Locale\Bundle\DataBundle;
 
 /**
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta10",
         "magento/module-backend": "0.42.0-beta10",
         "magento/framework": "0.42.0-beta10",
         "magento/module-eav": "0.42.0-beta10",
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -121,7 +121,6 @@
     <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
     <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
     <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
-    <preference for="Magento\Framework\Stdlib\DateTime\DateInterface" type="Magento\Framework\Stdlib\DateTime\Date" />
     <preference for="Magento\Framework\Less\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Less\PreProcessor\ErrorHandler" />
     <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\Resource" />
     <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
diff --git a/composer.json b/composer.json
@@ -49,6 +49,7 @@
         "ext-hash": "*",
         "ext-curl": "*",
         "ext-iconv": "*",
+        "ext-intl": "*",
         "sjparkinson/static-review": "~4.1",
         "fabpot/php-cs-fixer": "~1.2",
         "lusitanian/oauth": "~0.3"
diff --git a/composer.lock b/composer.lock
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/CurrencyBundle.php
@@ -7,5 +7,8 @@
 
 class CurrencyBundle extends DataBundle
 {
+    /**
+     * @var string
+     */
     protected $path = 'ICUDATA-curr';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/LanguageBundle.php
@@ -7,5 +7,8 @@
 
 class LanguageBundle extends DataBundle
 {
+    /**
+     * @var string
+     */
     protected $path = 'ICUDATA-lang';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/RegionBundle.php
@@ -7,5 +7,8 @@
 
 class RegionBundle extends DataBundle
 {
+    /**
+     * @var string
+     */
     protected $path = 'ICUDATA-region';
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/TimezoneBundle.php
@@ -7,5 +7,8 @@
 
 class TimezoneBundle extends DataBundle
 {
+    /**
+     * @var string
+     */
     protected $path = 'ICUDATA-zone';
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -139,6 +139,7 @@ public function getDateTimeFormat($type)
 
     /**
      * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function date($date = null, $locale = null, $useTimezone = true)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -82,7 +82,9 @@ protected function _toHtml()
             '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']))),
+                'abbreviated' => $this->encoder->encode(
+                    array_values(iterator_to_array($monthsData['format']['abbreviated']))
+                ),
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
@@ -9,7 +9,6 @@
     ],
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "ext-intl" : "*",
         "ext-spl": "*",
         "ext-dom": "*",
         "ext-simplexml": "*",
diff --git a/setup/src/Magento/Setup/Model/Lists.php b/setup/src/Magento/Setup/Model/Lists.php
@@ -40,10 +40,10 @@ public function getTimezoneList()
         $list = [];
         foreach ($zones as $code) {
             $list[$code] = \IntlTimeZone::createTimeZone($code)->getDisplayName(
-                    false,
-                    \IntlTimeZone::DISPLAY_LONG,
-                    ResolverInterface::DEFAULT_LOCALE
-                ) . ' (' . $code . ')';
+                false,
+                \IntlTimeZone::DISPLAY_LONG,
+                ResolverInterface::DEFAULT_LOCALE
+            ) . ' (' . $code . ')';
         }
         asort($list);
         return $list;

Original file line number	Diff line number	Diff line change
`@@ -774,8 +774,8 @@ protected function getStoreDate($storeId, $date = null)`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`if (!$this->dateTime->isEmptyDate($date)) {`
`777`		`- list($dateObj, $format) = $this->dates[$storeId];`
`778`	`777`	`/** @var \DateTime $dateObj */`
	`778`	`+ $dateObj = $this->dates[$storeId];`
`779`	`779`	`return $this->localeDate->formatDateTime($dateObj, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE);`
`780`	`780`	`}`
`781`	`781`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,8 @@`
`7`	`7`
`8`	`8`	`class CurrencyBundle extends DataBundle`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * @var string`
	`12`	`+ */`
`10`	`13`	`protected $path = 'ICUDATA-curr';`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,8 @@`
`7`	`7`
`8`	`8`	`class LanguageBundle extends DataBundle`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * @var string`
	`12`	`+ */`
`10`	`13`	`protected $path = 'ICUDATA-lang';`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,8 @@`
`7`	`7`
`8`	`8`	`class RegionBundle extends DataBundle`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * @var string`
	`12`	`+ */`
`10`	`13`	`protected $path = 'ICUDATA-region';`
`11`	`14`	`}`