Use DateTime/DateTimeZone classes

Author: pitbulk

lib/Saml2/Metadata.php

@@ -44,7 +44,7 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
         if (!isset($validUntil)) {
             $validUntil =  time() + self::TIME_VALID;
         }
-        $validUntilTime =  gmdate('Y-m-d\TH:i:s\Z', $validUntil);
+        $validUntilTime =  OneLogin_Saml2_Utils::parseTime2SAML($validUntil);
 
         if (!isset($cacheDuration)) {
             $cacheDuration = self::TIME_CACHED;

lib/Saml2/Utils.php

@@ -676,10 +676,8 @@ public static function generateUniqueID()
      */
     public static function parseTime2SAML($time)
     {
-        $defaultTimezone = date_default_timezone_get();
-        date_default_timezone_set('UTC');
-        $timestamp = strftime("%Y-%m-%dT%H:%M:%SZ", $time);
-        date_default_timezone_set($defaultTimezone);
+        $date = new DateTime("@$time", new DateTimeZone('UTC'));
+        $timestamp = $date->format("Y-m-d\TH:i:s\Z");
         return $timestamp;
     }
 

tests/src/OneLogin/Saml2/ResponseTest.php

@@ -535,9 +535,6 @@ public function testGetIssuers()
         }
     }
 
-
-
-
     /**
      * Tests the getSessionIndex method of the OneLogin_Saml2_Response
      *
@@ -556,7 +553,6 @@ public function testGetSessionIndex()
         $this->assertEquals('_7164a9a9f97828bfdb8d0ebc004a05d2e7d873f70c', $response2->getSessionIndex());
     }
 
-
     /**
      * Tests the getAttributes method of the OneLogin_Saml2_Response
      *
@@ -1194,7 +1190,6 @@ public function testIsInValidRequestId()
         $this->assertContains('No Signature found. SAML Response rejected', $response2->getError());
     }
 
-
     /**
      * Tests the isValid method of the OneLogin_Saml2_Response class
      * Case Invalid Response, Invalid signing issues

tests/src/OneLogin/Saml2/UtilsTest.php

@@ -714,7 +714,7 @@ public function testParseTime2SAML()
             OneLogin_Saml2_Utils::parseTime2SAML('invalidtime');
             $this->fail('Exception was not raised');
         } catch (Exception $e) {
-            $this->assertContains('strftime() expects parameter 2 to be', $e->getMessage());
+            $this->assertContains('Failed to parse time string', $e->getMessage());
         }
     }