Merge pull request #3 from sdiaz-utrace/master

upgrade to php 81 laravel 9+

Author: sdiaz-utrace

composer.json

@@ -23,13 +23,13 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
-    "illuminate/support": "^6.0|^7.0|^8.0"
+    "php": "^8.1",
+    "illuminate/support": "^9.0|^10.0|^11.0|^12.0"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.2",
-    "orchestra/testbench": "^4.5|^5.0|^6.0",
-    "phpunit/phpunit": "^8.0|^9.0"
+    "friendsofphp/php-cs-fixer": "^3.64",
+    "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
+    "phpunit/phpunit": "^9.5|^10.0|^11.0"
   },
   "autoload": {
     "psr-4": {

phpunit.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         bootstrap="vendor/autoload.php" 
+         backupGlobals="false" 
+         backupStaticAttributes="false" 
+         colors="true" 
+         verbose="true" 
+         convertErrorsToExceptions="true" 
+         convertNoticesToExceptions="true" 
+         convertWarningsToExceptions="true" 
+         processIsolation="false" 
+         stopOnFailure="false" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd">
     <coverage>
         <include>
             <directory suffix=".php">src/</directory>

src/CuitValidatorProvider.php

@@ -9,22 +9,36 @@
 
 class CuitValidatorProvider extends ServiceProvider
 {
-    public function boot()
+    public function boot(): void
     {
         $this->publishes([
-            __DIR__.'/../resources/lang' => resource_path('lang/vendor/iutrace'),
-        ]);
+            __DIR__.'/../resources/lang' => $this->getLanguagePath(),
+        ], 'lang');
 
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang/', 'iutrace');
 
-        Validator::extend('cuit', Cuit::class . '@passes');
+        Validator::extend('cuit', [Cuit::class, 'passes']);
         Validator::replacer('cuit', function ($message, $attribute) {
             return Cuit::replacerMessage($attribute);
         });
 
-        Validator::extend('cuil', Cuil::class . '@passes');
+        Validator::extend('cuil', [Cuil::class, 'passes']);
         Validator::replacer('cuil', function ($message, $attribute) {
             return Cuil::replacerMessage($attribute);
         });
     }
+
+    /**
+     * Get the language path for publishing translations.
+     * 
+     * @return string
+     */
+    private function getLanguagePath(): string
+    {
+        if (method_exists($this->app, 'langPath')) {
+            return $this->app->langPath('vendor/iutrace');
+        }
+
+        return resource_path('lang/vendor/iutrace');
+    }
 }

src/Rules/Cuil.php

@@ -13,7 +13,7 @@ class Cuil extends Cuit
         27,
     ];
 
-    public static function replacerMessage($attribute)
+    public static function replacerMessage(string $attribute): string
     {
         return __('iutrace::validation.cuil', [
             'attribute' => $attribute,

src/Rules/Cuit.php

@@ -19,8 +19,7 @@ class Cuit implements Rule
         34,
     ];
 
-    /* @var $attribute String */
-    protected $attribute;
+    protected string $attribute;
 
     /**
      * @inheritDoc
@@ -35,18 +34,18 @@ public function passes($attribute, $value): bool
     /**
      * @inheritDoc
      */
-    public function message()
+    public function message(): string
     {
         return static::replacerMessage($this->attribute);
     }
 
-    public static function validate($value): bool
+    public static function validate(mixed $value): bool
     {
-        if (strlen($value) != 11) {
+        if (!is_string($value) || strlen($value) !== 11) {
             return false;
         }
 
-        if (! Str::startsWith($value, static::TYPES)) {
+        if (!Str::startsWith($value, static::TYPES)) {
             return false;
         }
 
@@ -59,24 +58,24 @@ public static function validate($value): bool
         $multiplier = 2;
         $accumulator = 0;
         foreach ($digits as $digit) {
-            $accumulator += $digit * $multiplier;
+            $accumulator += (int) $digit * $multiplier;
 
             $multiplier = ($multiplier + 1) % 8;
             $multiplier = $multiplier === 0 ? 2 : $multiplier;
         }
 
         $calculatedVerifier = 11 - ($accumulator % 11);
 
-        if ($calculatedVerifier == 11) {
+        if ($calculatedVerifier === 11) {
             $calculatedVerifier = 0;
-        } elseif ($calculatedVerifier == 10) {
+        } elseif ($calculatedVerifier === 10) {
             $calculatedVerifier = 1;
         }
 
-        return $verifier == $calculatedVerifier;
+        return (int) $verifier === $calculatedVerifier;
     }
 
-    public static function replacerMessage($attribute)
+    public static function replacerMessage(string $attribute): string
     {
         return __('iutrace::validation.cuit', [
             'attribute' => $attribute,

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Iutrace\Validation\Tests;
 
+use Illuminate\Cache\CacheServiceProvider;
 use Illuminate\Filesystem\FilesystemServiceProvider;
 use Illuminate\Translation\TranslationServiceProvider;
 use Illuminate\Validation\ValidationServiceProvider;
@@ -10,9 +11,10 @@
 
 class TestCase extends OrchestraTest
 {
-    protected function getApplicationProviders($app)
+    protected function getPackageProviders($app): array
     {
         return [
+            CacheServiceProvider::class,
             ValidationServiceProvider::class,
             TranslationServiceProvider::class,
             FilesystemServiceProvider::class,