espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix test deprecations

Browse Source
This commit is contained in:
Yuri Kuznetsov
2025-07-09 10:43:05 +03:00
parent cd7307c9f6
commit ee0bfb5970
6 changed files with 108 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/Espo/ORM/CollectionTest.php
+3 -3
View File
@@ -34,13 +34,10 @@ use Espo\ORM\Defs;
use Espo\ORM\Defs\DefsData;
use Espo\ORM\Entity;
use Espo\ORM\EntityCollection;
use Espo\ORM\Executor\QueryExecutor;
use Espo\ORM\Metadata;
use Espo\ORM\MetadataDataProvider;
use Espo\Core\ORM\EntityManager;
use Espo\ORM\SthCollection;
use PDOStatement;
use PHPUnit\Framework\TestCase;
use SplObjectStorage;
@@ -48,6 +45,9 @@ require_once 'tests/unit/testData/DB/Entities.php';
class CollectionTest extends TestCase
{
private $metadata;
private $entityManager;
protected function setUp(): void
{
$ormMetadata = include('tests/unit/testData/DB/ormMetadata.php');
tests/unit/Espo/ORM/EntityTest.php
+3 -6
View File
@@ -34,17 +34,18 @@ use Espo\ORM\Defs;
use Espo\ORM\Defs\DefsData;
use Espo\ORM\Metadata;
use Espo\ORM\MetadataDataProvider;
use PHPUnit\Framework\TestCase;
use RuntimeException;
use tests\unit\testData\DB\Job;
use Espo\Core\ORM\EntityManager;
require_once 'tests/unit/testData/DB/Entities.php';
class EntityTest extends TestCase
{
private $entityManager;
private $metadata;
protected function setUp() : void
{
$ormMetadata = include('tests/unit/testData/DB/ormMetadata.php');
@@ -70,10 +71,6 @@ class EntityTest extends TestCase
->willReturn($defs);
}
protected function tearDown() : void
{
}
/**
* @return BaseEntity
*/
tests/unit/Espo/ORM/MysqlQueryComposerTest.php
+7 -26
View File
@@ -67,6 +67,10 @@ class MysqlQueryComposerTest extends TestCase
protected $pdo = null;
protected ?EntityFactory $entityFactory = null;
private $queryBuilder;
private $metadata;
private $entityManager;
protected function setUp(): void
{
$this->queryBuilder = new QueryBuilder();
@@ -75,7 +79,7 @@ class MysqlQueryComposerTest extends TestCase
$this->pdo
->expects($this->any())
->method('quote')
->will($this->returnCallback(function() {
->willReturnCallback(function() {
$args = func_get_args();
$s = $args[0];
@@ -83,7 +87,7 @@ class MysqlQueryComposerTest extends TestCase
$s = str_replace("'", "\'", $s);
return "'" . $s . "'";
}));
});
$this->entityManager = $this->getMockBuilder(EntityManager::class)->disableOriginalConstructor()->getMock();
@@ -103,8 +107,7 @@ class MysqlQueryComposerTest extends TestCase
$this->entityFactory
->expects($this->any())
->method('create')
->will(
$this->returnCallback(
->willReturnCallback(
function () {
$args = func_get_args();
@@ -114,31 +117,9 @@ class MysqlQueryComposerTest extends TestCase
return new $className($args[0], $defs, $this->entityManager);
}
)
);
$this->query = new QueryComposer($this->pdo, $this->entityFactory, $this->metadata);
$entityFactory = $this->entityFactory;
$this->post = $entityFactory->create('Post');
$this->comment = $entityFactory->create('Comment');
$this->tag = $entityFactory->create('Tag');
$this->note = $entityFactory->create('Note');
$this->contact = $entityFactory->create('Contact');
$this->account = $entityFactory->create('Account');
}
protected function tearDown() : void
{
unset($this->query);
unset($this->pdo);
unset($this->post);
unset($this->tag);
unset($this->note);
unset($this->contact);
unset($this->account);
}
public function testDelete1()
tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
+7 -12
View File
@@ -53,6 +53,8 @@ class PostgresqlQueryComposerTest extends TestCase
private ?QueryComposer $queryComposer;
private ?EntityManager $entityManager;
private $queryBuilder;
protected function setUp(): void
{
$ormMetadata = include('tests/unit/testData/DB/ormMetadata.php');
@@ -72,11 +74,11 @@ class PostgresqlQueryComposerTest extends TestCase
$pdo
->expects($this->any())
->method('quote')
->will($this->returnCallback(function() {
->willReturnCallback(function() {
$args = func_get_args();
return "'" . $args[0] . "'";
}));
});
$this->entityManager = $this->createMock(EntityManager::class);
$entityFactory = $this->createMock(EntityFactory::class);
@@ -84,24 +86,17 @@ class PostgresqlQueryComposerTest extends TestCase
$entityFactory
->expects($this->any())
->method('create')
->will(
$this->returnCallback(function () use ($metadata) {
->willReturnCallback(
function () use ($metadata) {
$args = func_get_args();
$className = "tests\\unit\\testData\\DB\\" . $args[0];
$defs = $metadata->get($args[0]) ?? [];
return new $className($args[0], $defs, $this->entityManager);
})
}
);
$this->queryComposer = new QueryComposer($pdo, $entityFactory, $metadata);
$this->post = $entityFactory->create('Post');
$this->comment = $entityFactory->create('Comment');
$this->tag = $entityFactory->create('Tag');
$this->note = $entityFactory->create('Note');
$this->contact = $entityFactory->create('Contact');
$this->account = $entityFactory->create('Account');
}
public function testUpdate1(): void
tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
+78 -83
View File
@@ -51,16 +51,20 @@ use Espo\ORM\SthCollection;
use PHPUnit\Framework\TestCase;
use RuntimeException;
use tests\unit\testData\Entities\Test;
use tests\unit\testData\DB as Entities;
class RDBRepositoryTest extends TestCase
{
/**
* @var Repository
*/
/** @var Repository */
private $repository;
private $entityManager;
private $queryBuilder;
private $metadata;
private $collection;
private $mapper;
private $entityFactory;
protected function setUp(): void
{
$entityManager = $this->entityManager =
@@ -70,31 +74,31 @@ class RDBRepositoryTest extends TestCase
$this->getMockBuilder(EntityFactory::class)->disableOriginalConstructor()->getMock();
$this->collectionFactory = new CollectionFactory($this->entityManager);
$collectionFactory = new CollectionFactory($this->entityManager);
$this->mapper = $this->getMockBuilder(BaseMapper::class)->disableOriginalConstructor()->getMock();
$entityManager
->method('getMapper')
->will($this->returnValue($this->mapper));
->willReturn($this->mapper);
$this->queryBuilder = new QueryBuilder();
$entityManager
->method('getQueryBuilder')
->will($this->returnValue($this->queryBuilder));
->willReturn($this->queryBuilder);
$entityManager
->method('getQueryBuilder')
->will($this->returnValue($this->queryBuilder));
->willReturn($this->queryBuilder);
$entityManager
->method('getCollectionFactory')
->will($this->returnValue($this->collectionFactory));
->willReturn($collectionFactory);
$entityManager
->method('getEntityFactory')
->will($this->returnValue($this->entityFactory));
->willReturn($this->entityFactory);
$ormMetadata = include('tests/unit/testData/DB/ormMetadata.php');
@@ -107,24 +111,16 @@ class RDBRepositoryTest extends TestCase
$this->metadata = new Metadata($metadataDataProvider);
$this->seed = $this->createEntity('Test', Test::class);
$this->account = $this->createEntity('Account', Entities\Account::class);
$this->team = $this->createEntity('Team', Entities\Team::class);
$this->collection = $this->createCollectionMock();
$entityFactory
->method('create')
->will(
$this->returnCallback(
function (string $entityType) {
$className = 'tests\\unit\\testData\\DB\\' . ucfirst($entityType);
->willReturnCallback(
function (string $entityType) {
$className = 'tests\\unit\\testData\\DB\\' . ucfirst($entityType);
return $this->createEntity($entityType, $className);
}
)
return $this->createEntity($entityType, $className);
}
);
$this->repository = $this->createRepository('Test');
@@ -145,8 +141,8 @@ class RDBRepositoryTest extends TestCase
$collection
->expects($this->any())
->method('getIterator')
->will(
$this->returnValue($generator)
->willReturn(
$generator
);
return $collection;
@@ -158,7 +154,7 @@ class RDBRepositoryTest extends TestCase
$this->entityManager
->method('getRepository')
->will($this->returnValue($repository));
->willReturn($repository);
return $repository;
}
@@ -185,7 +181,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -209,7 +205,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -231,7 +227,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($select);
$this->repository->where(['name' => 'test'])->findOne();
@@ -250,7 +246,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($select);
$this->repository
@@ -274,7 +270,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -296,7 +292,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('count')
->will($this->returnValue(1))
->willReturn(1)
->with($select);
$this->repository
@@ -315,7 +311,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('count')
->will($this->returnValue(1))
->willReturn(1)
->with($select);
$this->repository->where(['name' => 'test'])->count();
@@ -331,7 +327,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('count')
->will($this->returnValue(1))
->willReturn(1)
->with($select);
$this->repository->count();
@@ -347,7 +343,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('max')
->will($this->returnValue(1))
->willReturn(1)
->with($select, 'test');
$this->repository->max('test');
@@ -365,7 +361,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->where(['name' => 'test'])->find();
@@ -383,7 +379,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->where('name', 'test')->find();
@@ -401,7 +397,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -423,7 +419,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -443,7 +439,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -464,7 +460,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->join(['Test1', 'Test2'])->find();
@@ -484,7 +480,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -504,7 +500,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -523,7 +519,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -543,7 +539,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -562,7 +558,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -583,7 +579,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -602,7 +598,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->distinct()->find();
@@ -618,7 +614,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->forUpdate()->find();
@@ -634,7 +630,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->sth()->find();
@@ -650,7 +646,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -668,7 +664,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -686,7 +682,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -709,7 +705,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -733,7 +729,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -752,7 +748,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->group('id')->find();
@@ -768,7 +764,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -787,7 +783,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -806,7 +802,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -825,7 +821,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository
@@ -843,7 +839,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($paramsExpected);
$this->repository->select(['name', 'date'])->find();
@@ -861,7 +857,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($select);
$this->repository
@@ -880,7 +876,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($select);
$this->repository
@@ -902,7 +898,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($this->collection))
->willReturn($this->collection)
->with($select);
$this->repository
@@ -932,7 +928,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('select')
->will($this->returnValue($collection))
->willReturn($collection)
->with($selectExpected);
$this->repository
@@ -954,7 +950,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectOne')
->will($this->returnValue($entity))
->willReturn($entity)
->with($select);
$this->repository->getById('1');
@@ -1019,7 +1015,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('countRelated')
->will($this->returnValue(1))
->willReturn(1)
->with($post, 'comments', $select);
$this->createRepository('Post')->getRelation($post, 'comments')->count();
@@ -1042,7 +1038,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'comments', $select);
$repository->getRelation($post, 'comments')->find();
@@ -1064,7 +1060,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($post))
->willReturn($post)
->with($comment, 'post', $select);
$result = $this->createRepository('Comment')
@@ -1087,7 +1083,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($post))
->willReturn($post)
->with($note, 'parent');
$result = $this->createRepository('Note')->getRelation($note, 'parent')->find();
@@ -1108,7 +1104,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($post))
->willReturn($post)
->with($note, 'parent');
$result = $this->createRepository('Note')->getRelation($note, 'parent')->findOne();
@@ -1160,7 +1156,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'notes', $select);
$result = $this->createRepository('Post')->getRelation($post, 'notes')->isRelated($note);
@@ -1189,7 +1185,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'notes', $select);
$result = $this->createRepository('Post')->getRelation($post, 'notes')->isRelated($note);
@@ -1331,7 +1327,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'comments', $select);
$repository->getRelation($post, 'comments')
@@ -1365,7 +1361,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'comments', $select);
$repository->getRelation($post, 'comments')
@@ -1409,7 +1405,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($post, 'comments', $select);
$result = $repository->getRelation($post, 'comments')
@@ -1439,7 +1435,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
@@ -1469,10 +1465,9 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
$this->createRepository('Account')->getRelation($account, 'teams')
->columnsWhere([
'OR' => [
@@ -1499,7 +1494,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
$this->createRepository('Account')
@@ -1530,7 +1525,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
$this->createRepository('Account')
@@ -1561,7 +1556,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
$this->createRepository('Account')
@@ -1586,7 +1581,7 @@ class RDBRepositoryTest extends TestCase
$this->mapper
->expects($this->once())
->method('selectRelated')
->will($this->returnValue($collection))
->willReturn($collection)
->with($account, 'teams', $select);
$this->createRepository('Account')
tests/unit/Espo/ORM/Repository/RDBTransactionManagerTest.php
+10 -9
View File
@@ -31,23 +31,24 @@ namespace tests\unit\Espo\ORM\Repository;
require_once 'tests/unit/testData/DB/Entities.php';
use Espo\ORM\{
Repository\RDBTransactionManager,
TransactionManager,
};
use Espo\ORM\Repository\RDBTransactionManager;
use Espo\ORM\TransactionManager;
use PHPUnit\Framework\TestCase;
use RuntimeException;
class RDBTransactionManagerTest extends \PHPUnit\Framework\TestCase
class RDBTransactionManagerTest extends TestCase
{
protected function setUp() : void
private $wrappee;
private $manager;
protected function setUp(): void
{
$this->wrappee = $this->getMockBuilder(TransactionManager::class)->disableOriginalConstructor()->getMock();
$this->wrappee = $this->createMock(TransactionManager::class);
$this->manager = new RDBTransactionManager($this->wrappee);
}
public function testStartOnce()
{
@@ -67,7 +68,7 @@ class RDBTransactionManagerTest extends \PHPUnit\Framework\TestCase
$this->wrappee
->expects($this->once())
->method('getLevel')
->will($this->returnValue(1));
->willReturn(1);
$this->expectException(RuntimeException::class);