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

Move property to parent class

parent ac45d611
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,8 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource ...@@ -42,6 +42,8 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource
*/ */
public function __construct(array $config) public function __construct(array $config)
{ {
parent::__construct();
$globalConfig = Configuration::getInstance(); $globalConfig = Configuration::getInstance();
$cfgHelp = Configuration::loadFromArray($config, 'serialize metadata source'); $cfgHelp = Configuration::loadFromArray($config, 'serialize metadata source');
......
...@@ -8,6 +8,7 @@ use SimpleSAML\Assert\Assert; ...@@ -8,6 +8,7 @@ use SimpleSAML\Assert\Assert;
use SimpleSAML\Error; use SimpleSAML\Error;
use SimpleSAML\Module; use SimpleSAML\Module;
use SimpleSAML\Utils; use SimpleSAML\Utils;
use Symfony\Component\Filesystem\Filesystem;
/** /**
* This abstract class defines an interface for metadata storage sources. * This abstract class defines an interface for metadata storage sources.
...@@ -21,6 +22,21 @@ use SimpleSAML\Utils; ...@@ -21,6 +22,21 @@ use SimpleSAML\Utils;
abstract class MetaDataStorageSource abstract class MetaDataStorageSource
{ {
/**
* @var \Symfony\Component\Filesystem\Filesystem;
*/
protected Filesystem $fileSystem;
/**
* This function initializes an XML metadata source.
*/
protected function __construct()
{
$this->fileSystem = new Filesystem();
}
/** /**
* Parse array with metadata sources. * Parse array with metadata sources.
* *
......
...@@ -13,7 +13,6 @@ use SimpleSAML\Logger; ...@@ -13,7 +13,6 @@ use SimpleSAML\Logger;
use SimpleSAML\Metadata\MetaDataStorageSource; use SimpleSAML\Metadata\MetaDataStorageSource;
use SimpleSAML\Metadata\SAMLParser; use SimpleSAML\Metadata\SAMLParser;
use SimpleSAML\Utils; use SimpleSAML\Utils;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\HttpFoundation\File\File;
use function array_key_exists; use function array_key_exists;
...@@ -56,12 +55,6 @@ class MDQ extends MetaDataStorageSource ...@@ -56,12 +55,6 @@ class MDQ extends MetaDataStorageSource
*/ */
private int $cacheLength; private int $cacheLength;
/**
* @var \Symfony\Component\Filesystem\Filesystem;
*/
private Filesystem $fileSystem;
/** /**
* This function initializes the dynamic XML metadata source. * This function initializes the dynamic XML metadata source.
* *
...@@ -79,6 +72,8 @@ class MDQ extends MetaDataStorageSource ...@@ -79,6 +72,8 @@ class MDQ extends MetaDataStorageSource
*/ */
protected function __construct(array $config) protected function __construct(array $config)
{ {
parent::__construct($config);
if (!array_key_exists('server', $config)) { if (!array_key_exists('server', $config)) {
throw new Exception(__CLASS__ . ": the 'server' configuration option is not set."); throw new Exception(__CLASS__ . ": the 'server' configuration option is not set.");
} else { } else {
...@@ -97,8 +92,6 @@ class MDQ extends MetaDataStorageSource ...@@ -97,8 +92,6 @@ class MDQ extends MetaDataStorageSource
} else { } else {
$this->cacheLength = 86400; $this->cacheLength = 86400;
} }
$this->fileSystem = new Filesystem();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment