Code review changes

Author: arendjantetteroo

composer.json

@@ -14,6 +14,7 @@
     },
     "require": {
         "php": "^7.1",
+        "ext-mongodb": "*",
         "mongodb/mongodb": "^1.4",
         "symfony/console": "^2.7|^3.3|^4",
         "symfony/yaml": "^2.7|^3.3|^4"

src/AntiMattr/MongoDB/Migrations/Collection/Statistics.php

@@ -131,14 +131,6 @@ protected function getCollectionStats()
             throw new Exception($message);
         }
 
-        /* new MongoDB\Driver\Cursor does not have an errmsg, it throws exceptions itself */
-        /* Disabled for now @todo what to do with this? */
-        /*
-        if (isset($data['errmsg'])) {
-            throw new Exception($data['errmsg']);
-        }
-        */
-
         return $data;
     }
 }

src/AntiMattr/MongoDB/Migrations/Version.php

@@ -40,11 +40,6 @@ class Version
      */
     private $configuration;
 
-    /**
-     * @var \MongoDB\Connection
-     */
-    private $connection;
-
     /**
      * @var \MongoDB\Database
      */
@@ -87,7 +82,6 @@ public function __construct(Configuration $configuration, $version, $class)
         $this->configuration = $configuration;
         $this->outputWriter = $configuration->getOutputWriter();
         $this->class = $class;
-        $this->connection = $configuration->getConnection();
         $this->db = $configuration->getDatabase();
         $this->migration = $this->createMigration();
         $this->version = $version;
@@ -280,16 +274,7 @@ public function executeScript(Database $db, $file)
             throw $e;
         }
 
-        $result = $db->command(['$eval' => $js, 'nolock' => true]);
-
-        /* Command throws it's own exceptions if something is wrong, this errmsg no longer exists on MongoDB\DriverCursor
-          @todo what to do with this, disabled for now
-        if (isset($result['errmsg'])) {
-            throw new \Exception($result['errmsg'], isset($result['errno']) ? $result['errno'] : null);
-        }
-        */
-
-        return $result;
+        return $db->command(['$eval' => $js, 'nolock' => true]);
     }
 
     /**
@@ -379,7 +364,7 @@ private function summarizeStatistics()
 
     public function __toString()
     {
-        return $this->version;
+        return (string) $this->version;
     }
 
     /**

tests/AntiMattr/Tests/MongoDB/Migrations/Collection/StatisticsTest.php

@@ -40,35 +40,6 @@ public function testGetCollectionStatsThrowsExceptionWhenDataNotFound()
         $this->statistics->doGetCollectionStats();
     }
 
-    /**
-     * @expectedException \Exception
-     */
-    public function testGetCollectionStatsThrowsExceptionWhenErrmsgFound()
-    {
-        $database = $this->createMock('MongoDB\Database');
-
-        $this->statistics = new StatisticsStub();
-        $this->statistics->setCollection($this->collection);
-        $this->statistics->setDatabase($database);
-
-        $this->collection->expects($this->once())
-            ->method('getCollectionName')
-            ->will($this->returnValue('example'));
-
-        $data = [
-            'errmsg' => 'foo',
-        ];
-
-        $database->expects($this->once())
-            ->method('command')
-            ->will($this->returnValue($data));
-
-        // Can't test it this way as it will return a MongoDB\Driver\Cursor which does not have a errmsg array
-        // @todo what do to do here, remove this test? 
-        //$this->statistics->doGetCollectionStats();
-        $this->markTestIncomplete('This method needs to act on a MongoDB\Driver\Cursor object which has no error method');
-    }
-
     public function testGetCollectionStats()
     {
         $database = $this->createMock('MongoDB\Database');