Tests > fix "Call to undefined method getMock()" bug > make compatible with PHPUnit 8.0 (and PHP 7.2+)

This commit is contained in:
Meritoo
2019-04-02 09:03:11 +02:00
parent b68dd78b06
commit ce37db5f33
2 changed files with 27 additions and 10 deletions

View File

@@ -56,7 +56,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
public function testSetCriteriaWithoutCriteria() public function testSetCriteriaWithoutCriteria()
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
$queryBuilder = new QueryBuilder($entityManager); $queryBuilder = new QueryBuilder($entityManager);
$newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder); $newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder);
@@ -72,7 +72,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
'ipsum' => 22, 'ipsum' => 22,
]; ];
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
$queryBuilder = new QueryBuilder($entityManager); $queryBuilder = new QueryBuilder($entityManager);
$newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder, $criteria); $newQueryBuilder = QueryBuilderUtility::setCriteria($queryBuilder, $criteria);
@@ -114,7 +114,13 @@ class QueryBuilderUtilityTest extends BaseTestCase
'flush', 'flush',
]; ];
$entityManager = $this->getMock(EntityManager::class, $methods, [], '', false); $entityManager = $this
->getMockBuilder(EntityManager::class)
->disableOriginalConstructor()
->setMethods($methods)
->getMock()
;
$entities1 = []; $entities1 = [];
$entities2 = [ $entities2 = [
@@ -132,7 +138,13 @@ class QueryBuilderUtilityTest extends BaseTestCase
'flush', 'flush',
]; ];
$entityManager = $this->getMock(EntityManager::class, $methods, [], '', false); $entityManager = $this
->getMockBuilder(EntityManager::class)
->disableOriginalConstructor()
->setMethods($methods)
->getMock()
;
$entities1 = []; $entities1 = [];
$entities2 = [ $entities2 = [
@@ -165,7 +177,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
*/ */
public function provideQueryBuilderAndRootAlias() public function provideQueryBuilderAndRootAlias()
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
yield[ yield[
new QueryBuilder($entityManager), new QueryBuilder($entityManager),
@@ -192,7 +204,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
*/ */
public function provideQueryBuilderAndPropertyAlias() public function provideQueryBuilderAndPropertyAlias()
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
yield[ yield[
new QueryBuilder($entityManager), new QueryBuilder($entityManager),
@@ -255,7 +267,12 @@ class QueryBuilderUtilityTest extends BaseTestCase
*/ */
public function provideQueryBuilderAndCriteria() public function provideQueryBuilderAndCriteria()
{ {
$entityManager = $this->getMock(EntityManager::class, ['getExpressionBuilder'], [], '', false); $entityManager = $this
->getMockBuilder(EntityManager::class)
->disableOriginalConstructor()
->setMethods(['getExpressionBuilder'])
->getMock()
;
$entityManager $entityManager
->expects(static::any()) ->expects(static::any())
@@ -295,7 +312,7 @@ class QueryBuilderUtilityTest extends BaseTestCase
*/ */
public function provideQueryBuilderAndParameters() public function provideQueryBuilderAndParameters()
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
yield[ yield[
new QueryBuilder($entityManager), new QueryBuilder($entityManager),

View File

@@ -212,7 +212,7 @@ class RepositoryTest extends BaseTestCase
public function testGetEntityOrderedQueryBuilderUsingDefaults() public function testGetEntityOrderedQueryBuilderUsingDefaults()
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
$entityRepository = $this $entityRepository = $this
->getMockBuilder(EntityRepository::class) ->getMockBuilder(EntityRepository::class)
@@ -256,7 +256,7 @@ class RepositoryTest extends BaseTestCase
*/ */
public function testGetEntityOrderedQueryBuilder($property, $direction, $expectedOrderBy) public function testGetEntityOrderedQueryBuilder($property, $direction, $expectedOrderBy)
{ {
$entityManager = $this->getMock(EntityManagerInterface::class); $entityManager = $this->createMock(EntityManagerInterface::class);
$entityRepository = $this $entityRepository = $this
->getMockBuilder(EntityRepository::class) ->getMockBuilder(EntityRepository::class)