diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php index f23e1abca..c4fef054d 100644 --- a/Controller/ProfilerController.php +++ b/Controller/ProfilerController.php @@ -86,6 +86,7 @@ private function explainSQLServerPlatform(Connection $connection, $query) $stmt = $connection->executeQuery($sql, $params, $query['types']); $stmt->nextRowset(); + return $stmt->fetchAll(PDO::FETCH_ASSOC); } diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php index 080c77e98..ddc1471d1 100644 --- a/DataCollector/DoctrineDataCollector.php +++ b/DataCollector/DoctrineDataCollector.php @@ -221,6 +221,7 @@ public function getGroupedQueries() if ($a['executionMS'] === $b['executionMS']) { return 0; } + return $a['executionMS'] < $b['executionMS'] ? 1 : -1; }); $this->groupedQueries[$connection] = $connectionGroupedQueries; diff --git a/Tests/Repository/ContainerRepositoryFactoryTest.php b/Tests/Repository/ContainerRepositoryFactoryTest.php index 63a44368a..1042d8b3d 100644 --- a/Tests/Repository/ContainerRepositoryFactoryTest.php +++ b/Tests/Repository/ContainerRepositoryFactoryTest.php @@ -81,7 +81,6 @@ public function testServiceRepositoriesCanNotExtendsEntityRepository() $this->assertSame($repo, $actualRepo); } - /** * @expectedException \RuntimeException * @expectedExceptionMessage The "Doctrine\Bundle\DoctrineBundle\Tests\Repository\StubServiceRepository" entity repository implements "Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface", but its service could not be found. Make sure the service exists and is tagged with "doctrine.repository_service". diff --git a/Twig/DoctrineExtension.php b/Twig/DoctrineExtension.php index 7361bc085..ef100d67a 100644 --- a/Twig/DoctrineExtension.php +++ b/Twig/DoctrineExtension.php @@ -290,6 +290,7 @@ public function replaceQueryParameters($query, $parameters) '/\?|((?