From 93f66b1975e95d74f6b6bc45288ad0a0746a2113 Mon Sep 17 00:00:00 2001 From: Tim van Dijen <tvdijen@gmail.com> Date: Thu, 4 Jan 2018 23:44:35 +0100 Subject: [PATCH] Update Template.php --- lib/SimpleSAML/XHTML/Template.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php index fdcee57df..f29033f4d 100644 --- a/lib/SimpleSAML/XHTML/Template.php +++ b/lib/SimpleSAML/XHTML/Template.php @@ -8,14 +8,11 @@ * @package SimpleSAMLphp */ - use JaimePerez\TwigConfigurableI18n\Twig\Environment as Twig_Environment; use JaimePerez\TwigConfigurableI18n\Twig\Extensions\Extension\I18n as Twig_Extensions_Extension_I18n; - class SimpleSAML_XHTML_Template { - /** * The data associated with this template, accessible within the template itself. * @@ -279,7 +276,7 @@ class SimpleSAML_XHTML_Template // setup directories & namespaces $themeDir = \SimpleSAML\Module::getModuleDir($this->theme['module']).'/themes/'.$this->theme['name']; $subdirs = scandir($themeDir); - if (!$subdirs) { // no subdirectories in the theme directory, nothing to do here + if (empty($subdirs)) { // no subdirectories in the theme directory, nothing to do here // this is probably wrong, log a message \SimpleSAML\Logger::warning('Emtpy theme directory for theme "'.$this->theme['name'].'".'); return array(); @@ -704,7 +701,7 @@ class SimpleSAML_XHTML_Template * @see \SimpleSAML\Locale\Translate::noop() * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::noop() instead. */ - static public function noop($tag) + public static function noop($tag) { return $tag; } -- GitLab