Fix some classes in tests

Author: jenssegers

phpunit.xml

@@ -7,7 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
+         stopOnFailure="false"
          syntaxCheck="false"
 >
     <testsuites>

tests/QueryBuilderTest.php

@@ -1,5 +1,8 @@
 <?php
 
+use MongoDB\BSON\UTCDateTime;
+use MongoDB\BSON\Regex;
+
 class QueryBuilderTest extends TestCase {
 
     public function tearDown()
@@ -241,7 +244,7 @@ public function testPush()
         $this->assertEquals(4, count($user['tags']));
         $this->assertEquals(2, count($user['messages']));
 
-        DB::collection('users')->where('_id', $id)->push(['messages' => ['date' => new MongoDate(), 'body' => 'Hi John']]);
+        DB::collection('users')->where('_id', $id)->push(['messages' => ['date' => new DateTime(), 'body' => 'Hi John']]);
         $user = DB::collection('users')->find($id);
         $this->assertEquals(3, count($user['messages']));
     }
@@ -461,20 +464,20 @@ public function testUpdateSubdocument()
     public function testDates()
     {
         DB::collection('users')->insert([
-            ['name' => 'John Doe', 'birthday' => new MongoDate(strtotime("1980-01-01 00:00:00"))],
-            ['name' => 'Jane Doe', 'birthday' => new MongoDate(strtotime("1981-01-01 00:00:00"))],
-            ['name' => 'Robert Roe', 'birthday' => new MongoDate(strtotime("1982-01-01 00:00:00"))],
-            ['name' => 'Mark Moe', 'birthday' => new MongoDate(strtotime("1983-01-01 00:00:00"))],
+            ['name' => 'John Doe', 'birthday' => new UTCDateTime(1000 * strtotime("1980-01-01 00:00:00"))],
+            ['name' => 'Jane Doe', 'birthday' => new UTCDateTime(1000 * strtotime("1981-01-01 00:00:00"))],
+            ['name' => 'Robert Roe', 'birthday' => new UTCDateTime(1000 * strtotime("1982-01-01 00:00:00"))],
+            ['name' => 'Mark Moe', 'birthday' => new UTCDateTime(1000 * strtotime("1983-01-01 00:00:00"))],
         ]);
 
-        $user = DB::collection('users')->where('birthday', new MongoDate(strtotime("1980-01-01 00:00:00")))->first();
+        $user = DB::collection('users')->where('birthday', new UTCDateTime(1000 * strtotime("1980-01-01 00:00:00")))->first();
         $this->assertEquals('John Doe', $user['name']);
 
         $user = DB::collection('users')->where('birthday', '=', new DateTime("1980-01-01 00:00:00"))->first();
         $this->assertEquals('John Doe', $user['name']);
 
-        $start = new MongoDate(strtotime("1981-01-01 00:00:00"));
-        $stop = new MongoDate(strtotime("1982-01-01 00:00:00"));
+        $start = new UTCDateTime(1000 * strtotime("1981-01-01 00:00:00"));
+        $stop = new UTCDateTime(1000 * strtotime("1982-01-01 00:00:00"));
 
         $users = DB::collection('users')->whereBetween('birthday', [$start, $stop])->get();
         $this->assertEquals(2, count($users));
@@ -537,11 +540,11 @@ public function testOperators()
         $results = DB::collection('items')->where('tags', 'size', 4)->get();
         $this->assertEquals(1, count($results));
 
-        $regex = new MongoRegex("/.*doe/i");
+        $regex = new Regex("/.*doe/i");
         $results = DB::collection('users')->where('name', 'regex', $regex)->get();
         $this->assertEquals(2, count($results));
 
-        $regex = new MongoRegex("/.*doe/i");
+        $regex = new Regex("/.*doe/i");
         $results = DB::collection('users')->where('name', 'regexp', $regex)->get();
         $this->assertEquals(2, count($results));