Merge branch 'master' into bug-New-User

ChurchCRM · Jan 1, 2025 · 240f45f · 240f45f
2 parents 22b74ef + b485bc8
commit 240f45f
Show file tree

Hide file tree

Showing 18 changed files with 411 additions and 411 deletions.
diff --git a/locale/messages.po b/locale/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  messages.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-05 12:48-0700\n"
+"POT-Creation-Date: 2024-12-08 14:46-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,8 +25,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-05T19:48:49.022Z\n"
-"PO-Revision-Date: 2024-10-05T19:48:49.023Z\n"
+"POT-Creation-Date: 2024-12-08T22:46:39.101Z\n"
+"PO-Revision-Date: 2024-12-08T22:46:39.102Z\n"
 "Language: en\n"
 
 msgid "Backup Database"
@@ -5083,6 +5083,9 @@ msgstr ""
 msgid "SMTP Host is not setup, please visit the settings page"
 msgstr ""
 
+msgid "Church Email not set, please visit the settings page"
+msgstr ""
+
 msgid "Debug Email Connection"
 msgstr ""
 
@@ -6687,6 +6690,9 @@ msgstr ""
 msgid "Sami (Northern) (Sweden)"
 msgstr ""
 
+msgid "Telugu - India"
+msgstr ""
+
 msgid "Tamil - India"
 msgstr ""
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
         "test-via-demo": "cp demo/cypress.config.ts cypress.config.ts && node_modules/cypress/bin/cypress run"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.6.0",
+        "@fortawesome/fontawesome-free": "^6.7.2",
         "admin-lte": "3.2.0",
         "bootbox": "^6.0.0",
         "bootstrap": "^4.6.2",
@@ -65,27 +65,27 @@
         "bootstrap-show-password": "^1.3.0",
         "bootstrap-toggle": "^2.2.2",
         "bootstrap-validator": "^0.11.9",
-        "chart.js": "^4.4.5",
+        "chart.js": "^4.4.7",
         "ckeditor4": "^4.25.0",
         "daterangepicker": "^3.1.0",
         "flag-icons": "^7.2.3",
         "fullcalendar": "^6.1.15",
         "i18n": "^0.15.1",
-        "i18next": "^23.16.2",
+        "i18next": "^24.1.2",
         "icheck-bootstrap": "^3.0.1",
         "inputmask": "^5.0.9",
         "jquery": "^3.7.1",
         "jquery-photo-uploader": "^1.0.13",
         "jquery-steps": "^1.1.0",
         "jquery-validation": "^1.21.0",
         "pace-js": "^1.2.4",
-        "react-bootstrap": "^2.10.5",
+        "react-bootstrap": "^2.10.7",
         "react-datepicker": "^7.5.0",
-        "react-select": "^5.8.1",
+        "react-select": "^5.9.0",
         "select2": "^4.0.13"
     },
     "devDependencies": {
-        "@types/jquery": "^3.5.31",
+        "@types/jquery": "^3.5.32",
         "babel-cli": "^6.26.0",
         "babel-core": "^6.26.3",
         "babel-loader": "^9.2.1",
@@ -102,21 +102,21 @@
         "grunt-http": "^2.3.3",
         "grunt-lineending": "^1.0.0",
         "grunt-sass": "^3.1.0",
-        "i18next-conv": "^15.0.0",
+        "i18next-conv": "^15.1.0",
         "i18next-parser": "^9.0.2",
         "node-sha1": "^1.0.1",
         "npm-run-all": "^4.1.5",
-        "prettier": "^3.3.3",
-        "sass": "^1.80.3",
+        "prettier": "^3.4.2",
+        "sass": "^1.83.0",
         "tar": "^7.4.3",
         "ts-loader": "^9.5.1",
-        "typescript": "^5.6.3",
-        "webpack": "^5.95.0",
+        "typescript": "^5.7.2",
+        "webpack": "^5.97.1",
         "webpack-cli": "^5.0.0"
     },
     "optionalDependencies": {
-        "cy-verify-downloads": "^0.2.5",
-        "cypress": "^13.15.0",
+        "cy-verify-downloads": "^0.2.6",
+        "cypress": "^13.17.0",
         "grunt-poeditor-gd": "^0.2.1"
     }
-}
+}
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/ChurchCRM/Service/SystemService.php b/src/ChurchCRM/Service/SystemService.php
@@ -155,7 +155,7 @@ public static function runTimerJobs(): void
 
     // Returns a file size limit in bytes based on the PHP upload_max_filesize
     // and post_max_size
-    public static function getMaxUploadFileSize($humanFormat = true)
+    public static function getMaxUploadFileSize(bool $humanFormat = true)
     {
         //select maximum upload size
         $max_upload = SystemService::parseSize(ini_get('upload_max_filesize'));
@@ -183,7 +183,7 @@ private static function parseSize(string $size): float
         }
     }
 
-    private static function humanFilesize($bytes, $decimals = 2): string
+    private static function humanFilesize(float $bytes, $decimals = 2): string
     {
         $size = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
         $factor = floor((strlen($bytes) - 1) / 3);

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/composer.json b/src/composer.json
@@ -63,8 +63,8 @@
         "vonage/client": "^2.4.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10",
-        "rector/rector": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "rector/rector": "^2.0",
         "squizlabs/php_codesniffer": "^3.7"
     },
     "replace": {
@@ -106,4 +106,4 @@
             "@orm-gen"
         ]
     }
-}
+}