Stronger PHP types, and update PHP devs

src/ChurchCRM/Reports/PDF_Directory.php

@@ -287,7 +287,7 @@ public function sGetCustomString($rsCustomFields, $aRow): string
         }
     }
 
-    public function getBirthdayString(bool $bDirBirthday, $per_BirthMonth, $per_BirthDay, $per_BirthYear, $per_Flags): string
+    public function getBirthdayString(bool $bDirBirthday, $per_BirthMonth, $per_BirthDay, $per_BirthYear, ?bool $per_Flags): string
     {
         if ($bDirBirthday && $per_BirthDay > 0 && $per_BirthMonth > 0) {
             return MiscUtils::formatBirthDate($per_BirthYear, $per_BirthMonth, $per_BirthDay, $per_Flags);

src/ChurchCRM/SQLUtils.php

@@ -93,7 +93,7 @@ private static function clearSQL($sql, &$isMultiComment)
         while (preg_match('{--\s|#|/\*[^!]}sUi', $sql, $matched, PREG_OFFSET_CAPTURE, $offset)) {
             [$comment, $foundOn] = $matched[0];
             if (self::isQuoted($foundOn, $sql)) {
-                $offset = (int) $foundOn + strlen($comment);
+                $offset = $foundOn + strlen($comment);
             } else {
                 if (mb_substr($comment, 0, 2) == '/*') {
                     $closedOn = strpos($sql, '*/', $foundOn);

src/ChurchCRM/dto/Photo.php

@@ -14,8 +14,8 @@ class Photo
     private $photoURI;
     private ?string $photoThumbURI = null;
     private ?string $thumbnailPath = null;
-    private $photoContentType;
-    private $thumbnailContentType;
+    private $photoContentType = null;
+    private $thumbnailContentType = null;
     private bool $remotesEnabled;
 
     public static $validExtensions = ['png', 'jpeg', 'jpg'];
@@ -208,12 +208,12 @@ public function getThumbnailBytes(): string
         return $content;
     }
 
-    public function getPhotoBytes()
+    public function getPhotoBytes(): string
     {
         $content = file_get_contents($this->photoURI);
         MiscUtils::throwIfFailed($content);
 
-        return $content;
+        return (string) $content;
     }
 
     public function getPhotoContentType()

src/ChurchCRM/model/ChurchCRM/Person.php

@@ -44,7 +44,7 @@ public function isFemale(): bool
         return $this->getGender() == 2;
     }
 
-    public function getGenderName()
+    public function getGenderName(): string
     {
         switch (strtolower($this->getGender())) {
             case 1:

src/ChurchCRM/utils/RedirectUtils.php

@@ -9,8 +9,6 @@ class RedirectUtils
     /**
      * Convert a relative URL into an absolute URL and redirect the browser there.
      *
-     * @param string $sRelativeURL
-     *
      * @throws \Exception
      */
     public static function redirect(string $sRelativeURL): void

src/PeopleDashboard.php

@@ -285,9 +285,9 @@
                         <th style="width: 40px"><?= gettext('Count') ?></th>
                     </tr>
                     <?php
-                    foreach(array_keys($familyRoleStats) as $key){
-                        $genderId = $familyRoleStats[$key]['genderId'];;
-                        $roleId = $familyRoleStats[$key]['roleId'];;
+                    foreach (array_keys($familyRoleStats) as $key) {
+                        $genderId = $familyRoleStats[$key]['genderId'];
+                        $roleId = $familyRoleStats[$key]['roleId'];
                         $roldGenderName = $key;
                         $roleGenderCount = $familyRoleStats[$key]['count'];
 

src/api/routes/people/people-families.php

@@ -115,7 +115,7 @@
         $currentStatus = (empty($family->getDateDeactivated()) ? 'true' : 'false');
 
         //update only if the value is different
-        if ($currentStatus != $newStatus) {
+        if ($currentStatus !== $newStatus) {
             if ($newStatus == 'false') {
                 $family->setDateDeactivated(date('YmdHis'));
             } elseif ($newStatus == 'true') {

src/api/routes/people/people-person.php

@@ -40,7 +40,7 @@
 
     $group->delete('', function (Request $request, Response $response, array $args): Response {
         $person = $request->getAttribute('person');
-        if (AuthenticationManager::getCurrentUser()->getId() == $person->getId()) {
+        if (AuthenticationManager::getCurrentUser()->getId() === (int) $person->getId()) {
             throw new HttpForbiddenException($request, gettext("Can't delete yourself"));
         }
         $person->delete();
@@ -73,14 +73,14 @@ function setPersonRoleAPI(Request $request, Response $response, array $args): Re
 {
     $person = $request->getAttribute('person');
 
-    $roleId = $args['roleId'];
+    $roleId = (int) $args['roleId'];
     $role = ListOptionQuery::create()->filterByOptionId($roleId)->findOne();
 
     if (empty($role)) {
         throw new HttpNotFoundException($request, gettext('The role could not be found.'));
     }
 
-    if ($person->getFmrId() == $roleId) {
+    if ((int) $person->getFmrId() === $roleId) {
         return SlimUtils::renderJSON($response, ['success' => true, 'msg' => gettext('The role is already assigned.')]);
     }
 

src/api/routes/people/people-properties.php

@@ -77,7 +77,7 @@ function getFamilyProperties(Request $request, Response $response, array $args):
     return getProperties($response, 'f', $family->getId());
 }
 
-function getProperties(Response $response, $type, $id): Response
+function getProperties(Response $response, string $type, int $id): Response
 {
     $properties = RecordPropertyQuery::create()
         ->filterByRecordId($id)
@@ -87,7 +87,7 @@ function getProperties(Response $response, $type, $id): Response
 
     foreach ($properties as $property) {
         $rawProp = $property->getProperty();
-        if ($rawProp->getProClass() == $type) {
+        if ($rawProp->getProClass() === $type) {
             $tempProp = [];
             $tempProp['id'] = $property->getPropertyId();
             $tempProp['name'] = $rawProp->getProName();

src/api/routes/system/system-database.php

@@ -152,7 +152,7 @@ function exportChMeetings(Request $request, Response $response, array $args): Re
         $family = $person->getFamily();
         $anniversary = ($family ? $family->getWeddingdate(SystemConfig::getValue('sDateFormatLong')) : '');
         $familyRole = $person->getFamilyRoleName();
-        if ($familyRole == 'Head of Household') {
+        if ($familyRole === 'Head of Household') {
             $familyRole = 'Primary';
         }
 
@@ -229,7 +229,7 @@ function resetDatabase(Request $request, Response $response): Response
     $dbTablesSQLs = $statement->fetchAll();
 
     foreach ($dbTablesSQLs as $dbTable) {
-        if ($dbTable[1] == 'VIEW') {
+        if ($dbTable[1] === 'VIEW') {
             $alterSQL = 'DROP VIEW ' . $dbTable[0] . ' ;';
         } else {
             $alterSQL = 'DROP TABLE ' . $dbTable[0] . ' ;';

src/bin/google-map/GoogleMap.php

@@ -865,7 +865,7 @@ public function addDirections($start_address = '', $dest_address = '', $dom_id =
             $elevation_dom_id = 'elevation' . $dom_id;
         }
 
-        if ($start_address != '' && $dest_address != '' && $dom_id != '') {
+        if ($start_address !== '' && $dest_address !== '' && $dom_id !== '') {
             $this->_directions[$dom_id] = [
                 'dom_id'           => $dom_id,
                 'start'            => $start_address,

src/composer.json

@@ -67,6 +67,12 @@
         "rector/rector": "^1.0",
         "squizlabs/php_codesniffer": "^3.7"
     },
+    "replace": {
+        "symfony/polyfill-mbstring": "*",
+        "symfony/polyfill-php73": "*",
+        "symfony/polyfill-php80": "*",
+        "symfony/polyfill-php81": "*"
+    },
     "repositories": {
         "packagist": {
             "type": "composer",
@@ -100,4 +106,4 @@
             "@orm-gen"
         ]
     }
-}
+}