From 33e2d67a6cabbd750bd4c79d31fe4c314b68c765 Mon Sep 17 00:00:00 2001
From: Sztyup <sztyup@gmail.com>
Date: Sat, 17 Feb 2018 17:36:29 +0100
Subject: [PATCH 1/2] Update doctrine/orm to 2.6

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b130a2d5..ae14c4b5 100644
--- a/composer.json
+++ b/composer.json
@@ -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.*",

From a9689fec8cd39011f5ceadf17297bdac625372ac Mon Sep 17 00:00:00 2001
From: Sztyup <sztyup@gmail.com>
Date: Sat, 17 Feb 2018 17:36:35 +0100
Subject: [PATCH 2/2] Fix failing test

---
 tests/Pagination/PaginatorAdapterTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Pagination/PaginatorAdapterTest.php b/tests/Pagination/PaginatorAdapterTest.php
index 23f5a18a..87fd351a 100644
--- a/tests/Pagination/PaginatorAdapterTest.php
+++ b/tests/Pagination/PaginatorAdapterTest.php
@@ -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;