From b141f6b62a1c4857a250fca74d89e2aeea1bff47 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 13 May 2020 23:21:28 +0200
Subject: [PATCH] Fix NullableReturnStatement (2x)
---
modules/admin/lib/Controller/Menu.php | 2 ++
modules/cron/lib/Cron.php | 2 ++
2 files changed, 4 insertions(+)
diff --git a/modules/admin/lib/Controller/Menu.php b/modules/admin/lib/Controller/Menu.php
index bd1b2f430..4892a1fd7 100644
--- a/modules/admin/lib/Controller/Menu.php
+++ b/modules/admin/lib/Controller/Menu.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Module\admin\Controller;
use SimpleSAML\Locale\Translate;
use SimpleSAML\Module;
use SimpleSAML\XHTML\Template;
+use Webmozart\Assert\Assert;
/**
* A class to handle the menu in admin pages.
@@ -88,6 +89,7 @@ final class Menu
{
$template->data['menu'] = $this->options;
Module::callHooks('adminmenu', $template);
+ Assert::isInstanceOf($template, Template::class);
return $template;
}
}
diff --git a/modules/cron/lib/Cron.php b/modules/cron/lib/Cron.php
index 128ddc8bc..c75bc80c2 100644
--- a/modules/cron/lib/Cron.php
+++ b/modules/cron/lib/Cron.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Module\cron;
use SimpleSAML\Configuration;
use SimpleSAML\Logger;
use SimpleSAML\Module;
+use Webmozart\Assert\Assert;
/**
* Handles interactions with SSP's cron system/hooks.
@@ -51,6 +52,7 @@ class Cron
];
Module::callHooks('cron', $croninfo);
+ Assert::isArray($croninfo);
foreach ($summary as $s) {
Logger::debug('Cron - Summary: ' . $s);
--
GitLab