symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+22-6Lines changed: 22 additions & 6 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+22-6Lines changed: 22 additions & 6 deletions
@@ -117,6 +117,9 @@ private function sanitizeQueries($connectionName, $queries)
     private function sanitizeQuery($connectionName, $query)
     {
         $query['explainable'] = true;
+        if (null === $query['params']) {
+            $query['params'] = array();
+        }
         if (!is_array($query['params'])) {
             $query['params'] = array($query['params']);
         }
 
@@ -79,9 +79,25 @@ public function testCollectQueries($param, $types, $expected, $explainable)
         $c = $this->createCollector($queries);
         $c->collect(new Request(), new Response());
 
-        $collected_queries = $c->getQueries();
-        $this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
-        $this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
+        $collectedQueries = $c->getQueries();
+        $this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
+        $this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
+    }
+
+    public function testCollectQueryWithNoParams()
+    {
+        $queries = array(
+            array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
+            array('sql' => 'SELECT * FROM table1', 'params' => null, 'types' => null, 'executionMS' => 1),
+        );
+        $c = $this->createCollector($queries);
+        $c->collect(new Request(), new Response());
+
+        $collectedQueries = $c->getQueries();
+        $this->assertEquals(array(), $collectedQueries['default'][0]['params']);
+        $this->assertTrue($collectedQueries['default'][0]['explainable']);
+        $this->assertEquals(array(), $collectedQueries['default'][1]['params']);
+        $this->assertTrue($collectedQueries['default'][1]['explainable']);
     }
 
     /**
@@ -96,9 +112,9 @@ public function testSerialization($param, $types, $expected, $explainable)
         $c->collect(new Request(), new Response());
         $c = unserialize(serialize($c));
 
-        $collected_queries = $c->getQueries();
-        $this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
-        $this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
+        $collectedQueries = $c->getQueries();
+        $this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
+        $this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
     }
 
     public function paramProvider()
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,9 @@ private function sanitizeQueries($connectionName, $queries)`
`117`	`117`	`private function sanitizeQuery($connectionName, $query)`
`118`	`118`	`{`
`119`	`119`	`$query['explainable'] = true;`
	`120`	`+ if (null === $query['params']) {`
	`121`	`+ $query['params'] = array();`
	`122`	`+ }`
`120`	`123`	`if (!is_array($query['params'])) {`
`121`	`124`	`$query['params'] = array($query['params']);`
`122`	`125`	`}`