Removing dependency to the Time class

lorenzo · Nov 12, 2015 · 6981569 · 6981569
1 parent 3216125
commit 6981569
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/LockableTrait.php b/src/LockableTrait.php
@@ -1,7 +1,7 @@
 <?php
 namespace RowLocker;
 
-use Cake\I18n\Time;
+use Cake\Database\Type;
 
 /**
  * Default implementation for LockableInterface
@@ -22,7 +22,7 @@ public function lock($by = null, $session = null)
             throw new LockingException('This entity is already locked');
         }
 
-        $this->set('locked_time', Time::now());
+        $this->set('locked_time', Type::build('datetime')->marshal(time()));
         if ($by !== null) {
             $this->set('locked_by', $by);
         }
@@ -53,9 +53,10 @@ public function unlock()
      */
     public function isLocked()
     {
-        $now = Time::now();
-        $locked = $this->get('locked_time');
-        return $locked && $now->diffInSeconds($locked) < static::getLockTimeout();
+        $now = time();
+        $locked = $this->get('locked_time')->format('U');
+
+        return $locked && abs($now - $locked) < static::getLockTimeout();
     }
 
     /**

diff --git a/src/Model/Behavior/RowLockerBehavior.php b/src/Model/Behavior/RowLockerBehavior.php
@@ -1,12 +1,12 @@
 <?php
 namespace RowLocker\Model\Behavior;
 
-use Cake\I18n\Time;
 use Cake\ORM\Behavior;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
-use RowLocker\LockableInterface;
 use Cake\Utility\Hash;
+use DateTimeImmutable;
+use RowLocker\LockableInterface;
 
 /**
  * Contains custom finders
@@ -52,7 +52,7 @@ public function findUnlocked(Query $query, $options)
             $entityClass = $this->_table->entityClass();
 
             $nullExp = clone $exp;
-            $edge = Time::now()->subSeconds($entityClass::getLockTimeout());
+            $edge = new DateTimeImmutable('@'. time() - $entityClass::getLockTimeout());
             $or = $exp->or_([
                 $nullExp->isNull($timeCol),
                 $exp->lte($timeCol, $edge, 'datetime')