From 6de7dd367724bbc50bea546776cd61e02f4ea38a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 4 Feb 2019 09:59:48 +0100
Subject: [PATCH] Fixes for modules/discopower
---
lib/SimpleSAML/XHTML/IdPDisco.php | 2 +-
modules/discopower/lib/PowerIdPDisco.php | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index 51449f95f..8f835f366 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -267,7 +267,7 @@ class IdPDisco
*
* This function finds out which IdP the user has manually chosen, if any.
*
- * @return string The entity id of the IdP the user has chosen, or null if the user has made no choice.
+ * @return string|null The entity id of the IdP the user has chosen, or null if the user has made no choice.
*/
protected function getSelectedIdP()
{
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index a0955cb32..c5ce0a954 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -11,7 +11,6 @@ namespace SimpleSAML\Module\discopower;
* @author Andreas Ă…kre Solberg <andreas@uninett.no>, UNINETT AS.
* @package SimpleSAMLphp
*/
-
class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
{
/**
@@ -69,6 +68,7 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
* This is an helper function for logging messages. It will prefix the messages with our discovery service type.
*
* @param string $message The message which should be logged.
+ * @return void
*/
protected function log($message)
{
@@ -236,6 +236,7 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
* Handles a request to this discovery service.
*
* The IdP disco parameters should be set before calling this function.
+ * @return void
*/
public function handleRequest()
{
@@ -303,6 +304,13 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
$t->show();
}
+
+ /**
+ * @param \SimpleSAML\XHTML\Template $t
+ * @param array $metadata
+ * @param string $favourite
+ * @return array
+ */
private function processMetadata($t, $metadata, $favourite)
{
$basequerystring = '?'.
@@ -394,6 +402,7 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
* This function overrides the corresponding function in the parent class, to add support for common domain cookie.
*
* @param string $idp The entityID of the IdP.
+ * @return void
*/
protected function setPreviousIdP($idp)
{
--
GitLab