attempt to fix issues reported in github

ChurchCRM · Dec 19, 2024 · b485bc8 · b485bc8
1 parent 28b931a
commit b485bc8
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/src/ChurchCRM/Service/AppIntegrityService.php b/src/ChurchCRM/Service/AppIntegrityService.php
@@ -72,7 +72,7 @@ public static function getIntegrityCheckMessage(): string
             AppIntegrityService::$IntegrityCheckDetails->message = gettext('The previous integrity check passed. All system file hashes match the expected values.');
         }
 
-        return AppIntegrityService::$IntegrityCheckDetails->message;
+        return AppIntegrityService::$IntegrityCheckDetails->message ?? '';
     }
 
     public static function getFilesFailingIntegrityCheck()

diff --git a/src/ChurchCRM/Service/FinancialService.php b/src/ChurchCRM/Service/FinancialService.php
@@ -121,7 +121,7 @@ public function getPayments($depID = null): array
             $values->plg_FamID = $plg_FamID;
             $values->familyString = $family->getFamilyString();
             $values->plg_FYID = $plg_FYID;
-            $values->FiscalYear = MakeFYString($plg_FYID);
+            $values->FiscalYear = MakeFYString($plg_FYID ? (int) $plg_FYID : null);
             $values->plg_date = $plg_date;
             $values->plg_amount = $plg_amount;
             $values->plg_schedule = $plg_schedule;

diff --git a/src/Include/Functions.php b/src/Include/Functions.php
@@ -143,7 +143,7 @@ function PrintFYIDSelect(string $selectName, int $iFYID = null): void
             $selectedTag = ' selected';
         }
 
-        $selectableOptions[] = sprintf('<option value="%s"', $fy) . $selectedTag . '>' . MakeFYString($fy) . '</option>';
+        $selectableOptions[] = sprintf('<option value="%s"', $fy) . $selectedTag . '>' . MakeFYString((int) $fy) . '</option>';
     }
 
     $selectableOptions = [

diff --git a/src/Reports/ClassAttendance.php b/src/Reports/ClassAttendance.php
@@ -18,7 +18,7 @@
 $nGrps = count($aGrp);
 LoggerUtils::getAppLogger()->debug("Group ID = {$iGroupID}");
 
-$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int');
 
 $tFirstSunday = InputUtils::legacyFilterInput($_GET['FirstSunday']);
 $tLastSunday = InputUtils::legacyFilterInput($_GET['LastSunday']);

diff --git a/src/Reports/ClassList.php b/src/Reports/ClassList.php
@@ -17,7 +17,7 @@
 $aGrp = explode(',', $iGroupID);
 $nGrps = count($aGrp);
 
-$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int');
 $dFirstSunday = InputUtils::legacyFilterInput($_GET['FirstSunday']);
 $dLastSunday = InputUtils::legacyFilterInput($_GET['LastSunday']);
 $withPictures = InputUtils::legacyFilterInput($_GET['pictures']);

diff --git a/src/Reports/PhotoBook.php b/src/Reports/PhotoBook.php
@@ -15,7 +15,7 @@
 $iGroupID = InputUtils::legacyFilterInput($_GET['GroupID']);
 $aGrp = explode(',', $iGroupID);
 
-$iFYID = InputUtils::legacyFilterInput($_GET['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_GET['FYID'], 'int');
 
 class PdfPhotoBook extends ChurchInfoReport
 {

diff --git a/src/Reports/PledgeSummary.php b/src/Reports/PledgeSummary.php
@@ -15,7 +15,7 @@
 
 // Filter Values
 $output = InputUtils::legacyFilterInput($_POST['output']);
-$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int');
 if (!$iFYID) {
     $iFYID = CurrentFY();
 }

diff --git a/src/Reports/ReminderReport.php b/src/Reports/ReminderReport.php
@@ -14,7 +14,7 @@
 AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isFinanceEnabled());
 
 // Get the Fiscal Year ID out of the query string
-$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int');
 if (!$iFYID) {
     $iFYID = CurrentFY();
 }

diff --git a/src/Reports/VotingMembers.php b/src/Reports/VotingMembers.php
@@ -9,7 +9,7 @@
 use ChurchCRM\Utils\InputUtils;
 
 // Get the Fiscal Year ID out of the query string
-$iFYID = InputUtils::legacyFilterInput($_POST['FYID'], 'int');
+$iFYID = (int) InputUtils::legacyFilterInput($_POST['FYID'], 'int');
 if (!$iFYID) {
     $iFYID = CurrentFY();
 }

diff --git a/src/SelectDelete.php b/src/SelectDelete.php
@@ -240,7 +240,7 @@
                     <tr class="<?= $sRowClass ?>">
                         <td><?= $plg_PledgeOrPayment ?>&nbsp;</td>
                         <td><?= $fundName ?>&nbsp;</td>
-                        <td><?= MakeFYString($plg_FYID) ?>&nbsp;</td>
+                        <td><?= MakeFYString($plg_FYID ? (int) $plg_FYID : null) ?>&nbsp;</td>
                         <td><?= $plg_date ?>&nbsp;</td>
                         <td><?= $plg_amount ?>&nbsp;</td>
                         <td><?= $plg_schedule ?>&nbsp;</td>

diff --git a/src/v2/templates/people/family-view.php b/src/v2/templates/people/family-view.php
@@ -15,7 +15,7 @@
 
 $iFYID = CurrentFY();
 if (array_key_exists('idefaultFY', $_SESSION)) {
-    $iFYID = MakeFYString($_SESSION['idefaultFY']);
+    $iFYID = MakeFYString((int) $_SESSION['idefaultFY']);
 }
 ?>