diff --git a/modules/admin/lib/Menu.php b/modules/admin/lib/Menu.php
index e4e55250cfda2b9e43a1e5bb8ab58b87298b52a1..c1d87d9597776ca7d533b26fcf2f578072c5fbac 100644
--- a/modules/admin/lib/Menu.php
+++ b/modules/admin/lib/Menu.php
@@ -51,6 +51,7 @@ final class Menu
      * @param string $id The identifier of this option.
      * @param string $url The URL this option points to.
      * @param string $name The name of the option for display purposes.
+     * @return void
      */
     public function addOption($id, $url, $name)
     {
diff --git a/modules/admin/lib/TestController.php b/modules/admin/lib/TestController.php
index c330c81489d122b8aa66c5a4aad5003b9485bf5e..be7a47033687b9992e23626a10ed78ea3a0407b0 100644
--- a/modules/admin/lib/TestController.php
+++ b/modules/admin/lib/TestController.php
@@ -45,6 +45,7 @@ class TestController
     /**
      * Display the list of available authsources.
      *
+     * @param string|null $as
      * @return \SimpleSAML\XHTML\Template
      */
     public function main(Request $request, $as)
@@ -67,7 +68,7 @@ class TestController
             }
 
             if (!$authsource->isAuthenticated()) {
-                $url = \SimpleSAML\Module::getModuleURL('admin/test/' .$as, []);
+                $url = \SimpleSAML\Module::getModuleURL('admin/test/'.$as, []);
                 $params = [
                     'ErrorURL' => $url,
                     'ReturnTo' => $url,
@@ -99,6 +100,11 @@ class TestController
     }
 
 
+    /**
+     * @param \SimpleSAML\XHTML\Template $t
+     * @param \SAML2\XML\saml\NameID $nameId
+     * @return string
+     */
     private function getNameIDHTML(\SimpleSAML\XHTML\Template $t, \SAML2\XML\saml\NameID $nameId)
     {
         $result = '';
@@ -126,6 +132,12 @@ class TestController
     }
 
 
+    /**
+     * @param \SimpleSAML\XHTML\Template $t
+     * @param array $attributes
+     * @param string $nameParent
+     * @return string
+     */
     private function getAttributesHTML(\SimpleSAML\XHTML\Template $t, $attributes, $nameParent)
     {
         $alternate = ['pure-table-odd', 'pure-table-even'];
@@ -197,6 +209,11 @@ class TestController
         return $str;
     }
 
+
+    /**
+     * @param array|string $attr
+     * @return string
+     */
     private function present_list($attr)
     {
         if (is_array($attr) && count($attr) > 1) {
@@ -211,6 +228,11 @@ class TestController
         }
     }
 
+
+    /**
+     * @param array|string $attr
+     * @return string
+     */
     private function present_assoc($attr)
     {
         if (is_array($attr)) {
@@ -225,6 +247,12 @@ class TestController
         }
     }
 
+
+    /**
+     * @param \SimpleSAML\Locale\Translate $t
+     * @param \SAML2\XML\saml\NameID $nameID
+     * @return string
+     */
     private function present_eptid(\SimpleSAML\Locale\Translate $t, \SAML2\XML\saml\NameID $nameID)
     {
         $eptid = [