PHP-1322: More renaming

bjori · bjori · commit 54a2e194cedd · 2014-12-08T14:43:09.000-08:00
diff --git a/docs/batch.md b/docs/batch.md
@@ -108,11 +108,11 @@ $manager = new MongoDB\Manager("mongodb://localhost:27017");
 $wc      = new MongoDB\WriteConcern(MongoDB\WriteConcern::MAJORITY);
 $result  = $manager->executeWriteBatch("db.collection", $batch, $wc);
 
-printf("numInserted: %d\n", $result->getInsertedCount());
-printf("numMatched: %d\n", $result->getMatchedCount());
-printf("numModified: %d\n", $result->getModifiedCount());
-printf("numUpserted: %d\n", $result->getUpsertedCount());
-printf("numRemoved: %d\n", $result->getDeletedCount());
+printf("insertedCount: %d\n", $result->getInsertedCount());
+printf("matchedCount: %d\n", $result->getMatchedCount());
+printf("modifiedCount: %d\n", $result->getModifiedCount());
+printf("upsertedCount: %d\n", $result->getUpsertedCount());
+printf("deletedCount: %d\n", $result->getDeletedCount());
 
 foreach ($result->getUpsertedIds() as $index => $id) {
 	printf("upsertedId: '%s', index: %d\n", $id, $index);
diff --git a/old-docs/api/MongoDB/WriteResult.php b/old-docs/api/MongoDB/WriteResult.php
@@ -15,7 +15,7 @@ final class WriteResult
      *
      * @return integer
      */
-    public function getNumInserted() {
+    public function getInsertedCount() {
         /*** CIMPL ***/
 /*
 	RETURN_LONG(intern->nInserted);
@@ -28,7 +28,7 @@ public function getNumInserted() {
      *
      * @return integer
      */
-    public function getNumMatched() {
+    public function getMatchedCount() {
         /*** CIMPL ***/
 /*
 	RETURN_LONG(intern->nMatched);
@@ -41,7 +41,7 @@ public function getNumMatched() {
      *
      * @return integer
      */
-    public function getNumModified() {
+    public function getModifiedCount() {
         /*** CIMPL ***/
 /*
 	RETURN_LONG(intern->nModified);
@@ -54,7 +54,7 @@ public function getNumModified() {
      *
      * @return integer
      */
-    public function getNumRemoved() {
+    public function getDeletedCount() {
         /*** CIMPL ***/
 /*
 	RETURN_LONG(intern->nRemoved);
@@ -67,7 +67,7 @@ public function getNumRemoved() {
      *
      * @return integer
      */
-    public function getNumUpserted() {
+    public function getUpsertedCount() {
         /*** CIMPL ***/
 /*
 	RETURN_LONG(intern->nUpserted);
diff --git a/old-docs/examples/insert.php b/old-docs/examples/insert.php
@@ -18,7 +18,7 @@
 
 printf(
     "Inserted %d documents to %s\n",
-    $result->getNumInserted(),
+    $result->getInsertedCount(),
     $result->getServer()->getHost()
 );
 printf("hannes: %s (%s)\nhayley: %s (%s)\n", $hannes_id, get_class($hannes_id), $hayley_id, get_class($hannes_id));
diff --git a/tests/batch/write-0001.phpt b/tests/batch/write-0001.phpt
@@ -21,7 +21,7 @@ $batch->update(array("foo" => "bar"), array('$set' => array("foo" => "baz")), ar
 $retval = $mc->executeWriteBatch(NS, $batch);
 
 printf("Inserted: %d\n", getInsertCount($retval));
-printf("Deleted: %d\n", getRemovedCount($retval));
+printf("Deleted: %d\n", getDeletedCount($retval));
 printf("Updated: %d\n", getModifiedCount($retval));
 printf("Upserted: %d\n", getUpsertedCount($retval));
 foreach(getWriteErrors($retval) as $error) {
diff --git a/tests/standalone/manager-executeDelete-001.phpt b/tests/standalone/manager-executeDelete-001.phpt
@@ -27,11 +27,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 1
+insertedCount: 0
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 1
 
 ===> Collection
 array(1) {
diff --git a/tests/standalone/manager-executeDelete-002.phpt b/tests/standalone/manager-executeDelete-002.phpt
@@ -28,11 +28,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 2
+insertedCount: 0
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 2
 
 ===> Collection
 array(0) {
diff --git a/tests/standalone/manager-executeInsert-001.phpt b/tests/standalone/manager-executeInsert-001.phpt
@@ -23,11 +23,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 1
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 0
+insertedCount: 1
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 0
 
 ===> Collection
 array(1) {
diff --git a/tests/standalone/manager-executeUpdate-001.phpt b/tests/standalone/manager-executeUpdate-001.phpt
@@ -31,11 +31,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 1
-numModified: 1
-numUpserted: 0
-numRemoved: 0
+insertedCount: 0
+matchedCount: 1
+modifiedCount: 1
+upsertedCount: 0
+deletedCount: 0
 
 ===> Collection
 array(1) {
diff --git a/tests/standalone/manager-executeUpdate-002.phpt b/tests/standalone/manager-executeUpdate-002.phpt
@@ -34,11 +34,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 2
-numModified: 2
-numUpserted: 0
-numRemoved: 0
+insertedCount: 0
+matchedCount: 2
+modifiedCount: 2
+upsertedCount: 0
+deletedCount: 0
 
 ===> Collection
 array(3) {
diff --git a/tests/standalone/manager-executeUpdate-003.phpt b/tests/standalone/manager-executeUpdate-003.phpt
@@ -28,11 +28,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 0
-numModified: 0
-numUpserted: 1
-numRemoved: 0
+insertedCount: 0
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 1
+deletedCount: 0
 upsertedId[0]: int(1)
 
 ===> Collection
diff --git a/tests/standalone/manager-executeUpdate-004.phpt b/tests/standalone/manager-executeUpdate-004.phpt
@@ -28,11 +28,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 0
-numModified: 0
-numUpserted: 1
-numRemoved: 0
+insertedCount: 0
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 1
+deletedCount: 0
 upsertedId[0]: int(1)
 
 ===> Collection
diff --git a/tests/standalone/manager-executeWriteBatch-001.phpt b/tests/standalone/manager-executeWriteBatch-001.phpt
@@ -30,11 +30,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECT--
 ===> WriteResult
 server: localhost:27017
-numInserted: 2
-numMatched: 1
-numModified: 1
-numUpserted: 1
-numRemoved: 1
+insertedCount: 2
+matchedCount: 1
+modifiedCount: 1
+upsertedCount: 1
+deletedCount: 1
 upsertedId[3]: int(3)
 
 ===> Collection
diff --git a/tests/standalone/manager-executeWriteBatch-002.phpt b/tests/standalone/manager-executeWriteBatch-002.phpt
@@ -38,11 +38,11 @@ WriteException.code: 0
 
 ===> WriteResult
 server: localhost:27017
-numInserted: 1
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 0
+insertedCount: 1
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 0
 writeError[1].message: %s
 writeError[1].code: 11000
 
diff --git a/tests/standalone/manager-executeWriteBatch-003.phpt b/tests/standalone/manager-executeWriteBatch-003.phpt
@@ -38,11 +38,11 @@ WriteException.code: 0
 
 ===> WriteResult
 server: localhost:27017
-numInserted: 2
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 0
+insertedCount: 2
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 0
 writeError[1].message: %s
 writeError[1].code: 11000
 writeError[3].message: %s
diff --git a/tests/standalone/manager-executeWriteBatch-004.phpt b/tests/standalone/manager-executeWriteBatch-004.phpt
@@ -28,11 +28,11 @@ var_dump(iterator_to_array($cursor));
 --EXPECTF--
 ===> WriteResult
 server: localhost:27017
-numInserted: 0
-numMatched: 1
-numModified: 1
-numUpserted: 2
-numRemoved: 0
+insertedCount: 0
+matchedCount: 1
+modifiedCount: 1
+upsertedCount: 2
+deletedCount: 0
 upsertedId[0]: object(BSON\ObjectID)#%d (0) {
 }
 upsertedId[1]: object(BSON\ObjectID)#%d (0) {
diff --git a/tests/standalone/server-executeWriteBatch-001.phpt b/tests/standalone/server-executeWriteBatch-001.phpt
@@ -34,11 +34,11 @@ WriteResult.server is the same: yes
 
 ===> WriteResult
 server: localhost:27017
-numInserted: 2
-numMatched: 1
-numModified: 1
-numUpserted: 1
-numRemoved: 1
+insertedCount: 2
+matchedCount: 1
+modifiedCount: 1
+upsertedCount: 1
+deletedCount: 1
 upsertedId[3]: int(3)
 
 ===> Collection
diff --git a/tests/standalone/write-error-001.phpt b/tests/standalone/write-error-001.phpt
@@ -28,9 +28,9 @@ try {
 <?php exit(0); ?>
 --EXPECT--
 server: localhost:27017
-numInserted: 0
-numMatched: 0
-numModified: 0
-numUpserted: 0
-numRemoved: 0
+insertedCount: 0
+matchedCount: 0
+modifiedCount: 0
+upsertedCount: 0
+deletedCount: 0
 ===DONE===
diff --git a/tests/utils/basic.inc b/tests/utils/basic.inc
@@ -99,11 +99,11 @@ function printWriteResult(MongoDB\WriteResult $result)
 {
     printServer($result->getServer());
 
-    printf("numInserted: %d\n", $result->getInsertedCount());
-    printf("numMatched: %d\n", $result->getMatchedCount());
-    printf("numModified: %d\n", $result->getModifiedCount());
-    printf("numUpserted: %d\n", $result->getUpsertedCount());
-    printf("numRemoved: %d\n", $result->getDeletedCount());
+    printf("insertedCount: %d\n", $result->getInsertedCount());
+    printf("matchedCount: %d\n", $result->getMatchedCount());
+    printf("modifiedCount: %d\n", $result->getModifiedCount());
+    printf("upsertedCount: %d\n", $result->getUpsertedCount());
+    printf("deletedCount: %d\n", $result->getDeletedCount());
 
     foreach ($result->getUpsertedIds() as $index => $id) {
         printf("upsertedId[%d]: ", $index);
@@ -139,7 +139,7 @@ function getInsertCount($retval) {
 function getModifiedCount($retval) {
     return $retval->getModifiedCount();
 }
-function getRemovedCount($retval) {
+function getDeletedCount($retval) {
     return $retval->getDeletedCount();
 }
 function getUpsertedCount($retval) {
