prepare new release

Author: nyamsprod

CHANGELOG.md

@@ -2,8 +2,13 @@
 
 All Notable changes to `bakame/laravel-intl-formatter` will be documented in this file
 
+## [0.2.0] - 2022-06-06
+
+
 ## [0.1.0] - 2022-06-04
 
 **Initial release!**
 
+[Next]: https://github.com/bakame-php/laravel-intl-formatter/compare/0.2.0...main
+[0.2.0]: https://github.com/bakame-php/laravel-intl-formatter/compare/0.1.0...0.2.0
 [0.1.0]: https://github.com/bakame-php/laravel-intl-formatter/releases/tag/0.1.0

README.md

@@ -3,9 +3,9 @@ Laravel Intl Formatter
 
 [![Author](http://img.shields.io/badge/[email protected]?style=flat-square)](https://twitter.com/nyamsprod)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![Build](https://github.com/bakame-php/laravel-intl-extra/workflows/build/badge.svg)](https://github.com/bakame-php/laravel-intl-extra/actions?query=workflow%3A%22build%22)
-[![Latest Version](https://img.shields.io/github/release/bakame-php/laravel-intl-extra.svg?style=flat-square)](https://github.com/bakame-php/laravel-intl-extra/releases)
-[![Total Downloads](https://img.shields.io/packagist/dt/bakame/laravel-intl-extra.svg?style=flat-square)](https://packagist.org/packages/bakame/laravel-intl-extra)
+[![Build](https://github.com/bakame-php/laravel-intl-formatter/workflows/build/badge.svg)](https://github.com/bakame-php/laravel-intl-formatter/actions?query=workflow%3A%22build%22)
+[![Latest Version](https://img.shields.io/github/release/bakame-php/laravel-intl-formatter.svg?style=flat-square)](https://github.com/bakame-php/laravel-intl-formatter/releases)
+[![Total Downloads](https://img.shields.io/packagist/dt/bakame/laravel-intl-formatter.svg?style=flat-square)](https://packagist.org/packages/bakame/laravel-intl-formatter)
 [![Sponsor development of this project](https://img.shields.io/badge/sponsor%20this%20package-%E2%9D%A4-ff69b4.svg?style=flat-square)](https://github.com/sponsors/nyamsprod)
 
 This is a Laravel port of the [Twig Intl Extension](https://github.com/twigphp/intl-extra) package.
@@ -164,7 +164,7 @@ echo view($templatePath, $templateData)->render();
 Formats a number;
 
 ```blade
-format number: {{ format_number($number, $attrs, $locale) }}
+format number: {{ format_number($number, $locale, $attrs) }}
 ```
 
 ```php
@@ -187,7 +187,7 @@ echo view($templatePath, $templateData)->render();
 Formats a date and time;
 
 ```blade
-format datetime: {{ format_datetime($date, $dateFormat, $timeFormat, $pattern, $timezone, $calendar, $locale) }}
+format datetime: {{ format_datetime($date, $locale, $timezone, $dateFormat, $timeFormat, $pattern, $calendar) }}
 ```
 
 ```php
@@ -209,7 +209,7 @@ echo view($templatePath, $templateData)->render();
 Formats a the date portion of a datetime;
 
 ```blade
-format date: {{ format_date($date, $dateFormat, $pattern, $timezone, $calendar, $locale) }}
+format date: {{ format_date($date, $locale, $timezone, $dateFormat, $pattern, $calendar) }}
 ```
 
 ```php
@@ -230,7 +230,7 @@ echo view($templatePath, $templateData)->render();
 Formats the time portion of a datetime;
 
 ```blade
-format time: {{ format_time($date, $timeFormat, $pattern, $timezone, $calendar, $locale) }}
+format time: {{ format_time($date, $locale, $timezone, $timeFormat, $pattern, $calendar) }}
 ```
 
 ```php
@@ -262,7 +262,7 @@ In PHP8+, you can use named parameters to improve functions usages as they tend
 ```php 
 <?php
 
-echo format_datetime('2019-08-07 23:39:12', 'mediun', 'medium', '', null, 'gregorian', 'fr');
+echo format_datetime('2019-08-07 23:39:12', 'fr', null, medium', 'medium', '', 'gregorian', 'fr');
 ```
 
 **In PHP8+**
@@ -302,7 +302,7 @@ Credits
 -------
 
 - [ignace nyamagana butera](https://github.com/nyamsprod)
-- [All Contributors](https://github.com/bakame-php/laravel-intl-extra/contributors)
+- [All Contributors](https://github.com/bakame-php/laravel-intl-formatter/contributors)
 
 Attribution
 -------

composer.json

@@ -39,7 +39,7 @@
         "php": "^7.4 || ^8.0",
         "illuminate/config": "^8.0 || ^9.0",
         "illuminate/support": "^8.0 || ^9.0",
-        "bakame/intl-formatter": "0.1.0"
+        "bakame/intl-formatter": "~0.2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.8",
@@ -74,10 +74,10 @@
         },
         "laravel": {
             "providers": [
-                "Provider"
+                "Bakame\\Intl\\Laravel\\Provider"
             ],
             "aliases": {
-                "Formatter": "Bakame\\Int\\Laravel\\Formatter"
+                "Formatter": "Bakame\\Intl\\Laravel\\Formatter"
             }
         }
     },

config/bakame-intl-formatter.php

@@ -43,6 +43,14 @@
         | Expected: ?string
         */
         'pattern' => null,
+        /*
+        |--------------------------------------------------------------------------
+        | Calendar
+        |--------------------------------------------------------------------------
+        |
+        | Calendar to use (gregorian, traditional)
+        */
+        'calendar' => 'gregorian',
     ],
     'number' => [
         /*

src/Factory.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bakame\Intl\Laravel;
+
+use Bakame\Intl\DateFactory;
+use Bakame\Intl\DateResolver;
+use Bakame\Intl\Formatter;
+use Bakame\Intl\NumberFactory;
+
+final class Factory
+{
+    private DateFactory $dateFactory;
+    private NumberFactory $numberFactory;
+
+    public function __construct(DateFactory $dateFactory, NumberFactory $numberFactory)
+    {
+        $this->dateFactory = $dateFactory;
+        $this->numberFactory = $numberFactory;
+    }
+
+    /**
+     * @param array{
+     *     date:array{
+     *         dateFormat:string,
+     *         timeFormat:string,
+     *         calendar:string,
+     *         pattern?:?string
+     *     },
+     *     number:array{
+     *         style:string,
+     *         attributes:array<string, int|float|string>,
+     *         textAttributes:array<string, string>,
+     *         symbolAttributes:array<string, string>,
+     *         pattern?:?string
+     *     }
+     * } $settings
+     */
+    public static function fromAssociative(array $settings): self
+    {
+        return new self(
+            DateFactory::fromAssociative($settings['date']),
+            NumberFactory::fromAssociative($settings['number'])
+        );
+    }
+
+    public function newInstance(DateResolver $dateResolver): Formatter
+    {
+        return new Formatter(
+            $this->dateFactory,
+            $this->numberFactory,
+            $dateResolver
+        );
+    }
+}

src/Formatter.php renamed to src/IntlFormatter.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-final class Formatter extends Facade
+final class IntlFormatter extends Facade
 {
     /**
      * Get the registered name of the component.

src/Provider.php

@@ -4,15 +4,18 @@
 
 namespace Bakame\Intl\Laravel;
 
-use Bakame\Intl\Configuration;
 use Bakame\Intl\DateResolver;
 use Bakame\Intl\Formatter;
-use Bakame\Intl\SystemDateResolver;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
 
 final class Provider extends ServiceProvider
 {
+    public function boot(): void
+    {
+        $this->offerPublishing();
+    }
+
     public function register(): void
     {
         parent::register();
@@ -22,15 +25,28 @@ public function register(): void
         }
 
         $this->mergeConfigFrom(BKM_INTL_FORMATTER.'/config/bakame-intl-formatter.php', 'bakame.intl.formatter.settings');
-        $this->app->singleton('bakame.date.resolver', fn (): DateResolver => SystemDateResolver::fromTimeZone(
+        $this->app->singleton('bakame.date.resolver', fn (): DateResolver => DateResolver::fromTimeZone(
             Carbon::now()->getTimezone()
         ));
-        $this->app->singleton('bakame.intl.formatter.config', fn ($app): Configuration => Configuration::fromApplication(
+
+        $this->app->singleton('bakame.intl.formatter.factory', fn ($app): Factory => Factory::fromAssociative(
             $app->make('config')->get('bakame.intl.formatter.settings')
         ));
-        $this->app->singleton('bakame.intl.formatter', fn ($app): Formatter => new Formatter(
-            $app->make('bakame.intl.formatter.config'),
-            $app->make('bakame.date.resolver')
-        ));
+
+        $this->app->singleton(
+            'bakame.intl.formatter',
+            fn ($app): Formatter => $app->make('bakame.intl.formatter.factory')->newInstance(
+                $app->make('bakame.date.resolver')
+            )
+        );
+    }
+
+    protected function offerPublishing(): void
+    {
+        if ($this->app->runningInConsole()) {
+            $this->publishes([
+                BKM_INTL_FORMATTER.'/config/bakame-intl-formatter.php' => config_path('bakame-intl-formatter.php'),
+            ], 'config');
+        }
     }
 }