Skip to content

Commit f5a7a62

Browse files
sztyuppatrickbrouwers
authored andcommitted
[FEATURE]Update doctrine/orm to 2.6 (#311)
* Update doctrine/orm to 2.6 * Fix failing test
1 parent 113bf8e commit f5a7a62

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.0",
20-
"doctrine/orm": "2.5.*",
20+
"doctrine/orm": "2.5.*|2.6.*",
2121
"illuminate/auth": "5.5.*|5.6.*",
2222
"illuminate/console": "5.5.*|5.6.*",
2323
"illuminate/container": "5.5.*|5.6.*",

tests/Pagination/PaginatorAdapterTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ private function mockEntityManager()
8888

8989
$connection->shouldReceive('getDatabasePlatform')->andReturn($platform);
9090
$connection->shouldReceive('executeQuery')->andReturn([]);
91+
$connection->shouldReceive('getParams')->andReturn([]);
9192

9293
$platform->shouldReceive('appendLockHint')->andReturnUsing(function ($a) {
9394
return $a;

0 commit comments

Comments
 (0)