Skip to content
Snippets Groups Projects
Commit 313d4d33 authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Rewrite FlatFile using symfony/filesystem

parent 4cd2bbd0
No related branches found
No related tags found
No related merge requests found
...@@ -4,9 +4,13 @@ declare(strict_types=1); ...@@ -4,9 +4,13 @@ declare(strict_types=1);
namespace SimpleSAML\Metadata; namespace SimpleSAML\Metadata;
use Exception;
use SimpleSAML\Assert\Assert; use SimpleSAML\Assert\Assert;
use SimpleSAML\Configuration; use SimpleSAML\Configuration;
use function array_key_exists;
use function is_array;
/** /**
* This file defines a flat file metadata source. * This file defines a flat file metadata source.
* Instantiation of session handler objects should be done through * Instantiation of session handler objects should be done through
...@@ -45,6 +49,8 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource ...@@ -45,6 +49,8 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
*/ */
protected function __construct(array $config) protected function __construct(array $config)
{ {
parent::__construct();
// get the configuration // get the configuration
$globalConfig = Configuration::getInstance(); $globalConfig = Configuration::getInstance();
...@@ -79,7 +85,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource ...@@ -79,7 +85,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
{ {
$metadatasetfile = $this->directory . $set . '.php'; $metadatasetfile = $this->directory . $set . '.php';
if (!file_exists($metadatasetfile)) { if (!$this->fileSystem->exists($metadatasetfile)) {
return null; return null;
} }
...@@ -89,7 +95,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource ...@@ -89,7 +95,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
include($metadatasetfile); include($metadatasetfile);
if (!is_array($metadata)) { 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; return $metadata;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment