Types fixes

galette · May 10, 2024 · 47bcea9 · 47bcea9
1 parent f7d7a8b
commit 47bcea9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/galette/lib/Galette/Entity/ScheduledPayment.php b/galette/lib/Galette/Entity/ScheduledPayment.php
@@ -128,7 +128,7 @@ private function loadFromRs(ArrayObject $rs): void
         $this->payment_type = new PaymentType($this->zdb, $rs->id_paymenttype);
         $this->creation_date = $rs->creation_date;
         $this->scheduled_date = $rs->scheduled_date;
-        $this->amount = $rs->amount;
+        $this->amount = (float)$rs->amount;
         $this->is_paid = (bool)$rs->paid;
         $this->comment = $rs->comment;
     }
@@ -520,7 +520,7 @@ public function getAllocation(int $id_cotis): float
 
         $results = $this->zdb->execute($select);
         $result = $results->current();
-        return $result->allocation ?? 0;
+        return (float)($result->allocation ?? 0);
     }
 
     /**

diff --git a/galette/lib/Galette/Entity/Transaction.php b/galette/lib/Galette/Entity/Transaction.php
@@ -273,7 +273,7 @@ private function loadFromRS(ArrayObject $r): void
         $pk = self::PK;
         $this->id = $r->$pk;
         $this->date = $r->trans_date;
-        $this->amount = $r->trans_amount;
+        $this->amount = (float)$r->trans_amount;
         $this->description = $r->trans_desc;
         $adhpk = Adherent::PK;
         $this->member = (int)$r->$adhpk;
@@ -304,9 +304,12 @@ public function check(array $values, array $required, array $disabled): bool|arr
             $prop = $this->fields[$key]['propname'];
 
             if (isset($values[$key])) {
-                $value = trim($values[$key]);
+                $value = $values[$key];
+                if (is_string($value)) {
+                    $value = trim($value);
+                }
             } else {
-                $value = '';
+                $value = null;
             }
 
             // if the field is enabled, check it
@@ -322,7 +325,8 @@ public function check(array $values, array $required, array $disabled): bool|arr
                             $this->member = (int)$value;
                             break;
                         case 'trans_amount':
-                            $value = strtr($value, ',', '.');
+                            //FIXME: this is a hack to allow comma as decimal separator
+                            $value = strtr((string)$value, ',', '.');
                             $this->amount = (double)$value;
                             if (!is_numeric($value)) {
                                 $this->errors[] = _T("- The amount must be an integer!");

diff --git a/galette/lib/Galette/Repository/Contributions.php b/galette/lib/Galette/Repository/Contributions.php
@@ -250,7 +250,7 @@ private function calculateSum(Select $select): void
             $results = $this->zdb->execute($sumSelect);
             $result = $results->current();
             if ($result->contribsum) {
-                $this->sum = round($result->contribsum, 2);
+                $this->sum = round((float)$result->contribsum, 2);
             }
         } catch (Throwable $e) {
             Analog::log(

diff --git a/galette/lib/Galette/Util/Release.php b/galette/lib/Galette/Util/Release.php
@@ -187,7 +187,7 @@ public function getReleasesURL(): string
      *
      * @return string
      */
-    protected function getDataTocache(): string
+    protected function getDataTocache(): ?string
     {
         return $this->latest;
     }