Merge pull request #14 from thebiggive/CLA-25-exempt-fix

CLA-25 – fix when `RegNo` is written
thebiggive · Apr 21, 2022 · 6382552 · 6382552
2 parents b932c2e + 673b6c3
commit 6382552
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ClaimingOrganisation.php b/src/ClaimingOrganisation.php
@@ -6,7 +6,7 @@ class ClaimingOrganisation
 {
     private $name = '';
     private $hmrcRef = '';
-    private ?string $regulator;
+    private ?string $regulator = null;
     private $regNo = '';
     private $hasConnectedCharities = false;
     private $connectedCharities = [];
@@ -51,7 +51,7 @@ public function setHmrcRef($value)
         $this->hmrcRef = $value;
     }
 
-    public function getRegulator()
+    public function getRegulator(): ?string
     {
         return $this->regulator;
     }

diff --git a/src/GiftAid.php b/src/GiftAid.php
@@ -1036,7 +1036,11 @@ protected function writeClaimStartData(XMLWriter $package, ClaimingOrganisation
         } else {
             $package->writeElement('OtherReg', $org->getRegulator());
         }
-        $package->writeElement('RegNo', $org->getRegNo());
+
+        if ($org->getRegulator() !== null && !empty($org->getRegNo())) {
+            $package->writeElement('RegNo', $org->getRegNo());
+        }
+
         $package->endElement(); # Regulator
 
         $package->startElement('Repayment');