Merge pull request #261 from alcaeus/fix-cursorinterface-inheritance

Fix cursor interface inheritance

Author: alcaeus

lib/Mongo/MongoCursor.php

@@ -28,7 +28,7 @@
  * Result object for database query.
  * @link http://www.php.net/manual/en/class.mongocursor.php
  */
-class MongoCursor extends AbstractCursor implements Iterator, Countable
+class MongoCursor extends AbstractCursor implements Iterator, Countable, MongoCursorInterface
 {
     /**
      * @var bool

lib/Mongo/MongoGridFSCursor.php

@@ -17,7 +17,7 @@
     return;
 }
 
-class MongoGridFSCursor extends MongoCursor
+class MongoGridFSCursor extends MongoCursor implements Countable
 {
     /**
      * @static

tests/Alcaeus/MongoDbAdapter/Mongo/MongoCommandCursorTest.php

@@ -2,6 +2,7 @@
 
 namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
 
+use MongoCursorInterface;
 use MongoDB\Database;
 use MongoDB\Driver\ReadPreference;
 use Alcaeus\MongoDbAdapter\Tests\TestCase;
@@ -202,4 +203,12 @@ public function dataCommandAppliesCorrectReadPreference()
             ],
         ];
     }
+
+    public function testInterfaces()
+    {
+        $this->prepareData();
+        $cursor = $this->getCollection()->aggregateCursor([['$match' => ['foo' => 'bar']]]);
+
+        $this->assertInstanceOf(MongoCursorInterface::class, $cursor);
+    }
 }

tests/Alcaeus/MongoDbAdapter/Mongo/MongoCursorTest.php

@@ -4,6 +4,8 @@
 
 use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeConverter;
+use Countable;
+use MongoCursorInterface;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Model\BSONDocument;
 use MongoDB\Operation\Find;
@@ -516,6 +518,19 @@ public function testExplainConvertsQuery()
         $this->assertArraySubset($expected, $cursor->explain());
     }
 
+    public function testInterfaces()
+    {
+        $collection = $this->getCollection();
+        $cursor = $collection->find();
+
+        $this->assertInstanceOf(MongoCursorInterface::class, $cursor);
+
+        // The countable interface is necessary for compatibility with PHP 7.3+, but not implemented by MongoCursor
+        if (! extension_loaded('mongo')) {
+            $this->assertInstanceOf(Countable::class, $cursor);
+        }
+    }
+
 
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject

tests/Alcaeus/MongoDbAdapter/Mongo/MongoGridFSCursorTest.php

@@ -3,6 +3,7 @@
 namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
 
 use Alcaeus\MongoDbAdapter\Tests\TestCase;
+use Countable;
 
 class MongoGridFSCursorTest extends TestCase
 {
@@ -37,4 +38,16 @@ public function testCursorItems()
             ], $value->file);
         }
     }
+
+    public function testInterfaces()
+    {
+        $this->skipTestIf(extension_loaded('mongo'));
+
+        $gridfs = $this->getGridFS();
+        $id = $gridfs->storeBytes('foo', ['filename' => 'foo.txt']);
+        $gridfs->storeBytes('bar', ['filename' => 'bar.txt']);
+
+        $cursor = $gridfs->find(['filename' => 'foo.txt']);
+        $this->assertInstanceOf(Countable::class, $cursor);
+    }
 }