PHPC-2144 Throw a LogicException when getting info from unacknowledged write result

And remove nullable from WriteResult get*Count accessors

Author: GromNaN

src/MongoDB/WriteResult.c

@@ -31,10 +31,9 @@
 #include "MongoDB/WriteError.h"
 #include "WriteResult_arginfo.h"
 
-#define PHONGO_WRITERESULT_CHECK_ACKNOWLEDGED(method)                                                                                                                                        \
-	if (!mongoc_write_concern_is_acknowledged(intern->write_concern)) {                                                                                                                      \
-		php_error_docref(NULL, E_DEPRECATED, "Calling MongoDB\\Driver\\WriteResult::" method "() for an unacknowledged write is deprecated and will throw an exception in ext-mongodb 2.0"); \
-		RETURN_NULL();                                                                                                                                                                       \
+#define PHONGO_WRITERESULT_CHECK_ACKNOWLEDGED(method)                                                                                                     \
+	if (!mongoc_write_concern_is_acknowledged(intern->write_concern)) {                                                                                   \
+		phongo_throw_exception(PHONGO_ERROR_LOGIC, "MongoDB\\Driver\\WriteResult::" method "() should not be called for an unacknowledged write result"); \
 	}
 
 #define PHONGO_WRITERESULT_RETURN_LONG_FROM_BSON_INT32(iter, bson, key)                \

src/MongoDB/WriteResult.stub.php

@@ -12,15 +12,15 @@ final class WriteResult
 {
     final private function __construct() {}
 
-    final public function getInsertedCount(): ?int {}
+    final public function getInsertedCount(): int {}
 
-    final public function getMatchedCount(): ?int {}
+    final public function getMatchedCount(): int {}
 
-    final public function getModifiedCount(): ?int {}
+    final public function getModifiedCount(): int {}
 
-    final public function getDeletedCount(): ?int {}
+    final public function getDeletedCount(): int {}
 
-    final public function getUpsertedCount(): ?int {}
+    final public function getUpsertedCount(): int {}
 
     final public function getServer(): Server {}
 

src/MongoDB/WriteResult_arginfo.h

@@ -19,12 +19,13 @@ $bulk->delete(['x' => 1]);
 
 $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
 
-var_dump($result->getDeletedCount());
+throws(function() use ($result) {
+    $result->getDeletedCount();
+}, MongoDB\Driver\Exception\LogicException::class, 'getDeletedCount');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\WriteResult::getDeletedCount(): Calling MongoDB\Driver\WriteResult::getDeletedCount() for an unacknowledged write is deprecated and will throw an exception in ext-mongodb 2.0 in %s
-NULL
+OK: Got MongoDB\Driver\Exception\LogicException thrown from getDeletedCount
 ===DONE===

tests/writeResult/writeresult-getdeletedcount-002.phpt

@@ -19,12 +19,13 @@ $bulk->delete(['x' => 1]);
 
 $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
 
-var_dump($result->getInsertedCount());
+throws(function() use ($result) {
+    $result->getInsertedCount();
+}, MongoDB\Driver\Exception\LogicException::class, 'getInsertedCount');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\WriteResult::getInsertedCount(): Calling MongoDB\Driver\WriteResult::getInsertedCount() for an unacknowledged write is deprecated and will throw an exception in ext-mongodb 2.0 in %s
-NULL
+OK: Got MongoDB\Driver\Exception\LogicException thrown from getInsertedCount
 ===DONE===

tests/writeResult/writeresult-getinsertedcount-002.phpt

@@ -19,12 +19,13 @@ $bulk->delete(['x' => 1]);
 
 $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
 
-var_dump($result->getMatchedCount());
+throws(function() use ($result) {
+    $result->getMatchedCount();
+}, MongoDB\Driver\Exception\LogicException::class, 'getMatchedCount');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\WriteResult::getMatchedCount(): Calling MongoDB\Driver\WriteResult::getMatchedCount() for an unacknowledged write is deprecated and will throw an exception in %s
-NULL
+OK: Got MongoDB\Driver\Exception\LogicException thrown from getMatchedCount
 ===DONE===

tests/writeResult/writeresult-getmatchedcount-002.phpt

@@ -19,12 +19,13 @@ $bulk->delete(['x' => 1]);
 
 $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
 
-var_dump($result->getModifiedCount());
+throws(function() use ($result) {
+    $result->getModifiedCount();
+}, MongoDB\Driver\Exception\LogicException::class, 'getModifiedCount');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\WriteResult::getModifiedCount(): Calling MongoDB\Driver\WriteResult::getModifiedCount() for an unacknowledged write is deprecated and will throw an exception in ext-mongodb 2.0 in %s
-NULL
+OK: Got MongoDB\Driver\Exception\LogicException thrown from getModifiedCount
 ===DONE===

tests/writeResult/writeresult-getmodifiedcount-002.phpt

@@ -19,12 +19,13 @@ $bulk->delete(['x' => 1]);
 
 $result = $manager->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern(0));
 
-var_dump($result->getUpsertedCount());
+throws(function() use ($result) {
+    $result->getUpsertedCount();
+}, MongoDB\Driver\Exception\LogicException::class, 'getUpsertedCount');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\WriteResult::getUpsertedCount(): Calling MongoDB\Driver\WriteResult::getUpsertedCount() for an unacknowledged write is deprecated and will throw an exception in ext-mongodb 2.0 in %s
-NULL
+OK: Got MongoDB\Driver\Exception\LogicException thrown from getUpsertedCount
 ===DONE===