saml: Fix NULL return from saml_IdP_SAML2::getAssociationConfig().

This function should not return NULL, but did so due to a missing
return statement. This patch adds that return statement, and fixes
the documentation for the function.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3206 44740490-163a-0410-bde0-09ae8108e29a

modules/saml/lib/IdP/SAML2.php

@@ -551,14 +551,14 @@ class sspmod_saml_IdP_SAML2 {
 	 *
 	 * @param SimpleSAML_IdP $idp  The IdP the association belongs to.
 	 * @param array $association  The SP association.
-	 * @return SimpleSAML_Configuration|NULL  Configuration object for the SP metadata.
+	 * @return SimpleSAML_Configuration  Configuration object for the SP metadata.
 	 */
 	public static function getAssociationConfig(SimpleSAML_IdP $idp, array $association) {
 		$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 		try {
 			return $metadata->getMetaDataConfig($association['saml:entityID'], 'saml20-sp-remote');
 		} catch (Exception $e) {
-			SimpleSAML_Configuration::loadFromArray(array(), 'Unknown SAML 2 entity.');
+			return SimpleSAML_Configuration::loadFromArray(array(), 'Unknown SAML 2 entity.');
 		}
 	}