Fix Psalm type detection

simplesamlphp · May 19, 2023 · b0b18ff · b0b18ff
1 parent ff25e78
commit b0b18ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/AbstractElement.php b/src/AbstractElement.php
@@ -87,7 +87,7 @@ public static function getAttribute(DOMElement $xml, string $name): string
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
      * @param string|null $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : string)
+     * @psalm-return ($default is string ? string : string|null)
      */
     public static function getOptionalAttribute(DOMElement $xml, string $name, ?string $default = null): ?string
     {
@@ -128,7 +128,7 @@ public static function getBooleanAttribute(DOMElement $xml, string $name): bool
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
      * @param bool|null   $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : bool)
+     * @psalm-return ($default is bool ? bool : bool|null)
      *
      * @throws \SimpleSAML\Assert\AssertionFailedException if the attribute is not a boolean
      */
@@ -174,7 +174,7 @@ public static function getIntegerAttribute(DOMElement $xml, string $name): int
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
      * @param int|null    $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : int)
+     * @psalm-return ($default is int ? int : int|null)
      *
      * @throws \SimpleSAML\Assert\AssertionFailedException if the attribute is not an integer
      */

diff --git a/src/Chunk.php b/src/Chunk.php
@@ -182,7 +182,7 @@ public static function getAttribute(DOMElement $xml, string $name): string
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
      * @param string|null $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : string)
+     * @psalm-return ($default is string ? string : null)
      */
     public static function getOptionalAttribute(DOMElement $xml, string $name, ?string $default = null): ?string
     {
@@ -219,8 +219,8 @@ public static function getBooleanAttribute(DOMElement $xml, string $name): bool
     /**
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
-     * @param bool|null   $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : bool)
+     * @param bool|int    $default The default to return in case the attribute does not exist and it is optional.
+     * @psalm-return ($default is bool ? bool : null)
      *
      * @throws \SimpleSAML\Assert\AssertionFailedException if the attribute is not a boolean
      */
@@ -264,7 +264,7 @@ public static function getIntegerAttribute(DOMElement $xml, string $name): int
      * @param \DOMElement $xml The element where we should search for the attribute.
      * @param string      $name The name of the attribute.
      * @param int|null    $default The default to return in case the attribute does not exist and it is optional.
-     * @return ($default is null ? null : int)
+     * @psalm-return ($default is int ? int : null)
      *
      * @throws \SimpleSAML\Assert\AssertionFailedException if the attribute is not an integer
      */