Merge pull request #2343 from geoffrey-brier/fix-is-account-non-expired

Fix isAccountNonExpired after year 2038

Author: XWB

Model/User.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use FOS\UserBundle\Util\DateUtil;
 
 /**
  * Storage agnostic user object
@@ -317,7 +318,7 @@ public function isAccountNonExpired()
             return false;
         }
 
-        if (null !== $this->expiresAt && $this->expiresAt->getTimestamp() < time()) {
+        if (null !== $this->expiresAt && DateUtil::getSeconds($this->expiresAt->diff(new \DateTime())) <= 0) {
             return false;
         }
 

Tests/Util/DateUtilTest.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\UserBundle\Tests\Util;
+
+use FOS\UserBundle\Util\DateUtil;
+
+class DateUtilTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetSeconds()
+    {
+        $this->assertEquals(86400, DateUtil::getSeconds(new \DateInterval('P1D')));
+    }
+}

Util/DateUtil.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\UserBundle\Util;
+
+class DateUtil
+{
+    /**
+     * @param \DateInterval $interval
+     *
+     * @return int
+     */
+    public static function getSeconds(\DateInterval $interval)
+    {
+        $datetime = new \DateTime('@0');
+
+        return $datetime->add($interval)->getTimestamp();
+    }
+}