Fix: properly deal with default value

simplesamlphp · Oct 29, 2024 · 75eb9da · 75eb9da
1 parent 0192117
commit 75eb9da
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/XML/shibmd/Scope.php b/src/XML/shibmd/Scope.php
@@ -24,11 +24,11 @@ final class Scope extends AbstractShibmdElement
      * Create a Scope.
      *
      * @param string $scope
-     * @param bool $regexp
+     * @param bool|null $regexp
      */
     public function __construct(
         string $scope,
-        protected bool $regexp = false,
+        protected ?bool $regexp = false,
     ) {
         $this->setContent($scope);
     }
@@ -50,9 +50,9 @@ protected function validateContent(string $content): void
     /**
      * Collect the value of the regexp-property
      *
-     * @return bool
+     * @return bool|null
      */
-    public function isRegexpScope(): bool
+    public function isRegexpScope(): ?bool
     {
         return $this->regexp;
     }
@@ -73,7 +73,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::same($xml->namespaceURI, Scope::NS, InvalidDOMElementException::class);
 
         $scope = $xml->textContent;
-        $regexp = self::getOptionalBooleanAttribute($xml, 'regexp', false);
+        $regexp = self::getOptionalBooleanAttribute($xml, 'regexp', null);
 
         return new static($scope, $regexp);
     }
@@ -89,7 +89,10 @@ public function toXML(DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();
-        $e->setAttribute('regexp', $this->isRegexpScope() ? 'true' : 'false');
+
+        if ($this->isRegexpScope() !== null) {
+            $e->setAttribute('regexp', $this->isRegexpScope() ? 'true' : 'false');
+        }
 
         return $e;
     }