Store class and bundle alias as member variables

[packbundle] / Util / IntlUtil.php

diff --git a/Util/IntlUtil.php b/Util/IntlUtil.php
index 9f897e1e6b14654b328fc88969f91b65f4ebe62c..511e948073432415624380fe3ad337e9427653fa 100644 (file)
--- a/Util/IntlUtil.php
+++ b/Util/IntlUtil.php
@@ -18,10 +18,22 @@ use Twig\Environment;
  * Manages intl conversions
  */
 class IntlUtil {
  * Manages intl conversions
  */
 class IntlUtil {

+       /**
+        * Format currency
+        */
+       public function currency(int|float $number, string $currency, ?string $locale = null) {
+               //Get formatter
+               $formatter = $this->getNumberFormatter($locale, 'currency');
+
+               //Return formatted currency
+               return $formatter->formatCurrency($number, $currency);
+       }
+

        /**
         * Format date
         */
        public function date(Environment $env, \DateTime $date, string $dateFormat = 'medium', string $timeFormat = 'medium', ?string $locale = null, \IntlTimeZone|\DateTimeZone|string|null $timezone = null, ?string $calendar = null, ?string $pattern = null) {
        /**
         * Format date
         */
        public function date(Environment $env, \DateTime $date, string $dateFormat = 'medium', string $timeFormat = 'medium', ?string $locale = null, \IntlTimeZone|\DateTimeZone|string|null $timezone = null, ?string $calendar = null, ?string $pattern = null) {

+               //Get converted date

                $date = twig_date_converter($env, $date, $timezone);
 
                //Set date and time formatters
                $date = twig_date_converter($env, $date, $timezone);
 
                //Set date and time formatters


@@ -33,6 +45,7 @@ class IntlUtil {
                        'full' => \IntlDateFormatter::FULL,
                ];
 
                        'full' => \IntlDateFormatter::FULL,
                ];
 

+               //Get formatter

                $formatter = \IntlDateFormatter::create(
                        $locale,
                        $formatters[$dateFormat],
                $formatter = \IntlDateFormatter::create(
                        $locale,
                        $formatters[$dateFormat],


@@ -42,37 +55,48 @@ class IntlUtil {
                        $pattern
                );
 
                        $pattern
                );
 

+               //Return formatted date

                return $formatter->format($date->getTimestamp());
        }
 
        /**
                return $formatter->format($date->getTimestamp());
        }
 
        /**

-        * Format number
+        * Compute eastern for selected year
+        *
+        * @param string $year The eastern year
+        *
+        * @return DateTime The eastern date

         */
         */

-       public function number(int|float $number, $style = 'decimal', $type = 'default', ?string $locale = null) {
-               static $typeValues = array(
-                       'default' => NumberFormatter::TYPE_DEFAULT,
-                       'int32' => NumberFormatter::TYPE_INT32,
-                       'int64' => NumberFormatter::TYPE_INT64,
-                       'double' => NumberFormatter::TYPE_DOUBLE,
-                       'currency' => NumberFormatter::TYPE_CURRENCY,
-               );
+       public function getEastern(string $year): \DateTime {
+               //Set static results
+               static $results = [];
+
+               //Check if already computed
+               if (isset($results[$year])) {
+                       //Return computed eastern
+                       return $results[$year];
+               }

 
 

-               $formatter = $this->getNumberFormatter($locale, $style);
+               $d = (19 * ($year % 19) + 24) % 30;

 
 

-               if (!isset($typeValues[$type])) {
-                       throw new SyntaxError(sprintf('The type "%s" does not exist. Known types are: "%s"', $type, implode('", "', array_keys($typeValues))));
-               }
+               $e = (2 * ($year % 4) + 4 * ($year % 7) + 6 * $d + 5) % 7;

 
 

-               return $formatter->format($number, $typeValues[$type]);
-       }
+               $day = 22 + $d + $e;

 
 

-       /**
-        * Format currency
-        */
-       public function currency(int|float $number, string $currency, ?string $locale = null) {
-               $formatter = $this->getNumberFormatter($locale, 'currency');
+               $month = 3;

 
 

-               return $formatter->formatCurrency($number, $currency);
+               if ($day > 31) {
+                       $day = $d + $e - 9;
+                       $month = 4;
+               } elseif ($d == 29 && $e == 6) {
+                       $day = 10;
+                       $month = 4;
+               } elseif ($d == 28 && $e == 6) {
+                       $day = 18;
+                       $month = 4;
+               }
+
+               //Store eastern in data
+               return ($results[$year] = new \DateTime(sprintf('%04d-%02d-%02d', $year, $month, $day)));

        }
 
        /**
        }
 
        /**


@@ -88,7 +112,7 @@ class IntlUtil {
                static $formatters = [];
 
                //Set locale
                static $formatters = [];
 
                //Set locale

-               $locale = null !== $locale ? $locale : Locale::getDefault();
+               $locale = null !== $locale ? $locale : \Locale::getDefault();

 
                //With existing formatter
                if (isset($formatters[$locale][$style])) {
 
                //With existing formatter
                if (isset($formatters[$locale][$style])) {


@@ -104,7 +128,7 @@ class IntlUtil {
                        'scientific' => \NumberFormatter::SCIENTIFIC,
                        'spellout' => \NumberFormatter::SPELLOUT,
                        'ordinal' => \NumberFormatter::ORDINAL,
                        'scientific' => \NumberFormatter::SCIENTIFIC,
                        'spellout' => \NumberFormatter::SPELLOUT,
                        'ordinal' => \NumberFormatter::ORDINAL,

-                       'duration' => \NumberFormatter::DURATION,
+                       'duration' => \NumberFormatter::DURATION

                ];
 
                //Without styles
                ];
 
                //Without styles


@@ -115,4 +139,68 @@ class IntlUtil {
                //Return number formatter
                return ($formatters[$locale][$style] = \NumberFormatter::create($locale, $styles[$style]));
        }
                //Return number formatter
                return ($formatters[$locale][$style] = \NumberFormatter::create($locale, $styles[$style]));
        }

+
+       /**
+        * Format number
+        */
+       public function number(int|float $number, $style = 'decimal', $type = 'default', ?string $locale = null) {
+               //Set types
+               static $types = [
+                       'default' => \NumberFormatter::TYPE_DEFAULT,
+                       'int32' => \NumberFormatter::TYPE_INT32,
+                       'int64' => \NumberFormatter::TYPE_INT64,
+                       'double' => \NumberFormatter::TYPE_DOUBLE,
+                       'currency' => \NumberFormatter::TYPE_CURRENCY
+               ];
+
+               //Get formatter
+               $formatter = $this->getNumberFormatter($locale, $style);
+
+               //Without type
+               if (!isset($types[$type])) {
+                       throw new SyntaxError(sprintf('The type "%s" does not exist. Known types are: "%s"', $type, implode('", "', array_keys($types))));
+               }
+
+               //Return formatted number
+               return $formatter->format($number, $types[$type]);
+       }
+
+       /**
+        * Format size
+        *
+        * @TODO: @XXX: add unit translation kB, MB, GiB, etc ?
+        */
+       public function size(int|float $number, $si = true, $style = 'decimal', $type = 'default', ?string $locale = null) {
+               //Set types
+               static $types = [
+                       'default' => \NumberFormatter::TYPE_DEFAULT,
+                       'int32' => \NumberFormatter::TYPE_INT32,
+                       'int64' => \NumberFormatter::TYPE_INT64,
+                       'double' => \NumberFormatter::TYPE_DOUBLE,
+                       'currency' => \NumberFormatter::TYPE_CURRENCY
+               ];
+
+               //Get formatter
+               $formatter = $this->getNumberFormatter($locale, $style);
+
+               //Without type
+               if (!isset($types[$type])) {
+                       throw new SyntaxError(sprintf('The type "%s" does not exist. Known types are: "%s"', $type, implode('", "', array_keys($types))));
+               }
+
+               //Set unit
+               $unit = $si ? 1000 : 1024;
+
+               //Set index
+               $index = [ '', $si ? 'k' : 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+               //Get exp
+               $exp = intval((log($number) / log($unit)));
+
+               //Rebase number
+               $number = round($number / pow($unit, $exp), 2);
+
+               //Return formatted number
+               return $formatter->format($number, $types[$type]).' '.$index[$exp].($si ? '' : 'i').'B';
+       }

 }
 }