Fix PossiblyNullArgument (3x)

modules/admin/lib/Controller/Federation.php

@@ -24,6 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\VarExporter\VarExporter;
+use Webmozart\Assert\Assert;
 
 /**
  * Controller class for the admin module.
@@ -147,6 +148,8 @@ class Federation
         ];
 
         Module::callHooks('federationpage', $t);
+        Assert::isInstanceOf($t, Template::class);
+
         $this->menu->addOption('logout', $t->data['logouturl'], Translate::noop('Log out'));
         return $this->menu->insert($t);
     }

modules/admin/lib/Controller/Test.php

@@ -89,9 +89,7 @@ class Test
 
             $attributes = $authsource->getAttributes();
             $authData = $authsource->getAuthDataArray();
-            $nameId = !is_null($authsource->getAuthData('saml:sp:NameID'))
-                ? $authsource->getAuthData('saml:sp:NameID')
-                : false;
+            $nameId = $authsource->getAuthData('saml:sp:NameID') ?? false;
 
             $t = new Template($this->config, 'admin:status.twig', 'attributes');
             $t->data = [
@@ -108,6 +106,8 @@ class Test
         }
 
         Module::callHooks('configpage', $t);
+        Assert::isInstanceOf($t, Template::class);
+
         $this->menu->addOption('logout', Utils\Auth::getAdminLogoutURL(), Translate::noop('Log out'));
         return $this->menu->insert($t);
     }