Merge pull request #821 from Scalesoft/feature/php-7.2

Add PHP 7.2 into Travis

.travis.yml

@@ -5,6 +5,7 @@ php:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 - hhvm
 matrix:
   allow_failures:

lib/SimpleSAML/SessionHandlerPHP.php

@@ -76,13 +76,15 @@ class SessionHandlerPHP extends SessionHandler
 
         $params = $this->getCookieParams();
 
-        session_set_cookie_params(
-            $params['lifetime'],
-            $params['path'],
-            $params['domain'],
-            $params['secure'],
-            $params['httponly']
-        );
+        if (!headers_sent()) {
+            session_set_cookie_params(
+                $params['lifetime'],
+                $params['path'],
+                $params['domain'],
+                $params['secure'],
+                $params['httponly']
+            );
+        }
 
         $savepath = $config->getString('session.phpsession.savepath', null);
         if (!empty($savepath)) {

modules/core/lib/Auth/UserPassBase.php

@@ -196,7 +196,7 @@ abstract class sspmod_core_Auth_UserPassBase extends SimpleSAML_Auth_Source {
 	      }
 
 	      $attributes = $this->login($username, $password);
-	      assert('is_array($attributes)');
+	      assert(is_array($attributes));
 	      $state['Attributes'] = $attributes;
 
 	      return;

modules/saml/lib/IdP/SAML2.php

@@ -443,7 +443,7 @@ class sspmod_saml_IdP_SAML2
     public static function processSOAPAuthnRequest(array &$state)
     {
         if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
-            SimpleSAML_Logger::error("ECP AuthnRequest did not contain Basic Authentication header");
+            SimpleSAML\Logger::error("ECP AuthnRequest did not contain Basic Authentication header");
             // TODO Throw some sort of ECP-specific exception / convert this to SOAP fault
             throw new SimpleSAML_Error_Error("WRONGUSERPASS");
         }