Update changelog and version

Author: pitbulk

CHANGELOG

@@ -1,5 +1,26 @@
 CHANGELOG
 =========
+
+v.3.0.0 (pending)
+* Remove mcrypt dependency. Compatible with PHP 7.2
+* xmlseclibs now is not part of the toolkit and need to be installed from original source
+
+v.2.12.0
+* Improve Time management. Use DateTime/DateTimeZone classes.
+* Escape error messages in debug mode
+* Improve phpdoc
+* Add an extra filter to the url to be used on redirection
+
+* [#242](https://github.com/onelogin/php-saml/pull/242) Document that SHA-1 must not be used
+* [#250](https://github.com/onelogin/php-saml/pull/250) Fixed issue with IdPMetadataParser only keeping 1 certificate when multiple certificates of a single type were provided.
+* [#263](https://github.com/onelogin/php-saml/issues/263) Fix incompatibility with ADFS on SLO. When on php saml settings NameID Format is set as unspecified but the SAMLResponse has no NameID Format, no NameID Format should be specified on LogoutRequest.
+
+v.2.11.0
+* [#236](https://github.com/onelogin/php-saml/pull/236) Exclude unnecesary files from Composer production downloads
+* [#226](https://github.com/onelogin/php-saml/pull/226) Add possibility to handle nameId NameQualifier attribute in SLO Request
+* Improve logout documentation on Readme.
+* Improve multi-certificate support
+
 v.2.10.7
 * Fix IdPMetadataParser. The SingleLogoutService retrieved method was wrong
 * [#201](https://github.com/onelogin/php-saml/issues/201) Fix issues with SP entity_id, acs url and sls url that contains &

lib/Saml2/Auth.php

@@ -702,7 +702,7 @@ public function getLastResponseXML()
                 $response = $this->_lastResponse->saveXML();
             }
         }
-        
+
         return $response;
     }
 }

lib/Saml2/AuthnRequest.php

@@ -43,7 +43,7 @@ class OneLogin_Saml2_AuthnRequest
     /**
      * Constructs the AuthnRequest object.
      *
-     * @param OneLogin_Saml2_Settings $settings        Settings
+     * @param OneLogin_Saml2_Settings $settings        SAML Toolkit Settings
      * @param bool                    $forceAuthn      When true the AuthNReuqest will set the ForceAuthn='true'
      * @param bool                    $isPassive       When true the AuthNReuqest will set the Ispassive='true'
      * @param bool                    $setNameIdPolicy When true the AuthNReuqest will set a nameIdPolicy

lib/Saml2/IdPMetadataParser.php

@@ -174,8 +174,8 @@ public static function parseXML($xml, $entityId = null, $desiredNameIdFormat = n
                     }
 
                     $idpCertdata = $metadataInfo['idp']['x509certMulti'];
-                    if (count($idpCertdata) == 1 and
-                         ((isset($idpCertdata['signing']) and count($idpCertdata['signing']) == 1) or (isset($idpCertdata['encryption']) and count($idpCertdata['encryption']) == 1)) or
+                    if ((count($idpCertdata) == 1 and
+                         ((isset($idpCertdata['signing']) and count($idpCertdata['signing']) == 1) or (isset($idpCertdata['encryption']) and count($idpCertdata['encryption']) == 1))) or
                          ((isset($idpCertdata['signing']) && count($idpCertdata['signing']) == 1) && isset($idpCertdata['encryption']) && count($idpCertdata['encryption']) == 1 && strcmp($idpCertdata['signing'][0], $idpCertdata['encryption'][0]) == 0)) {
                         if (isset($metadataInfo['idp']['x509certMulti']['signing'][0])) {
                             $metadataInfo['idp']['x509cert'] = $metadataInfo['idp']['x509certMulti']['signing'][0];

lib/Saml2/version.json

@@ -1,6 +1,6 @@
 {
     "php-saml": {
-        "version": "2.10.7",
-        "released": "19/05/2017"
+        "version": "3.0.0",
+        "released": ""
     }
 }

tests/compatibility.php

@@ -4,4 +4,3 @@
     class_exists('\PHPUnit_Framework_TestCase')) {
     class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
 }
-