Skip to content

Commit

Permalink
[FEATURE]Update doctrine/orm to 2.6 (#311)
Browse files Browse the repository at this point in the history
* Update doctrine/orm to 2.6

* Fix failing test
  • Loading branch information
sztyup authored and patrickbrouwers committed Feb 27, 2018
1 parent 113bf8e commit f5a7a62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=7.0",
"doctrine/orm": "2.5.*",
"doctrine/orm": "2.5.*|2.6.*",
"illuminate/auth": "5.5.*|5.6.*",
"illuminate/console": "5.5.*|5.6.*",
"illuminate/container": "5.5.*|5.6.*",
Expand Down
1 change: 1 addition & 0 deletions tests/Pagination/PaginatorAdapterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ private function mockEntityManager()

$connection->shouldReceive('getDatabasePlatform')->andReturn($platform);
$connection->shouldReceive('executeQuery')->andReturn([]);
$connection->shouldReceive('getParams')->andReturn([]);

$platform->shouldReceive('appendLockHint')->andReturnUsing(function ($a) {
return $a;
Expand Down

0 comments on commit f5a7a62

Please sign in to comment.