prepare and parse spf

src/TXTRecords/BIMI1.php

@@ -21,7 +21,7 @@ function castL(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 
     function castA(string $value): string
@@ -30,6 +30,6 @@ function castA(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 }

src/TXTRecords/DKIM1.php

@@ -21,7 +21,7 @@ function castK(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 
     function castP(string $value): string
@@ -30,6 +30,6 @@ function castP(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 }

src/TXTRecords/DMARC1.php

@@ -29,14 +29,17 @@ function castP(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 
     function castRua(string $value): array
     {
         preg_match("/rua=([^;]*)(?:;|$)/i", $value, $matches);
         if (isset($matches[1])) {
             $emails = preg_split("/\s*,/", $matches[1]);
+            foreach ($emails as $key => $email) {
+                $emails[$key] = $this->prepareText($email);
+            }
         }
         else {
             return "";
@@ -49,6 +52,9 @@ function castRuf(string $value): array
         preg_match("/ruf=([^;]*)(?:;|$)/i", $value, $matches);
         if (isset($matches[1])) {
             $emails = preg_split("/\s*,/", $matches[1]);
+            foreach ($emails as $key => $email) {
+                $emails[$key] = $this->prepareText($email);
+            }
         }
         else {
             return "";
@@ -62,16 +68,16 @@ function castSp(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 
     function castPct(string $value): int
     {
         preg_match('/pct=([0-9]{1-3}+)/', $value, $matches);
         if(count($matches) < 2){
-            return "";
+            return 100;
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareInt($matches[1]));
     }
 
     function castFo(string $value): string
@@ -80,6 +86,6 @@ function castFo(string $value): string
         if(count($matches) < 2){
             return "";
         }
-        return str_replace(";", "",$matches[1]);
+        return str_replace(";", "",$this->prepareText($matches[1]));
     }
 }

src/TXTRecords/SPF1.php

@@ -4,12 +4,24 @@
 
 class SPF1 extends V {
 
-    public string $value;
+    public array $value;
 
     function __construct(string $value)
     {
         $this->type = 'SPF';
         $this->version = 1;
         $this->value = $this->cast('value',$value);
     }
+
+    function castValue(string $value): array
+    {
+        preg_match_all('/([a-zA-Z0-9:\.-~?]+)+/', $value, $matches);
+        if(count($matches) < 1){
+             return array();
+        }
+        foreach ($matches[1] as $key => $match) {
+            $matches[1][$key] = $this->prepareText($match);
+        }
+        return str_replace(";", "",$matches[1]);
+    }
 }

src/TXTRecords/STSV1.php

@@ -16,6 +16,6 @@ function __construct(string $value)
     function castId(string $value): int
     {
         preg_match('/id=([0-9]+)/', $value, $matches);
-        return $matches[1];
+        return $this->prepareInt($matches[1]);
     }
 }

src/TXTRecords/TLSRPTV1.php

@@ -18,6 +18,9 @@ function castRua(string $value): array
         preg_match("/rua=([^;]*)(?:;|$)/i", $value, $matches);
         if (isset($matches[1])) {
             $emails = preg_split("/\s*,/", $matches[1]);
+            foreach ($emails as $key => $email) {
+                $emails[$key] = $this->prepareText($email);
+            }
         }
         else {
             return "";

src/TXTRecords/V.php

@@ -2,10 +2,15 @@
 
 namespace Spatie\Dns\TXTRecords;
 
-class V {
+abstract class V {
     public string $type;
     public string $version;
 
+    protected function prepareInt($value): int
+    {
+        return intval($value);
+    }
+
     protected function prepareText(string $value): string
     {
         if (str_starts_with($value, '"') && str_ends_with($value, '"')) {
@@ -27,4 +32,5 @@ protected function cast(string $attribute, $value)
 
         return $value;
     }
+
 }