From 313d4d335b352af287c35b646d4d256700c90c64 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 1 Mar 2022 23:44:24 +0100
Subject: [PATCH] Rewrite FlatFile using symfony/filesystem
---
.../Metadata/MetaDataStorageHandlerFlatFile.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 8b1f39b0a..45bae1354 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -4,9 +4,13 @@ declare(strict_types=1);
namespace SimpleSAML\Metadata;
+use Exception;
use SimpleSAML\Assert\Assert;
use SimpleSAML\Configuration;
+use function array_key_exists;
+use function is_array;
+
/**
* This file defines a flat file metadata source.
* Instantiation of session handler objects should be done through
@@ -45,6 +49,8 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
*/
protected function __construct(array $config)
{
+ parent::__construct();
+
// get the configuration
$globalConfig = Configuration::getInstance();
@@ -79,7 +85,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
{
$metadatasetfile = $this->directory . $set . '.php';
- if (!file_exists($metadatasetfile)) {
+ if (!$this->fileSystem->exists($metadatasetfile)) {
return null;
}
@@ -89,7 +95,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
include($metadatasetfile);
if (!is_array($metadata)) {
- throw new \Exception('Could not load metadata set [' . $set . '] from file: ' . $metadatasetfile);
+ throw new Exception('Could not load metadata set [' . $set . '] from file: ' . $metadatasetfile);
}
return $metadata;
--
GitLab