Types fixes

galette · May 12, 2024 · 75a0f7a · 75a0f7a
1 parent 221c704
commit 75a0f7a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/galette/lib/Galette/Filters/TransactionsList.php b/galette/lib/Galette/Filters/TransactionsList.php
@@ -184,6 +184,9 @@ public function __set(string $name, mixed $value): void
                 case 'end_date_filter':
                     $this->setFilterDate($name, $value, $name === 'start_date_filter');
                     break;
+                case 'filtre_cotis_adh':
+                    $this->$name = (int)$value;
+                    break;
                 default:
                     $this->$name = $value;
                     break;

diff --git a/galette/lib/Galette/Repository/Members.php b/galette/lib/Galette/Repository/Members.php
@@ -1403,7 +1403,7 @@ private function buildAdvancedWhereClause(Select $select): void
                         $select->where($qry);
                     } else {
                         $qry .= 'LOWER(' . $prefix . $field . ') ' . $qop . ' ';
-                        $select->where($qry . $zdb->platform->quoteValue('%' . strtolower($cd) . '%'));
+                        $select->where($qry . $zdb->platform->quoteValue('%' . strtolower((string)$cd) . '%'));
                     }
                 }
             }
@@ -1414,7 +1414,7 @@ private function buildAdvancedWhereClause(Select $select): void
             && !isset($this->filters->free_search['empty'])
         ) {
             foreach ($this->filters->free_search as $fs) {
-                $fs['search'] = mb_strtolower($fs['search']);
+                $fs['search'] = mb_strtolower((string)$fs['search']);
                 $qop = null;
                 switch ($fs['qry_op']) {
                     case AdvancedMembersList::OP_EQUALS:

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

diff --git a/tests/Galette/Repository/tests/units/Contributions.php b/tests/Galette/Repository/tests/units/Contributions.php
@@ -211,7 +211,7 @@ public function testGetList(): void
 
         $filters = new \Galette\Filters\ContributionsList();
         $filters->date_field = \Galette\Filters\ContributionsList::DATE_END;
-        $filters->filtre_cotis_children = true;
+        $filters->filtre_cotis_children = $this->adh->id;
         $contributions = new \Galette\Repository\Contributions($this->zdb, $login, $filters);
         $list = $contributions->getList(true);
         $this->assertCount(1, $list);

diff --git a/tests/Galette/Repository/tests/units/Members.php b/tests/Galette/Repository/tests/units/Members.php
@@ -337,7 +337,7 @@ public function testGetList(): void
 
         //search on member number
         $filters = new \Galette\Filters\MembersList();
-        $filters->filter_str = $this->mids[2];
+        $filters->filter_str = (string)$this->mids[2];
         $filters->field_filter = \Galette\Repository\Members::FILTER_ID;
         $members = new \Galette\Repository\Members($filters);
         $list = $members->getList();
@@ -764,7 +764,7 @@ public function testGetListContributionDynamics(): void
 
         $cdata += [
             'id_cotis' => $contrib->id,
-            'info_field_' . $cdf->getId() . '_1' => 2
+            'info_field_' . $cdf->getId() . '_1' => '2'
         ];
         $this->assertTrue($contrib->check($cdata, [], []));
         $this->assertTrue($contrib->store());

diff --git a/tests/Galette/Repository/tests/units/Transactions.php b/tests/Galette/Repository/tests/units/Transactions.php
@@ -189,7 +189,7 @@ public function testGetList(): void
         $this->assertCount(1, $list);
 
         $filters = new \Galette\Filters\TransactionsList();
-        $filters->filtre_cotis_children = true;
+        $filters->filtre_cotis_children = $this->adh->id;
         $transactions = new \Galette\Repository\Transactions($this->zdb, $login, $filters);
         $list = $transactions->getList(true);
         $this->assertCount(1, $list);