Merge pull request PrestaShop#8662 from LittleBigDev/move-cldr-to-core

Moved CLDR to Core
rlunar · Jan 10, 2018 · c8cfe83 · c8cfe83
2 parents 91c1792 + 05a6732
commit c8cfe83
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/...ation/Exception/LocalizationException.php → ...ation/Exception/LocalizationException.php b/...ation/Exception/LocalizationException.php → ...ation/Exception/LocalizationException.php
@@ -24,7 +24,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Exception;
+namespace PrestaShop\PrestaShop\Core\Localization\Exception;
 
 class LocalizationException extends \Exception
 {

diff --git a/...pBundle/Localization/Number/Formatter.php → src/Core/Localization/Number/Formatter.php b/...pBundle/Localization/Number/Formatter.php → src/Core/Localization/Number/Formatter.php
@@ -24,14 +24,14 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Number;
+namespace PrestaShop\PrestaShop\Core\Localization\Number;
 
 use InvalidArgumentException as SPLInvalidArgumentException;
 use PrestaShop\Decimal\Number as DecimalNumber;
 use PrestaShop\Decimal\Operation\Rounding;
-use PrestaShopBundle\Localization\Exception\LocalizationException;
-use PrestaShopBundle\Localization\Specification\NumberInterface as NumberSpecification;
-use PrestaShopBundle\Localization\Specification\Price as PriceSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
+use PrestaShop\PrestaShop\Core\Localization\Specification\NumberInterface as NumberSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Price as PriceSpecification;
 
 /**
  * Formats a number (raw, price, percentage) according to passed specifications

diff --git a/...dle/Localization/Specification/Locale.php → ...ore/Localization/Specification/Locale.php b/...dle/Localization/Specification/Locale.php → ...ore/Localization/Specification/Locale.php
@@ -24,7 +24,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
 class Locale
 {

diff --git a/...dle/Localization/Specification/Number.php → ...ore/Localization/Specification/Number.php b/...dle/Localization/Specification/Number.php → ...ore/Localization/Specification/Number.php
@@ -24,9 +24,9 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Exception\LocalizationException;
+use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
 
 /**
  * Number specification class

diff --git a/...ization/Specification/NumberInterface.php → ...ization/Specification/NumberInterface.php b/...ization/Specification/NumberInterface.php → ...ization/Specification/NumberInterface.php
@@ -24,7 +24,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
 /**
  * Number specification class

diff --git a/...zation/Specification/NumberSymbolList.php → ...zation/Specification/NumberSymbolList.php b/...zation/Specification/NumberSymbolList.php → ...zation/Specification/NumberSymbolList.php
@@ -24,9 +24,9 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Exception\LocalizationException;
+use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
 
 /**
  * Number's symbols data bag. Regroups all symbols used when formatting a number

diff --git a/...Localization/Specification/Percentage.php → ...Localization/Specification/Percentage.php b/...Localization/Specification/Percentage.php → ...Localization/Specification/Percentage.php
@@ -24,9 +24,9 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Specification\Number as NumberSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
 
 /**
  * Percentage specification class

diff --git a/...ndle/Localization/Specification/Price.php → ...Core/Localization/Specification/Price.php b/...ndle/Localization/Specification/Price.php → ...Core/Localization/Specification/Price.php
@@ -24,10 +24,10 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace PrestaShopBundle\Localization\Specification;
+namespace PrestaShop\PrestaShop\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Exception\LocalizationException;
-use PrestaShopBundle\Localization\Specification\Number as NumberSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
 
 /**
  * Price number specification class

diff --git a/...dle/Localization/Number/FormatterTest.php → ...ore/Localization/Number/FormatterTest.php b/...dle/Localization/Number/FormatterTest.php → ...ore/Localization/Number/FormatterTest.php
@@ -24,16 +24,16 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace Tests\PrestaShopBundle\Localization\Number;
+namespace Tests\Unit\Core\Localization\Number;
 
 use PHPUnit\Framework\TestCase;
 use PrestaShop\Decimal\Operation\Rounding;
-use PrestaShopBundle\Localization\Exception\LocalizationException;
-use PrestaShopBundle\Localization\Number\Formatter;
-use PrestaShopBundle\Localization\Specification\Number as NumberSpecification;
-use PrestaShopBundle\Localization\Specification\NumberInterface as NumberSpecificationInterface;
-use PrestaShopBundle\Localization\Specification\NumberSymbolList;
-use PrestaShopBundle\Localization\Specification\Price as PriceSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
+use PrestaShop\PrestaShop\Core\Localization\Number\Formatter;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\NumberInterface as NumberSpecificationInterface;
+use PrestaShop\PrestaShop\Core\Localization\Specification\NumberSymbolList;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Price as PriceSpecification;
 
 class FormatterTest extends TestCase
 {
@@ -266,7 +266,7 @@ public function provideValidNumberFormatSpecs()
                     'numberSpecification' => new PriceSpecification(
                         '¤ #,##0.##',
                         '-¤ #,##0.##',
-                        ['latn' => new NumberSymbolList(',', ' ', ';', '%', '-', '+', 'E', '^', '‰', '∞', 'NaN')],
+                        ['latn' => new NumberSymbolList('.', ',', ';', '%', '-', '+', 'E', '^', '‰', '∞', 'NaN')],
                         2,
                         2,
                         true,
@@ -280,14 +280,14 @@ public function provideValidNumberFormatSpecs()
                     'numberingSystem'     => 'latn', // Occidental numbering system
                 ],
                 'number'   => -123456.789,
-                'expected' => '-$ 123 456,79',
+                'expected' => '-$ 123,456.79',
             ],
             'USA positive price with ISO code' => [
                 'specs'    => [
                     'numberSpecification' => new PriceSpecification(
                         '¤ #,##0.##',
                         '-¤ #,##0.##',
-                        ['latn' => new NumberSymbolList(',', ' ', ';', '%', '-', '+', 'E', '^', '‰', '∞', 'NaN')],
+                        ['latn' => new NumberSymbolList('.', ',', ';', '%', '-', '+', 'E', '^', '‰', '∞', 'NaN')],
                         2,
                         2,
                         true,
@@ -301,7 +301,7 @@ public function provideValidNumberFormatSpecs()
                     'numberingSystem'     => 'latn', // Occidental numbering system
                 ],
                 'number'   => 123456.781,
-                'expected' => 'USD 123 456,78',
+                'expected' => 'USD 123,456.78',
             ],
         ];
     }

diff --git a/...Localization/Specification/NumberTest.php → ...Localization/Specification/NumberTest.php b/...Localization/Specification/NumberTest.php → ...Localization/Specification/NumberTest.php
@@ -24,11 +24,11 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace Tests\PrestaShopBundle\Localization\Specification;
+namespace Tests\Unit\Core\Localization\Specification;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShopBundle\Localization\Specification\Number as NumberSpecification;
-use PrestaShopBundle\Localization\Specification\NumberSymbolList;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\NumberSymbolList;
 
 class NumberTest extends TestCase
 {
@@ -105,7 +105,7 @@ public function testGetSymbolsByNumberingSystem()
      * When asking it a symbols list for a given INVALID numbering system
      * Then an exception souhd be raised
      *
-     * @expectedException \PrestaShopBundle\Localization\Exception\LocalizationException
+     * @expectedException \PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException
      */
     public function testGetSymbolsByNumberingSystemWithInvalidParameter()
     {

diff --git a/...lization/Specification/PercentageTest.php → ...lization/Specification/PercentageTest.php b/...lization/Specification/PercentageTest.php → ...lization/Specification/PercentageTest.php
@@ -24,9 +24,9 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace Tests\PrestaShopBundle\Localization\Specification;
+namespace Tests\Unit\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Specification\Percentage as PercentageSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Percentage as PercentageSpecification;
 
 class PercentageTest extends NumberTest
 {

diff --git a/.../Localization/Specification/PriceTest.php → .../Localization/Specification/PriceTest.php b/.../Localization/Specification/PriceTest.php → .../Localization/Specification/PriceTest.php
@@ -24,9 +24,9 @@
  * International Registered Trademark & Property of PrestaShop SA
  */
 
-namespace Tests\PrestaShopBundle\Localization\Specification;
+namespace Tests\Unit\Core\Localization\Specification;
 
-use PrestaShopBundle\Localization\Specification\Price as PriceSpecification;
+use PrestaShop\PrestaShop\Core\Localization\Specification\Price as PriceSpecification;
 
 class PriceTest extends NumberTest
 {