Merge pull request #59 from open-sausages/pulls/2.2/wait-for-pending-requests-for-real

Fix TestSessionState and TestSessionEnvironment

src/TestSessionEnvironment.php

@@ -573,24 +573,22 @@ class TestSessionEnvironment
      */
     public function waitForPendingRequests($await = 700, $timeout = 10000)
     {
-        $now = static function () {
+        $timeout = TestSessionState::millitime() + $timeout;
-            return microtime(true) * 10000;
-        };
-
-        $timeout = $now() + $timeout;
         $interval = max(300, $await);
+
         do {
+            $now = TestSessionState::millitime();
+
+            if ($timeout < $now) {
+                return false;
+            }
+
             $model = TestSessionState::get()->byID(1);
 
             $pendingRequests = $model->PendingRequests > 0;
-            $lastRequestAwait = ($model->LastResponseTimestamp + $await) > $now();
+            $lastRequestAwait = ($model->LastResponseTimestamp + $await) > $now;
 
             $pending = $pendingRequests || $lastRequestAwait;
-
-            if ($timeout < $now()) {
-                // timed out
-                return false;
-            }
         } while ($pending && (usleep($interval * 1000) || true));
 
         return true;

src/TestSessionState.php

@@ -53,8 +53,18 @@ class TestSessionState extends DataObject
         $update = SQLUpdate::create(sprintf('"%s"', $schema->tableName(self::class)))
                 ->addWhere(['ID' => 1])
                 ->assignSQL('"PendingRequests"', '"PendingRequests" - 1')
-                ->assign('"LastResponseTimestamp"', microtime(true) * 10000);
+                ->assign('"LastResponseTimestamp"', self::millitime());
 
         $update->execute();
     }
+
+    /**
+     * Returns unix timestamp in milliseconds
+     *
+     * @return float milliseconds since 1970
+     */
+    public static function millitime()
+    {
+        return round(microtime(true) * 1000);
+    }
 }