Improve metadata injection on settings

Author: pitbulk

README.md

@@ -1307,6 +1307,7 @@ Configuration of the OneLogin PHP Toolkit
  * `validateMetadata` - Validates an XML SP Metadata.
  * `formatIdPCert` - Formats the IdP cert.
  * `formatSPCert` - Formats the SP cert.
+ * `formatSPCertNew` - Formats the SP cert new.
  * `formatSPKey` - Formats the SP private key.
  * `getErrors` - Returns an array with the errors, the array is empty when
    the settings is ok.

lib/Saml2/IdPMetadataParser.php

@@ -196,10 +196,14 @@ public static function parseXML($xml, $entityId = null, $desiredNameIdFormat = n
      */
     public static function injectIntoSettings($settings, $metadataInfo)
     {
-        if (isset($metadataInfo['idp']) &&  isset($metadataInfo['idp']['x509certMulti']) && !empty($metadataInfo['idp']['x509certMulti'])) {
-            if (isset($settings['idp']) && isset($settings['idp']['x509cert'])) {
+        if (isset($metadataInfo['idp']) && isset($settings['idp'])) {
+            if (isset($metadataInfo['idp']['x509certMulti']) && !empty($metadataInfo['idp']['x509certMulti']) && isset($settings['idp']['x509cert'])) {
                 unset($settings['idp']['x509cert']);
             }
+
+            if (isset($metadataInfo['idp']['x509cert']) && !empty($metadataInfo['idp']['x509cert']) && isset($settings['idp']['x509certMulti'])) {
+                unset($settings['idp']['x509certMulti']);
+            }
         }
 
         return array_replace_recursive($settings, $metadataInfo);