From 2c050ee98dc0677547e4cf5cd917db9e3af45fe9 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 26 Feb 2016 10:16:42 +0100
Subject: [PATCH] Take #2. Use the recently migrated
SimpleSAML_Logger::maskErrors() and popErrorMask() methods to simplify code
un SimpleSAML\Utils\Config\Metadata.
---
lib/SimpleSAML/Utils/Config/Metadata.php | 30 +++++-------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Config/Metadata.php b/lib/SimpleSAML/Utils/Config/Metadata.php
index 3e50fab4f..1615ef64b 100644
--- a/lib/SimpleSAML/Utils/Config/Metadata.php
+++ b/lib/SimpleSAML/Utils/Config/Metadata.php
@@ -257,30 +257,12 @@ class Metadata
*/
public static function isHiddenFromDiscovery(array $metadata)
{
- if (!is_array($metadata)) {
- return false;
+ \SimpleSAML_Logger::maskErrors(E_ALL);
+ $hidden = in_array(self::$HIDE_FROM_DISCOVERY, $metadata['EntityAttributes'][self::$ENTITY_CATEGORY]);
+ \SimpleSAML_Logger::popErrorMask();
+ if (is_bool($hidden)) {
+ return $hidden;
}
-
- if (!array_key_exists('EntityAttributes', $metadata)) {
- return false;
- }
-
- if (!is_array($metadata['EntityAttributes'])) {
- return false;
- }
-
- if (!array_key_exists(self::$ENTITY_CATEGORY, $metadata['EntityAttributes'])) {
- return false;
- }
-
- if (!is_array($metadata['EntityAttributes'][self::$ENTITY_CATEGORY])) {
- return false;
- }
-
- if (!in_array(self::$HIDE_FROM_DISCOVERY, $metadata['EntityAttributes'][self::$ENTITY_CATEGORY])) {
- return false;
- }
-
- return true;
+ return false;
}
}
--
GitLab