Address issues from unit tests

lib/SimpleSAML/Utils/Config/Metadata.php

@@ -117,7 +117,7 @@ class Metadata
 
         // check attributes is an associative array
         if (isset($contact['attributes'])) {
-            if (empty($contact['attributes']) || empty(array_filter(array_keys($contact['attributes']), 'is_string'))) {
+            if (empty($contact['attributes']) || !is_array($contact['attributes']) || empty(array_filter(array_keys($contact['attributes']), 'is_string'))) {
                 throw new \InvalidArgumentException('"attributes" must be an array and cannot be empty.');
             }
         }

tests/lib/SimpleSAML/Utils/Config/MetadataTest.php

@@ -215,6 +215,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
         }
         $contact['contactType'] = 'technical';
         $contact['name'] = 'to_be_removed';
+        $contact['attributes'] = array('test' => 'testval');
         $parsed = Metadata::getContact($contact);
         foreach (array_keys($parsed) as $key) {
             $this->assertEquals($parsed[$key], $contact[$key]);