[rector] apply SetList::DEAD_CODE, better type checking (see description for breakdown)

src/AddDonors.php

@@ -45,7 +45,7 @@
     $sSQL = "SELECT pn_per_id FROM paddlenum_pn WHERE pn_per_id='$donorID' AND pn_FR_ID = '$iFundRaiserID'";
     $rsBuyer = RunQuery($sSQL);
 
-    if ($donorID > 0 && mysqli_num_rows($rsBuyer) == 0) {
+    if ($donorID > 0 && mysqli_num_rows($rsBuyer) === 0) {
         $sSQL = "INSERT INTO paddlenum_pn (pn_Num, pn_fr_ID, pn_per_ID)
                         VALUES ('$extraPaddleNum', '$iFundRaiserID', '$donorID')";
         RunQuery($sSQL);

src/CartToGroup.php

@@ -40,7 +40,7 @@
 require 'Include/Header.php';
 
 if (count($_SESSION['aPeopleCart']) > 0) {
-?>
+    ?>
 
   <script src="skin/js/GroupRoles.js"></script>
 

src/ChurchCRM/Authentication/AuthenticationManager.php

@@ -61,9 +61,7 @@ public static function endSession(bool $preventRedirect = false): void
         $currentSessionUserName = 'Unknown';
 
         try {
-            if (self::getCurrentUser() instanceof User) {
-                $currentSessionUserName = self::getCurrentUser()->getName();
-            }
+            $currentSessionUserName = self::getCurrentUser()->getName();
         } catch (\Exception $e) {
             //unable to get name of user logging out. Don't really care.
         }

src/ChurchCRM/Backup/BackupDownloader.php

@@ -32,9 +32,6 @@ public static function downloadBackup(string $filename): void
             $ext = strtolower($path_parts['extension']);
             switch ($ext) {
                 case 'gz':
-                    header('Content-type: application/x-gzip');
-                    header('Content-Disposition: attachment; filename="' . $path_parts['basename'] . '"');
-                    break;
                 case 'tar.gz':
                     header('Content-type: application/x-gzip');
                     header('Content-Disposition: attachment; filename="' . $path_parts['basename'] . '"');

src/ChurchCRM/Backup/BackupJob.php

@@ -17,32 +17,13 @@
 class BackupJob extends JobBase
 {
     private string $BackupFileBaseName;
-
     private ?\SplFileInfo $BackupFile = null;
-    /**
-     * @var bool
-     */
-    private $IncludeExtraneousFiles;
-    /**
-     * @var string
-     */
-    public $BackupDownloadFileName;
-    /**
-     * @var bool
-     */
-    public $shouldEncrypt;
-
-    /**
-     * @var string
-     */
-    public $BackupPassword;
-
-    /**
-     * @param string     $BaseName
-     * @param BackupType $BackupType
-     * @param bool       $IncludeExtraneousFiles
-     */
-    public function __construct(string $BaseName, $BackupType, $IncludeExtraneousFiles, $EncryptBackup, $BackupPassword)
+    private bool $IncludeExtraneousFiles;
+    public string $BackupDownloadFileName;
+    public bool $shouldEncrypt;
+    public string $BackupPassword;
+
+    public function __construct(string $BaseName, string $BackupType, bool $IncludeExtraneousFiles, bool $EncryptBackup, string $BackupPassword)
     {
         $this->BackupType = $BackupType;
         $this->TempFolder = $this->createEmptyTempFolder();

src/ChurchCRM/Backup/JobBase.php

@@ -8,13 +8,8 @@
 
 class JobBase
 {
-    /** @var BackupType */
-    protected $BackupType;
-
-    /**
-     * @var string
-     */
-    protected $TempFolder;
+    protected string $BackupType;
+    protected string $TempFolder;
 
     protected function createEmptyTempFolder(): string
     {

src/ChurchCRM/Backup/RestoreJob.php

@@ -9,6 +9,7 @@
 use ChurchCRM\SQLUtils;
 use ChurchCRM\Utils\InputUtils;
 use ChurchCRM\Utils\LoggerUtils;
+use Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException;
 use Defuse\Crypto\File;
 use Exception;
 use PharData;
@@ -17,15 +18,7 @@
 class RestoreJob extends JobBase
 {
     private \SplFileInfo $RestoreFile;
-
-    /**
-     * @var array
-     */
-    public $Messages = [];
-    /**
-     * @var bool
-     */
-    private $IsBackupEncrypted;
+    public array $Messages = [];
     private ?string $restorePassword = null;
 
     private function isIncomingFileFailed(): bool
@@ -64,7 +57,7 @@ private function decryptBackup(): void
             File::decryptFileWithPassword($this->RestoreFile, $tempfile, $this->restorePassword);
             rename($tempfile, $this->RestoreFile);
             LoggerUtils::getAppLogger()->info('File decrypted');
-        } catch (\Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
+        } catch (WrongKeyOrModifiedCiphertextException $ex) {
             if ($ex->getMessage() == 'Bad version header.') {
                 LoggerUtils::getAppLogger()->info("Bad version header; this file probably wasn't encrypted");
             } else {
@@ -80,9 +73,9 @@ private function discoverBackupType(): void
         switch ($this->RestoreFile->getExtension()) {
             case 'gz':
                 $basename = $this->RestoreFile->getBasename();
-                if (substr($basename, strlen($basename) - 6, 6) == 'tar.gz') {
+                if (str_ends_with($basename, 'tar.gz')) {
                     $this->BackupType = BackupType::FULL_BACKUP;
-                } elseif (substr($basename, strlen($basename) - 6, 6) == 'sql.gz') {
+                } elseif (str_ends_with($basename, 'sql.gz')) {
                     $this->BackupType = BackupType::GZSQL;
                 }
                 break;

src/ChurchCRM/Bootstrapper.php

@@ -198,9 +198,9 @@ private static function isDatabaseEmpty(): bool
         $connection = Propel::getConnection();
         $query = "SHOW TABLES FROM `" . self::$databaseName . "`";
         $statement = $connection->prepare($query);
-        $resultset = $statement->execute();
+        $statement->execute();
         $results = $statement->fetchAll(\PDO::FETCH_ASSOC);
-        if (count($results) == 0) {
+        if (count($results) === 0) {
             self::$bootStrapLogger->debug("No database tables found");
             return true;
         }

src/ChurchCRM/Config/Menu/Menu.php

@@ -12,7 +12,7 @@
 class Menu
 {
     /**
-     * @var Config[]
+     * @var array<string, MenuItem>|null
      */
     private static ?array $menuItems = null;
 

src/ChurchCRM/Config/Menu/MenuItem.php

@@ -65,9 +65,6 @@ public function getName()
         return $this->name;
     }
 
-    /**
-     * @return bool
-     */
     public function isExternal(): bool
     {
         return $this->external;

src/ChurchCRM/Dashboard/EventsMenuItems.php

@@ -17,13 +17,11 @@ public static function getDashboardItemName(): string
 
     public static function getDashboardItemValue(): array
     {
-        $activeEvents = [
+        return [
             'Events'        => self::getNumberEventsOfToday(),
             'Birthdays'     => self::getNumberBirthDates(),
             'Anniversaries' => self::getNumberAnniversaries(),
         ];
-
-        return $activeEvents;
     }
 
     public static function shouldInclude(string $PageName): bool
@@ -48,8 +46,6 @@ private static function getNumberBirthDates()
             ->filterByBirthMonth(date('m'))
             ->filterByBirthDay(date('d'))
             ->count();
-
-        return $peopleWithBirthDays;
     }
 
     private static function getNumberAnniversaries()

src/ChurchCRM/MICRFunctions.php

@@ -6,24 +6,24 @@
 
 class MICRFunctions
 {
-    public $CHECKNO_FIRST = 1; // o<check>o t<route>t <account>o
-    public $ROUTE_FIRST1 = 2;   // t<route>t <account>o <check>
-    public $ROUTE_FIRST2 = 3;   // t<route>t o<account>o <check>
-    public $NOT_RECOGNIZED = 4;
+    public int $CHECKNO_FIRST = 1; // o<check>o t<route>t <account>o
+    public int $ROUTE_FIRST1 = 2;   // t<route>t <account>o <check>
+    public int $ROUTE_FIRST2 = 3;   // t<route>t o<account>o <check>
+    public int $NOT_RECOGNIZED = 4;
 
-    public function identifyFormat($micr)
+    public function identifyFormat(string $micr): int
     {
         // t000000000t0000o0000000000000o ROUTE_FIRST2
         // t000000000t 0000000000o   0000 ROUTE_FIRST1
         // o000000o t000000000t 0000000000o CHECKNO_FIRST
 
         $firstChar = mb_substr($micr, 0, 1);
-        if ($firstChar == 'o') {
+        if ($firstChar === 'o') {
             return $this->CHECKNO_FIRST;
         } elseif ($firstChar == 't') {
             $firstSmallO = strpos($micr, 'o');
             $secondSmallO = strrpos($micr, 'o');
-            if ($firstSmallO == $secondSmallO) {
+            if ($firstSmallO === $secondSmallO) {
                 // Only one 'o'
                 $len = strlen($micr);
                 if ($len - $firstSmallO > 12) {
@@ -35,25 +35,27 @@ public function identifyFormat($micr)
                 return $this->ROUTE_FIRST2;
             }
         }
+
+        throw new \InvalidArgumentException('Unknown format provided');
     }
 
-    public function findRoute($micr): string
+    public function findRoute(string $micr): string
     {
         $routeAndAccount = $this->findRouteAndAccount($micr);
         $breakChar = strpos($routeAndAccount, 't', 1);
 
         return mb_substr($micr, 1, $breakChar - 1);
     }
 
-    public function findAccount($micr): string
+    public function findAccount(string $micr): string
     {
         $routeAndAccount = $this->findRouteAndAccount($micr);
         $breakChar = strpos($routeAndAccount, 't', 1);
 
         return mb_substr($routeAndAccount, $breakChar + 1, strlen($micr) - $breakChar);
     }
 
-    public function findRouteAndAccount($micr)
+    public function findRouteAndAccount(string $micr): string
     {
         $formatID = $this->identifyFormat($micr);
 
@@ -78,7 +80,7 @@ public function findRouteAndAccount($micr)
         }
     }
 
-    public function findCheckNo($micr)
+    public function findCheckNo(string $micr): string
     {
         $formatID = $this->identifyFormat($micr);
         if ($formatID == $this->CHECKNO_FIRST) {

src/ChurchCRM/Reports/ChurchInfoReport.php

@@ -51,15 +51,13 @@ public function printRightJustified($x, $y, $str): void
     public function printRightJustifiedCell($x, $y, $wid, $str): void
     {
         $strconv = iconv('UTF-8', 'ISO-8859-1', $str);
-        $iLen = strlen($strconv);
         $this->SetXY($x, $y);
         $this->Cell($wid, SystemConfig::getValue('incrementY'), $strconv, 1, 0, 'R');
     }
 
     public function printCenteredCell($x, $y, $wid, $str): void
     {
         $strconv = iconv('UTF-8', 'ISO-8859-1', $str);
-        $iLen = strlen($strconv);
         $this->SetXY($x, $y);
         $this->Cell($wid, SystemConfig::getValue('incrementY'), $strconv, 1, 0, 'C');
     }
@@ -119,10 +117,9 @@ public function startLetterPage($fam_ID, $fam_Name, $fam_Address1, $fam_Address2
         if ($fam_Country != '' && $fam_Country != SystemConfig::getValue('sDefaultCountry')) {
             $this->writeAt(SystemConfig::getValue('leftX'), $curY, $fam_Country);
             $curY += SystemConfig::getValue('incrementY');
-        }
-        $curY += 5.0; // mm to get away from the second window
+        } // mm to get away from the second window
 
-        return $curY;
+        return $curY + 5.0;
     }
 
     public function makeSalutation($famID): string

src/ChurchCRM/Reports/PDF_AddressReport.php

@@ -9,10 +9,7 @@ class PdfAddressReport extends ChurchInfoReport
     private int $_Margin_Top = 12;         // Top margin
     private int $_Char_Size = 12;        // Character size
     private int $_CurLine = 2;
-    private int $_Column = 0;
     private string $_Font = 'Times';
-    private $sFamily;
-    private $sLastName;
 
     private function numLinesInFpdfCell(int $w, $txt): int
     {