From c8215016e190934ff6bf4f480621d7521e4b5f54 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 25 Mar 2022 18:47:13 +0100 Subject: [PATCH] Fix PHP 8.1 --- include/common/riga.php | 2 +- lib/helpers.php | 2 +- src/Database.php | 2 +- src/Intl/Formatter.php | 16 +++++++--------- src/Util/Generator.php | 2 +- update/2_4_13.php | 1 - 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/include/common/riga.php b/include/common/riga.php index f28529443..46bdef961 100755 --- a/include/common/riga.php +++ b/include/common/riga.php @@ -33,7 +33,7 @@ echo ' // Quantità echo '
- {[ "type": "number", "label": "'.tr('Q.tà').'", "name": "qta", "required": 1, "value": "'.abs($result['qta']).'", "decimals": "qta"'.(isset($result['max_qta']) ? ', "icon-after": "/ '.numberFormat(abs($result['max_qta']), 'qta').' "' : '').', "min-value": "'.abs($result['qta_evasa']).'" ]} + {[ "type": "number", "label": "'.tr('Q.tà').'", "name": "qta", "required": 1, "value": "'.abs((float) $result['qta']).'", "decimals": "qta"'.(isset($result['max_qta']) ? ', "icon-after": "/ '.numberFormat(abs((float) $result['max_qta']), 'qta').' "' : '').', "min-value": "'.abs((float) $result['qta_evasa']).'" ]}
'; // Unità di misura diff --git a/lib/helpers.php b/lib/helpers.php index 520c464e2..ae18b01aa 100755 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -46,7 +46,7 @@ function database() */ function prepare($parameter) { - return database()->prepare($parameter); + return database()->prepare((string) $parameter); } /** diff --git a/src/Database.php b/src/Database.php index 5cf7bb805..1a0a57ee2 100755 --- a/src/Database.php +++ b/src/Database.php @@ -390,7 +390,7 @@ class Database extends Util\Singleton */ public function prepare($parameter) { - return $this->getPDO()->quote($parameter); + return $this->getPDO()->quote((string) $parameter); } /** diff --git a/src/Intl/Formatter.php b/src/Intl/Formatter.php index 05f082c1b..0ddf87ea4 100755 --- a/src/Intl/Formatter.php +++ b/src/Intl/Formatter.php @@ -421,18 +421,16 @@ class Formatter */ public function formatDate($value) { - if (!empty($value)){ - $object = DateTime::createFromFormat(static::$standards['date'], $value); + + $object = DateTime::createFromFormat(static::$standards['date'], (string) $value); - // Fallback per la gestione dei timestamp - $object = !is_object($object) ? DateTime::createFromFormat(static::$standards['timestamp'], $value) : $object; + // Fallback per la gestione dei timestamp + $object = !is_object($object) ? DateTime::createFromFormat(static::$standards['timestamp'], (string) $value) : $object; - $result = is_object($object) ? $object->format($this->getDatePattern()) : false; + $result = is_object($object) ? $object->format($this->getDatePattern()) : false; - return $result; - }else{ - return true; - } + return $result; + } /** diff --git a/src/Util/Generator.php b/src/Util/Generator.php index 79b8bc196..a968f335c 100755 --- a/src/Util/Generator.php +++ b/src/Util/Generator.php @@ -122,7 +122,7 @@ class Generator $pattern = str_replace(array_keys($replaces), array_values($values), $pattern); // Individuazione dei valori - preg_match('/^'.$pattern.'/', $string, $m); + preg_match('/^'.$pattern.'/', (string) $string, $m); return array_filter($m, 'is_string', ARRAY_FILTER_USE_KEY); } diff --git a/update/2_4_13.php b/update/2_4_13.php index 53f459b6c..4270ca06f 100755 --- a/update/2_4_13.php +++ b/update/2_4_13.php @@ -26,7 +26,6 @@ $files = [ 'templates\scadenzario\scadenzario.html', 'templates\registro_iva\pdfgen.registro_iva.php', 'templates\registro_iva\registroiva_body.html', - 'templates\registro_iva\header.php', 'templates\registro_iva\body.php', 'templates\preventivi_cons\body.php', 'templates\contratti_cons\body.php',