Merge pull request #26370 from braders/getSiteDefaultCountry-property

[REF][PHP8.2] Declare getSiteDefaultCountry property
civicrm · May 29, 2023 · 17dffa9 · 17dffa9
2 parents dff771a + f98140e
commit 17dffa9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
@@ -90,6 +90,11 @@ abstract class CRM_Import_Parser implements UserJobInterface {
    */
   protected $statesByCountry = [];
 
+  /**
+   * @var int|null
+   */
+  protected $siteDefaultCountry = NULL;
+
   /**
    * @return int|null
    */
@@ -1954,7 +1959,7 @@ protected function getOddlyMappedMetadataFields(): array {
    * @return int
    */
   protected function getSiteDefaultCountry(): int {
-    if (!isset($this->siteDefaultCountry)) {
+    if ($this->siteDefaultCountry === NULL) {
       $this->siteDefaultCountry = (int) Civi::settings()->get('defaultContactCountry');
     }
     return $this->siteDefaultCountry;