From 76d084e04532b25f0813e3110c07feaefc346452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Tue, 4 Oct 2016 16:41:35 +0200
Subject: [PATCH] Define SimpleSAML\XHTML\Template::$twig as a property
(previously only set in the constructor) and make sure we use proper type
checking when using it.
---
lib/SimpleSAML/XHTML/Template.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 6aa01cdb5..2f6204876 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -51,6 +51,13 @@ class SimpleSAML_XHTML_Template
*/
private $template = 'default.php';
+ /**
+ * The twig environment.
+ *
+ * @var false|Twig_Environment
+ */
+ private $twig;
+
/**
* The template name.
*
@@ -155,7 +162,7 @@ class SimpleSAML_XHTML_Template
$loader = $this->setupTwigTemplatepaths();
// abort if twig template does not exist
if (!$loader->exists($this->twig_template)) {
- return null;
+ return false;
}
$twig = new \Twig_Environment($loader,
@@ -317,7 +324,7 @@ class SimpleSAML_XHTML_Template
*/
public function show()
{
- if ($this->twig) {
+ if ($this->twig !== false) {
$this->twigDefaultContext();
echo $this->twig->render($this->twig_template, $this->data);
} else {
--
GitLab