From a03d39df0ca7b62779c5e6a786b79d86f4d9deb0 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 22 Feb 2020 11:01:57 +0100
Subject: [PATCH] Twig is no longer optional > remove null case
---
lib/SimpleSAML/XHTML/Template.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 76b5f2131..cf2b3010c 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -67,7 +67,6 @@ class Template extends Response
* The twig environment.
*
* @var \Twig\Environment
- * @psalm-suppress PropertyNotSetInConstructor Remove this annotation in 2.0
*/
private $twig;
@@ -622,9 +621,9 @@ class Template extends Response
/**
* Get the current instance of Twig in use.
*
- * @return \Twig\Environment|null The Twig instance in use, or null if Twig is not used.
+ * @return \Twig\Environment The Twig instance in use.
*/
- public function getTwig(): ?\Twig\Environment
+ public function getTwig(): \Twig\Environment
{
return $this->twig;
}
--
GitLab