From ce37db5f3339ce1398e346e5f3c5d9a6951f35b0 Mon Sep 17 00:00:00 2001
From: Meritoo <github@meritoo.pl>
Date: Tue, 2 Apr 2019 09:03:11 +0200
Subject: [PATCH] Tests > fix "Call to undefined method getMock()" bug > make
 compatible with PHPUnit 8.0 (and PHP 7.2+)

---
 tests/Utilities/QueryBuilderUtilityTest.php | 33 ++++++++++++++++-----
 tests/Utilities/RepositoryTest.php          |  4 +--
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/tests/Utilities/QueryBuilderUtilityTest.php b/tests/Utilities/QueryBuilderUtilityTest.php
index 0451ef8..2b6894c 100644
--- a/tests/Utilities/QueryBuilderUtilityTest.php
+++ b/tests/Utilities/QueryBuilderUtilityTest.php
@@ -56,7 +56,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
 
     public function testSetCriteriaWithoutCriteria()
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
         $queryBuilder = new QueryBuilder($entityManager);
         $newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder);
 
@@ -72,7 +72,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
             'ipsum' => 22,
         ];
 
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
         $queryBuilder = new QueryBuilder($entityManager);
         $newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder, $criteria);
 
@@ -114,7 +114,13 @@ class QueryBuilderUtilityTest extends BaseTestCase
             'flush',
         ];
 
-        $entityManager = $this->getMock(EntityManager::class, $methods, [], '', false);
+        $entityManager = $this
+            ->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods($methods)
+            ->getMock()
+        ;
+
         $entities1 = [];
 
         $entities2 = [
@@ -132,7 +138,13 @@ class QueryBuilderUtilityTest extends BaseTestCase
             'flush',
         ];
 
-        $entityManager = $this->getMock(EntityManager::class, $methods, [], '', false);
+        $entityManager = $this
+            ->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods($methods)
+            ->getMock()
+        ;
+
         $entities1 = [];
 
         $entities2 = [
@@ -165,7 +177,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
      */
     public function provideQueryBuilderAndRootAlias()
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
 
         yield[
             new QueryBuilder($entityManager),
@@ -192,7 +204,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
      */
     public function provideQueryBuilderAndPropertyAlias()
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
 
         yield[
             new QueryBuilder($entityManager),
@@ -255,7 +267,12 @@ class QueryBuilderUtilityTest extends BaseTestCase
      */
     public function provideQueryBuilderAndCriteria()
     {
-        $entityManager = $this->getMock(EntityManager::class, ['getExpressionBuilder'], [], '', false);
+        $entityManager = $this
+            ->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getExpressionBuilder'])
+            ->getMock()
+        ;
 
         $entityManager
             ->expects(static::any())
@@ -295,7 +312,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
      */
     public function provideQueryBuilderAndParameters()
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
 
         yield[
             new QueryBuilder($entityManager),
diff --git a/tests/Utilities/RepositoryTest.php b/tests/Utilities/RepositoryTest.php
index 72d58a7..412701f 100644
--- a/tests/Utilities/RepositoryTest.php
+++ b/tests/Utilities/RepositoryTest.php
@@ -212,7 +212,7 @@ class RepositoryTest extends BaseTestCase
 
     public function testGetEntityOrderedQueryBuilderUsingDefaults()
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
 
         $entityRepository = $this
             ->getMockBuilder(EntityRepository::class)
@@ -256,7 +256,7 @@ class RepositoryTest extends BaseTestCase
      */
     public function testGetEntityOrderedQueryBuilder($property, $direction, $expectedOrderBy)
     {
-        $entityManager = $this->getMock(EntityManagerInterface::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
 
         $entityRepository = $this
             ->getMockBuilder(EntityRepository::class)