Resolve Psalm's PossiblyNullOperand - Cannot concatenate with a possi…

…bly null|string (#227) Follow-up to #225
spaze · Sep 15, 2023 · b412f35 · b412f35
2 parents 01e690f + 3bd534c
commit b412f35
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/site/app/CompanyInfo/CompanyRegisterAres.php b/site/app/CompanyInfo/CompanyRegisterAres.php
@@ -121,14 +121,14 @@ private function formatStreet(?string $city, ?string $street, ?int $houseNumber,
 			$result = $city;
 		}
 		if (!empty($streetLetter)) {
-			$streetNumber .= $streetLetter;
+			$streetNumber = ($streetNumber ?? '') . $streetLetter;
 		}
 		if (!empty($houseNumber) && !empty($streetNumber)) {
-			$result .= " {$houseNumber}/{$streetNumber}";
+			$result = "{$result} {$houseNumber}/{$streetNumber}";
 		} elseif (!empty($houseNumber)) {
-			$result .= " {$houseNumber}";
+			$result = "{$result} {$houseNumber}";
 		} elseif (!empty($streetNumber)) {
-			$result .= " {$streetNumber}";
+			$result = "{$result} {$streetNumber}";
 		}
 		return $result;
 	}