Merge branch 'composer-update' of https://github.com/Dasc3er/openstamanager into Dasc3er-composer-update

loviuz · loviuz · commit bac1a5277c9b · 2025-05-01T13:04:58.000+02:00
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     }],
     "type": "project",
     "require": {
-        "php": "^8.1|^8.3",
+        "php": "^8.1",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
@@ -39,38 +39,36 @@
         "greenlion/php-sql-parser": "^4.5",
         "guzzlehttp/guzzle": "^7.0.1",
         "ifsnop/mysqldump-php": "^2.3",
-        "illuminate/database": "^8.0",
-        "intervention/image": "^3.11",
+        "illuminate/database": "^10.0",
+        "intervention/image": "^3.0",
         "jurosh/pdf-merge": "^2.1",
         "league/csv": "^9.7.0",
         "league/flysystem": "^3.0",
         "league/flysystem-ftp": "^3.0",
         "league/oauth2-client": "^2.6",
         "league/oauth2-google": "^4.0",
-        "monolog/monolog": "^1.27",
+        "monolog/monolog": "^3.0",
         "mpdf/mpdf": "^v8.0.10",
-        "mpociot/vat-calculator": "^2.3",
         "owasp/csrf-protector-php": "^1.0",
         "phpmailer/phpmailer": "^6.0",
         "picqer/php-barcode-generator": "^3.2",
         "respect/validation": "^2.0",
         "servo/fluidxml": "^2.0",
         "slim/flash": "^0.4.0",
         "spipu/html2pdf": "^5.0.0",
-        "symfony/filesystem": "^5.0",
-        "symfony/finder": "^5.0",
+        "symfony/filesystem": "^6.0",
+        "symfony/finder": "^6.0",
         "symfony/polyfill-ctype": "^1.8",
-        "symfony/polyfill-php70": "^1.8",
-        "symfony/translation": "^4.0",
-        "symfony/var-dumper": "^5.0",
+        "symfony/translation": "^6.0",
+        "symfony/var-dumper": "^6.0",
         "thenetworg/oauth2-azure": "^2.0",
         "voku/stringy": "^6.0.0",
         "willdurand/geocoder": "^4.2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.53",
         "phpunit/phpunit": "^11.5",
-        "rector/rector": "^1.0"
+        "rector/rector": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/core.php b/core.php
@@ -120,7 +120,7 @@
 
     // Aggiunta di Monolog a Whoops
     $whoops->pushHandler(function ($exception, $inspector, $run) use ($logger) {
-        $logger->addError($exception->getMessage(), [
+        $logger->addRecord(Monolog\Level::Error, $exception->getMessage(), [
             'code' => $exception->getCode(),
             'message' => $exception->getMessage(),
             'file' => $exception->getFile(),
@@ -151,9 +151,9 @@
 $handler = new Monolog\ErrorHandler($logger);
 if (!API\Response::isAPIRequest()) {
     $handler->registerErrorHandler([]);
-    $handler->registerExceptionHandler(Monolog\Logger::ERROR);
+    //$handler->registerExceptionHandler(); // Handled by Whoops above
 }
-$handler->registerFatalHandler(Monolog\Logger::ERROR);
+$handler->registerFatalHandler(\Psr\Log\LogLevel::ERROR);
 
 // Database
 $dbo = $database = database();
diff --git a/lib/common.php b/lib/common.php
@@ -29,6 +29,7 @@
 use Modules\Fatture\Fattura;
 use Modules\Interventi\Intervento;
 use Modules\Ordini\Ordine;
+use Intervention\Image\ImageManager;
 
 /**
  * Esegue una somma precisa tra due interi/array.
@@ -422,3 +423,12 @@ function hasArticoliFiglio($id_articolo)
         return false;
     }
 }
+
+/**
+ * Funzione per generare una classe helper standard per le immagini.
+ *
+ * @return ImageManager
+ */
+function getImageManager() {
+    return extension_loaded('gd') ? ImageManager::gd() : ImageManager::imagick();
+}
diff --git a/lib/deprecated.php b/lib/deprecated.php
@@ -69,10 +69,7 @@ function create_thumbnails($tmp, $filename, $dir)
         return false;
     }
 
-    $driver = extension_loaded('gd') ? 'gd' : 'imagick';
-    Intervention\Image\ImageManagerStatic::configure(['driver' => $driver]);
-
-    $img = Intervention\Image\ImageManagerStatic::make($tmp);
+    $img = getImageManager()->read($tmp);
 
     $img->resize(600, null, function ($constraint) {
         $constraint->aspectRatio();
diff --git a/modules/contratti/src/Contratto.php b/modules/contratti/src/Contratto.php
@@ -50,11 +50,11 @@ class Contratto extends Document
      *
      * @var array
      */
-    protected $dates = [
-        'data_bozza',
-        'data_conclusione',
-        'data_accettazione',
-        'data_rifiuto',
+    protected $casts = [
+        'data_bozza' => 'date',
+        'data_conclusione' => 'date',
+        'data_accettazione' => 'date',
+        'data_rifiuto' => 'date',
     ];
 
     /**
diff --git a/modules/fatture/src/Fattura.php b/modules/fatture/src/Fattura.php
@@ -51,6 +51,7 @@ class Fattura extends Document
         'bollo' => 'float',
         'peso' => 'float',
         'volume' => 'float',
+        'data' => 'date',
 
         'sconto_finale' => 'float',
         'sconto_finale_percentuale' => 'float',
@@ -60,10 +61,6 @@ class Fattura extends Document
         'tipo',
     ];
 
-    protected $dates = [
-        'data',
-    ];
-
     /** @var GestoreScadenze */
     protected $gestoreScadenze;
     /** @var GestoreMovimenti */
diff --git a/modules/interventi/actions.php b/modules/interventi/actions.php
@@ -747,10 +747,10 @@
 
                 $data = explode(',', post('firma_base64'));
 
-                $manager = ImageManager::gd();
-                $img = $manager->read(base64_decode($data[1]));
-
-                $img->scale(680, 202);
+                $img = getImageManager()->read(base64_decode($data[1]));
+                $img->resize(680, 202, function ($constraint) {
+                    $constraint->aspectRatio();
+                });
 
                 if (setting('Sistema di firma') == 'Tavoletta Wacom') {
                     $img->brightness((float)setting('Luminosità firma Wacom'));
@@ -835,9 +835,10 @@
 
                     $data = explode(',', post('firma_base64'));
 
-                    $manager = ImageManager::gd();
-                    $img = $manager->read(base64_decode($data[1]));
-                    $img->scale(680, 202);
+                    $img = getImageManager()->read(base64_decode($data[1]));
+                    $img->resize(680, 202, function ($constraint) {
+                        $constraint->aspectRatio();
+                    });
 
                     if (!$img->save(base_dir().'/files/interventi/'.$firma_file)) {
                         flash()->error(tr('Impossibile creare il file!'));
diff --git a/modules/interventi/src/Intervento.php b/modules/interventi/src/Intervento.php
@@ -41,9 +41,9 @@ class Intervento extends Document
 
     protected $info = [];
 
-    protected $dates = [
-        'data_richiesta',
-        'data_scadenza',
+    protected $casts = [
+        'data_richiesta' => 'date',
+        'data_scadenza' => 'date',
     ];
 
     protected static $translated_fields = [];
diff --git a/modules/preventivi/src/Preventivo.php b/modules/preventivi/src/Preventivo.php
@@ -49,11 +49,11 @@ class Preventivo extends Document
      *
      * @var array
      */
-    protected $dates = [
-        'data_bozza',
-        'data_conclusione',
-        'data_accettazione',
-        'data_rifiuto',
+    protected $casts = [
+        'data_bozza' => 'date',
+        'data_conclusione' => 'date',
+        'data_accettazione' => 'date',
+        'data_rifiuto' => 'date',
     ];
 
     protected $info = [];
diff --git a/modules/scadenzario/src/Scadenza.php b/modules/scadenzario/src/Scadenza.php
@@ -32,9 +32,9 @@ class Scadenza extends Model
 
     protected $table = 'co_scadenziario';
 
-    protected $dates = [
-        'scadenza',
-        'data_pagamento',
+    protected $casts = [
+        'scadenza' => 'date',
+        'data_pagamento' => 'date',
     ];
 
     public static function build($idanagrafica = null, $descrizione = null, $importo = null, $data_scadenza = null, $id_pagamento = null, $id_banca_azienda = null, $id_banca_controparte = null, $type = 'fattura', $is_pagato = false)
diff --git a/plugins/componenti/src/Componente.php b/plugins/componenti/src/Componente.php
@@ -37,11 +37,11 @@ class Componente extends Model
 
     protected $table = 'my_componenti';
 
-    protected $dates = [
-        'data_registrazione',
-        'data_sostituzione',
-        'data_installazione',
-        'data_rimozione',
+    protected $casts = [
+        'data_registrazione' => 'date',
+        'data_sostituzione' => 'date',
+        'data_installazione' => 'date',
+        'data_rimozione' => 'date',
     ];
 
     /**
diff --git a/plugins/pianificazione_fatturazione/src/Pianificazione.php b/plugins/pianificazione_fatturazione/src/Pianificazione.php
@@ -33,8 +33,8 @@ class Pianificazione extends Document
      *
      * @var array
      */
-    protected $dates = [
-        'data_scadenza',
+    protected $casts = [
+        'data_scadenza' => 'date',
     ];
 
     /**
diff --git a/plugins/pianificazione_interventi/src/Promemoria.php b/plugins/pianificazione_interventi/src/Promemoria.php
@@ -42,8 +42,8 @@ class Promemoria extends Document
      *
      * @var array
      */
-    protected $dates = [
-        'data_richiesta',
+    protected $casts = [
+        'data_richiesta' => 'date',
     ];
 
     /**
diff --git a/src/Extensions/MessageHandler.php b/src/Extensions/MessageHandler.php
@@ -21,6 +21,7 @@
 namespace Extensions;
 
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\LogRecord;
 
 /**
  * Gestore dei messaggi di avvertenza in caso di malfunzionamento del gestionale.
@@ -29,7 +30,7 @@
  */
 class MessageHandler extends AbstractProcessingHandler
 {
-    protected function write(array $record): void
+    protected function write(LogRecord $record): void
     {
         // Controlla se la richiesta è AJAX
         if (\Whoops\Util\Misc::isAjaxRequest()) {
diff --git a/src/Intl/FileLoader.php b/src/Intl/FileLoader.php
@@ -33,7 +33,7 @@ public function __construct(protected $include_filename = false)
     {
     }
 
-    protected function loadResource($resource)
+    protected function loadResource(string $resource) : array
     {
         $result = [];
 
diff --git a/src/Models/Cache.php b/src/Models/Cache.php
@@ -44,10 +44,7 @@ class Cache extends Model
     ];
     protected $casts = [
         'content' => 'array',
-    ];
-
-    protected $dates = [
-        'expire_at',
+        'expire_at' => 'date',
     ];
 
     public static function build($name = null, $valid_time = null, $expire_at = null)
diff --git a/src/Models/Upload.php b/src/Models/Upload.php
@@ -411,10 +411,11 @@ protected static function generateThumbnails($upload)
             return;
         }
 
-        $manager = ImageManager::gd();
-        $img = $manager->read($filepath);
-        $img->scale(600, null);
+        $img = getImageManager()->read($filepath);
 
+        $img->resize(600, null, function ($constraint) {
+            $constraint->aspectRatio();
+        });
         $img->save(slashes($directory.'/'.$info['filename'].'_thumb600.'.$info['extension']));
 
         $img->scale(250, null);
@@ -424,4 +425,22 @@ protected static function generateThumbnails($upload)
         $img->save(slashes($directory.'/'.$info['filename'].'_thumb100.'.$info['extension']));
     }
 
+    protected static function ridimensionaImmagini($upload)
+    {
+        $info = $upload->info;
+        $directory = $upload->attachments_directory;
+
+        $filepath = base_dir().'/'.$info['dirname'].'/'.$info['filename'].'.'.$info['extension'];
+
+        if (!in_array(mime_content_type($filepath), ['image/png', 'image/gif', 'image/jpeg'])) {
+            return;
+        }
+
+        $img = getImageManager()->read($filepath);
+
+        $img->resize(setting('Larghezza per ridimensionamento immagini'), null, function ($constraint) {
+            $constraint->aspectRatio();
+        });
+        $img->save(slashes($filepath));
+    }
 }
diff --git a/src/Models/User.php b/src/Models/User.php
@@ -22,8 +22,6 @@
 
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
-use Intervention\Image\ImageManager;
-use Intervention\Image\Drivers\Imagick\Driver;
 use Modules\Anagrafiche\Anagrafica;
 
 class User extends Model
@@ -172,9 +170,9 @@ public function setPhotoAttribute($value)
         $file = base_dir().'/files/temp_photo.'.$info['extension'];
 
         // Ridimensionamento
-        $manager = ImageManager::gd();
-        $img = $manager->read($filepath);
-        $img->scale(100, 100);
+        $img = getImageManager()->read($filepath)->resize(100, 100, function ($constraint) {
+            $constraint->aspectRatio();
+        });
         $img->save(slashes($file));
 
         // Aggiunta nuova foto
diff --git a/src/Tasks/Task.php b/src/Tasks/Task.php
@@ -39,9 +39,9 @@ class Task extends Model
         'title',
     ];
 
-    protected $dates = [
-        'next_execution_at',
-        'last_executed_at',
+    protected $casts = [
+        'next_execution_at' => 'date',
+        'last_executed_at' => 'date',
     ];
 
     public function log($level, $message, $context = [])
diff --git a/src/Validate.php b/src/Validate.php
@@ -19,8 +19,6 @@
  */
 
 use API\Services;
-use Mpociot\VatCalculator\Exceptions\VATCheckUnavailableException;
-use Mpociot\VatCalculator\VatCalculator;
 use Respect\Validation\Validator as v;
 
 /**
@@ -86,6 +84,9 @@ public static function isValidVatNumber($vat_number)
         }
 
         /*
+        // mpociot/vat-calculator
+        use Mpociot\VatCalculator\Exceptions\VATCheckUnavailableException;
+        use Mpociot\VatCalculator\VatCalculator;
         // Controllo con API europea ufficiale
         if (extension_loaded('soap')) {
             try {
@@ -96,7 +97,8 @@ public static function isValidVatNumber($vat_number)
                 }
             } catch (VATCheckUnavailableException $e) {
             }
-        } */
+        }
+        */
 
         // Controllo attraverso apilayer
         $access_key = setting('apilayer API key for VAT number');
