Fix Psalm-issues

Author: tvdijen

hooks/hook_cron.php

@@ -22,7 +22,9 @@ function metarefresh_hook_cron(&$croninfo)
         $mconfig = \SimpleSAML\Configuration::getOptionalConfig('config-metarefresh.php');
 
         $sets = $mconfig->getConfigList('sets', []);
-        $stateFile = $config->getPathValue('datadir', 'data/').'metarefresh-state.php';
+        /** @var string $datadir */
+        $datadir = $config->getPathValue('datadir', 'data/');
+        $stateFile = $datadir.'metarefresh-state.php';
 
         foreach ($sets as $setkey => $set) {
             // Only process sets where cron matches the current cron tag
@@ -42,6 +44,10 @@ function metarefresh_hook_cron(&$croninfo)
 
             $outputDir = $set->getString('outputDir');
             $outputDir = $config->resolvePath($outputDir);
+            if ($outputDir === null) {
+                throw \Exception("Invalid outputDir specified.");
+            }
+
             $outputFormat = $set->getValueValidate('outputFormat', ['flatfile', 'serialize'], 'flatfile');
 
             $oldMetadataSrc = \SimpleSAML\Metadata\MetaDataStorageSource::getSource([

lib/ARP.php

@@ -36,7 +36,7 @@ class ARP
      * @param string $prefix
      * @param string $suffix
      */
-    public function __construct($metadata, $attributemap_filename, $prefix, $suffix)
+    public function __construct(array $metadata, $attributemap_filename, $prefix, $suffix)
     {
         $this->metadata = $metadata;
         $this->prefix = $prefix;
@@ -135,7 +135,7 @@ private function getEntryXML($entry)
      *
      * @return string
      */
-    private function getEntryXMLcontent($entry)
+    private function getEntryXMLcontent(array $entry)
     {
         if (!array_key_exists('attributes', $entry)) {
             return '';

lib/MetaLoader.php

@@ -55,8 +55,8 @@ public function __construct($expire = null, $stateFile = null, $oldMetadataSrc =
         $this->stateFile = $stateFile;
 
         // Read file containing $state from disk
-        if (is_readable($stateFile)) {
-            include $stateFile;
+        if (!is_null($stateFile) && is_readable($stateFile)) {
+            include($stateFile);
         }
     }
 
@@ -94,7 +94,7 @@ public function setTypes($types)
      * @param $source array
      * @return void
      */
-    public function loadSource($source)
+    public function loadSource(array $source)
     {
         if (preg_match('@^https?://@i', $source['src'])) {
             // Build new HTTP context
@@ -225,7 +225,7 @@ public function loadSource($source)
      * @param array $source
      * @return array
      */
-    private function createContext($source)
+    private function createContext(array $source)
     {
         $config = Configuration::getInstance();
         $name = $config->getString('technicalcontact_name', null);
@@ -255,7 +255,7 @@ private function createContext($source)
      * @param array $source
      * @return void
      */
-    private function addCachedMetadata($source)
+    private function addCachedMetadata(array $source)
     {
         if (isset($this->oldMetadataSrc)) {
             foreach ($this->types as $type) {
@@ -278,7 +278,7 @@ private function addCachedMetadata($source)
      * @param array $responseHeaders
      * @return void
      */
-    private function saveState($source, $responseHeaders)
+    private function saveState(array $source, array $responseHeaders)
     {
         if (isset($source['conditionalGET']) && $source['conditionalGET']) {
             // Headers section
@@ -309,7 +309,7 @@ private function saveState($source, $responseHeaders)
      * @return \SimpleSAML\Metadata\SAMLParser[]
      * @throws \Exception
      */
-    private function loadXML($data, $source)
+    private function loadXML($data, array $source)
     {
         try {
             $doc = \SAML2\DOMDocumentFactory::fromString($data);
@@ -379,7 +379,7 @@ public function dumpMetadataStdOut()
      * @param array|null $template The template.
      * @return void
      */
-    private function addMetadata($filename, $metadata, $type, $template = null)
+    private function addMetadata($filename, array $metadata, $type, array $template = null)
     {
         if ($metadata === null) {
             return;
@@ -418,7 +418,7 @@ private function addMetadata($filename, $metadata, $type, $template = null)
      * @param \SimpleSAML\Configuration $config
      * @return void
      */
-    public function writeARPfile($config)
+    public function writeARPfile(Configuration $config)
     {
         Assert::isInstanceOf($config, Configuration::class);