Merge pull request #11 from ageekdev/laravel-12-support

Support Laravel 12

Author: tintnaingwin

.github/workflows/fix-php-code-style-issues.yml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
     php-code-styling:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true

.github/workflows/phpstan.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
     phpstan:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
@@ -22,12 +22,12 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.2
+                  php-version: 8.4
                   tools: composer:v2
                   coverage: none
 
             - name: Install composer dependencies
-              uses: nick-fields/retry@v2
+              uses: nick-fields/retry@v3
               with:
                   timeout_minutes: 3
                   max_attempts: 5

.github/workflows/run-tests.yml

@@ -8,16 +8,20 @@ on:
 
 jobs:
     test:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
 
         strategy:
             fail-fast: true
             matrix:
-                php: [ 8.1, 8.2, 8.3 ]
-                laravel: [ 10, 11 ]
+                php: [ 8.4, 8.3, 8.2, 8.1 ]
+                laravel: ["^12.0", "^11.0", "^10.0", "^9.0"]
                 exclude:
                     -   php: 8.1
-                        laravel: 11
+                        laravel: "^12.0"
+                    -   php: 8.1
+                        laravel:  "^11.0"
+                    -   php: 8.4
+                        laravel:  "^9.0"
 
         name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -40,7 +44,7 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
+                  composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:>=2.72" --dev --no-interaction --no-update
                   composer update --prefer-dist --no-interaction --no-progress
 
             - name: Execute tests

README.md

@@ -4,6 +4,7 @@
 [![Laravel 9.x](https://img.shields.io/badge/Laravel-9.x-red.svg?style=flat-square)](https://laravel.com/docs/9.x)
 [![Laravel 10.x](https://img.shields.io/badge/Laravel-10.x-red.svg?style=flat-square)](https://laravel.com/docs/10.x)
 [![Laravel 11.x](https://img.shields.io/badge/Laravel-11.x-red.svg?style=flat-square)](https://laravel.com/docs/11.x)
+[![Laravel 12.x](https://img.shields.io/badge/Laravel-12.x-red.svg?style=flat-square)](https://laravel.com/docs/12.x)
 [![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/ageekdev/laravel-num/run-tests.yml?label=tests&style=flat-square)](https://github.com/ageekdev/laravel-num/actions/workflows/run-tests.yml)
 [![Total Downloads](https://img.shields.io/packagist/dt/ageekdev/laravel-num.svg?style=flat-square)](https://packagist.org/packages/ageekdev/laravel-num)
 

composer.json

@@ -19,17 +19,17 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^9.0|^10.0|^11.0"
+        "illuminate/support": "^9.0|^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "laravel/pint": "^1.5",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "larastan/larastan": "^2.0",
-        "orchestra/testbench": "^7.31|^8.11|^9.0",
-        "pestphp/pest": "^1.21|^2.0",
-        "pestphp/pest-plugin-laravel": "^1.4|^2.0",
+        "phpstan/extension-installer": "^1.1|^2.0",
+        "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
+        "phpstan/phpstan-phpunit": "^1.0|^2.0",
+        "larastan/larastan": "^2.0|^3.0",
+        "orchestra/testbench": "^7.31|^8.11|^9.0|^10.0",
+        "pestphp/pest": "^1.21|^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^1.4|^2.0|^3.0",
         "roave/security-advisories": "dev-latest"
     },
     "autoload": {

phpstan-baseline.neon

@@ -1,9 +1,5 @@
-includes:
-    - phpstan-baseline.neon
-
 parameters:
     level: 4
     paths:
         - src
     tmpDir: build/phpstan
-    checkMissingIterableValueType: false

phpstan.neon.dist

@@ -10,74 +10,85 @@ class Num
 {
     use Macroable;
 
+    private const LANG_EN = 'en';
+
+    private const LANG_MM = 'mm';
+
+    private const LANG_TH = 'th';
+
     /**
      * Convert the number to another language.
      *
-     * Supported Languages: "Myanmar", "English", "Thai"
+     * @param  int|string|null  $string  Number to convert
+     * @param  string  $to  Target language code (en|mm|th)
+     * @param  string|null  $from  Source language code
+     *
+     * @throws InvalidArgumentException
      */
-    public function convert(int|string|null $string, string $to = 'en', ?string $from = null): ?string
+    public function convert(int|string|null $string, string $to = self::LANG_EN, ?string $from = null): ?string
     {
         if ($string === null || $string === '') {
             return $string;
         }
 
         $zeros = config('num.zeros');
 
-        if (Arr::has($zeros, $to)) {
-            $toZero = $zeros[$to];
-        } else {
-            throw new InvalidArgumentException("\$to zero language [{$to}] is not defined.");
+        if (! Arr::has($zeros, $to)) {
+            throw new InvalidArgumentException("Target language [{$to}] is not configured in num.zeros config.");
         }
 
+        $toZero = $zeros[$to];
         $toNumber = num_range($toZero);
 
-        unset($zeros[$to]);
-
         if ($from !== null) {
-            if (Arr::has($zeros, $from)) {
-                $fromZero = $zeros[$from];
-            } else {
-                throw new InvalidArgumentException("\$from zero language [{$from}] is not defined.");
+            if (! Arr::has($zeros, $from)) {
+                throw new InvalidArgumentException("Source language [{$from}] is not configured in num.zeros config.");
             }
 
-            return $this->replaceNumber($string, $fromZero, $toNumber);
+            return $this->replaceNumber((string) $string, $zeros[$from], $toNumber);
         }
 
-        foreach ($zeros as $zero) {
-            $string = $this->replaceNumber($string, $zero, $toNumber);
+        $result = (string) $string;
+        foreach (Arr::except($zeros, $to) as $zero) {
+            $result = $this->replaceNumber($result, $zero, $toNumber);
         }
 
-        return $string;
+        return $result;
     }
 
-    private function replaceNumber($string, $zero, $toNumber): string
+    /**
+     * Replace numbers between number systems.
+     *
+     * @param  string  $string  Input string or number
+     * @param  string  $fromZero  Source zero character
+     * @param  array<int,string>  $toNumber  Target number array
+     */
+    private function replaceNumber(string $string, string $fromZero, array $toNumber): string
     {
-        $fromNumbers = num_range($zero);
-
-        return str_replace($fromNumbers, $toNumber, $string);
+        return str_replace(num_range($fromZero), $toNumber, $string);
     }
 
     /**
-     * Convert to the myanmar number.
+     * Convert to Myanmar number.
      */
     public function toMyanmar(int|string|null $string): ?string
     {
-        return $this->convert($string, 'mm');
+        return $this->convert($string, self::LANG_MM);
     }
 
     /**
-     * Convert to the thai number.
+     * Convert to Thai number.
      */
     public function toThai(int|string|null $string): ?string
     {
-        return $this->convert($string, 'th');
+        return $this->convert($string, self::LANG_TH);
     }
 
     /**
-     * Convert to the english number.
+     * Convert to English number.
      */
     public function toEnglish(int|string|null $string): ?string
     {
-        return $this->convert($string);
+        return $this->convert($string, self::LANG_EN);
     }
 }

src/Num.php

@@ -18,7 +18,7 @@ public function register(): void
         $this->mergeConfigFrom(__DIR__.'/../config/num.php', 'num');
 
         $this->app->singleton('num', function ($app) {
-            return new Num();
+            return new Num;
         });
     }
 }