Merge branch 'fix-duplicate-limit' into 3.0

* fix-duplicate-limit:
  Add a unit test for the double limit fix in PrettyDataCollector.php
  Test the limitNum key when appending the limit

Author: alcaeus

DataCollector/PrettyDataCollector.php

@@ -110,7 +110,7 @@ public function collect(Request $request, Response $response, \Exception $except
                     $query .= ')';
                 } elseif (isset($log['skip'])) {
                     $query .= '.skip('.$log['skipNum'].')';
-                } elseif (isset($log['limit'])) {
+                } elseif (isset($log['limit']) && isset($log['limitNum'])) {
                     $query .= '.limit('.$log['limitNum'].')';
                 } elseif (isset($log['createCollection'])) {
                     $query .= '.createCollection()';

Tests/DataCollector/PrettyDataCollectorTest.php

@@ -50,4 +50,78 @@ public function getQueries()
             )
         );
     }
+
+    public function testCollectLimit()
+    {
+        $queries = array(
+            array(
+                'find' => true,
+                'query' => array(
+                    'path' => '/',
+                ),
+                'fields' => array(),
+                'db' => 'foo',
+                'collection' => 'Route',
+            ),
+            array(
+                'find' => true,
+                'query' => array('_id' => 'foo'),
+                'fields' => array(),
+                'db' => 'foo',
+                'collection' => 'User',
+            ),
+            array(
+                'limit' => true,
+                'limitNum' => 1,
+                'query' => array('_id' => 'foo'),
+                'fields' => array(),
+            ),
+            array(
+                'limit' => true,
+                'limitNum' => NULL,
+                'query' => array('_id' => 'foo'),
+                'fields' => array(),
+            ),
+            array(
+                'find' => true,
+                'query' => array(
+                    '_id' => '5506fa1580c7e1ee3c8b4c60',
+                ),
+                'fields' => array(),
+                'db' => 'foo',
+                'collection' => 'Group',
+            ),
+            array(
+                'limit' => true,
+                'limitNum' => 1,
+                'query' => array(
+                    '_id' => '5506fa1580c7e1ee3c8b4c60',
+                ),
+                'fields' => array(),
+            ),
+            array(
+                'limit' => true,
+                'limitNum' => NULL,
+                'query' => array(
+                    '_id' => '5506fa1580c7e1ee3c8b4c60',
+                ),
+                'fields' => array(),
+            ),
+        );
+        $formatted = array(
+            'use foo;',
+            'db.Route.find({ "path": "/" });',
+            'db.User.find({ "_id": "foo" }).limit(1);',
+            'db.Group.find({ "_id": "5506fa1580c7e1ee3c8b4c60" }).limit(1);'
+        );
+
+        $collector = new PrettyDataCollector();
+        foreach ($queries as $query) {
+            $collector->logQuery($query);
+        }
+        $collector->collect(new Request(), new Response());
+
+        $this->assertEquals(3, $collector->getQueryCount());
+        $this->assertEquals($formatted, $collector->getQueries());
+    }
 }