Fix several Psalm-issues

tvdijen · tvdijen · commit d81adb91d3e9 · 2023-07-19T18:54:53.000+02:00
diff --git a/src/SimpleSAML/Module.php b/src/SimpleSAML/Module.php
@@ -420,7 +420,7 @@ public static function getModules(): array
      *
      * @param string      $id The string we should resolve.
      * @param string      $type The type of the class.
-     * @param string|null $subclass The class should be a subclass of this class. Optional.
+     * @param class-string|null $subclass The class should be a subclass of this class. Optional.
      *
      * @return string The classname.
      *
diff --git a/src/SimpleSAML/Session.php b/src/SimpleSAML/Session.php
@@ -262,7 +262,7 @@ public function __unserialize($serialized): void
     /**
      * Retrieves the current session. Creates a new session if there's not one.
      *
-     * @return Session The current session.
+     * @return \SimpleSAML\Session The current session.
      * @throws \Exception When session couldn't be initialized and the session fallback is disabled by configuration.
      */
     public static function getSessionFromRequest(): Session
diff --git a/src/SimpleSAML/XHTML/Template.php b/src/SimpleSAML/XHTML/Template.php
@@ -558,13 +558,15 @@ public function getContents(): string
     /**
      * Send this template as a response.
      *
-     * @return \Symfony\Component\HttpFoundation\Response This response.
+     * @return static This response.
      * @throws \Exception if the template cannot be found.
      */
     public function send(): static
     {
         $this->content = $this->getContents();
-        return /** @scrutinizer ignore-type */parent::send();
+        parent::send();
+
+        return $this;
     }
 
 
diff --git a/src/SimpleSAML/XHTML/TemplateLoader.php b/src/SimpleSAML/XHTML/TemplateLoader.php
@@ -29,7 +29,7 @@ class TemplateLoader extends \Twig\Loader\FilesystemLoader
      *
      * @param string $name
      * @param bool $throw
-     * @return string|false|null
+     * @return string|null
      *
      * NOTE: cannot typehint due to upstream restrictions
      */
diff --git a/src/SimpleSAML/XML/Signer.php b/src/SimpleSAML/XML/Signer.php
@@ -182,6 +182,7 @@ public function loadPublicKeyArray(array $publickey): void
      * @param bool $full_path  Whether the filename found in the configuration contains the
      *                         full path to the private key or not. Default to false.
      * @throws \Exception
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
      */
     public function loadCertificate(string $file, bool $full_path = false): void
     {
@@ -197,11 +198,7 @@ public function loadCertificate(string $file, bool $full_path = false): void
         }
 
         $file = new File($certFile);
-        $cert = $file->getContent();
-        if ($cert === false) {
-            throw new Exception('Unable to read certificate file "' . $certFile . '".');
-        }
-        $this->certificate = $cert;
+        $this->certificate = $file->getContent();
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public static function getModules(): array`
`420`	`420`	`*`
`421`	`421`	`* @param string $id The string we should resolve.`
`422`	`422`	`* @param string $type The type of the class.`
`423`		`- * @param string\|null $subclass The class should be a subclass of this class. Optional.`
	`423`	`+ * @param class-string\|null $subclass The class should be a subclass of this class. Optional.`
`424`	`424`	`*`
`425`	`425`	`* @return string The classname.`
`426`	`426`	`*`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ public function __unserialize($serialized): void`
`262`	`262`	`/**`
`263`	`263`	`* Retrieves the current session. Creates a new session if there's not one.`
`264`	`264`	`*`
`265`		`- * @return Session The current session.`
	`265`	`+ * @return \SimpleSAML\Session The current session.`
`266`	`266`	`* @throws \Exception When session couldn't be initialized and the session fallback is disabled by configuration.`
`267`	`267`	`*/`
`268`	`268`	`public static function getSessionFromRequest(): Session`
Original file line number	Diff line number	Diff line change
`@@ -558,13 +558,15 @@ public function getContents(): string`
`558`	`558`	`/**`
`559`	`559`	`* Send this template as a response.`
`560`	`560`	`*`
`561`		`- * @return \Symfony\Component\HttpFoundation\Response This response.`
	`561`	`+ * @return static This response.`
`562`	`562`	`* @throws \Exception if the template cannot be found.`
`563`	`563`	`*/`
`564`	`564`	`public function send(): static`
`565`	`565`	`{`
`566`	`566`	`$this->content = $this->getContents();`
`567`		`- return /** @scrutinizer ignore-type */parent::send();`
	`567`	`+ parent::send();`
	`568`	`+`
	`569`	`+ return $this;`
`568`	`570`	`}`
`569`	`571`
`570`	`572`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class TemplateLoader extends \Twig\Loader\FilesystemLoader`
`29`	`29`	`*`
`30`	`30`	`* @param string $name`
`31`	`31`	`* @param bool $throw`
`32`		`- * @return string\|false\|null`
	`32`	`+ * @return string\|null`
`33`	`33`	`*`
`34`	`34`	`* NOTE: cannot typehint due to upstream restrictions`
`35`	`35`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ public function loadPublicKeyArray(array $publickey): void`
`182`	`182`	`* @param bool $full_path Whether the filename found in the configuration contains the`
`183`	`183`	`* full path to the private key or not. Default to false.`
`184`	`184`	`* @throws \Exception`
	`185`	`+ * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException`
`185`	`186`	`*/`
`186`	`187`	`public function loadCertificate(string $file, bool $full_path = false): void`
`187`	`188`	`{`
`@@ -197,11 +198,7 @@ public function loadCertificate(string $file, bool $full_path = false): void`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`$file = new File($certFile);`
`200`		`- $cert = $file->getContent();`
`201`		`- if ($cert === false) {`
`202`		`- throw new Exception('Unable to read certificate file "' . $certFile . '".');`
`203`		`- }`
`204`		`- $this->certificate = $cert;`
	`201`	`+ $this->certificate = $file->getContent();`
`205`	`202`	`}`
`206`	`203`
`207`	`204`