8000 Make mock layer compatible with DBAL 3 by derrabus · Pull Request #8949 · doctrine/orm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make mock layer compatible with DBAL 3 #8949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2021
Merged

Make mock layer compatible with DBAL 3 #8949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
<!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/1961 -->
<exclude-pattern>tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/Mocks/DriverMock.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/Mocks/SequenceMock.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/ORM/UnitOfWorkTest.php</exclude-pattern>
<exclude-pattern>tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php</exclude-pattern>
</rule>
Expand Down
7 changes: 4 additions & 3 deletions tests/Doctrine/Performance/Hydration/MixedQueryFetchJoinArrayHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ArrayHydrator;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
Expand All @@ -23,7 +24,7 @@ final class MixedQueryFetchJoinArrayHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -66,7 +67,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ArrayHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions ...Doctrine/Performance/Hydration/MixedQueryFetchJoinFullObjectHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
Expand All @@ -24,7 +25,7 @@ final class MixedQueryFetchJoinFullObjectHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -53,7 +54,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ObjectHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions ...trine/Performance/Hydration/MixedQueryFetchJoinPartialObjectHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
Expand All @@ -24,7 +25,7 @@ final class MixedQueryFetchJoinPartialObjectHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -67,7 +68,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ObjectHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions tests/Doctrine/Performance/Hydration/SimpleQueryArrayHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ArrayHydrator;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;

Expand All @@ -22,7 +23,7 @@ final class SimpleQueryArrayHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -57,7 +58,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ArrayHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions tests/Doctrine/Performance/Hydration/SimpleQueryFullObjectHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
Expand All @@ -23,7 +24,7 @@ final class SimpleQueryFullObjectHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand All @@ -48,7 +49,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ObjectHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions tests/Doctrine/Performance/Hydration/SimpleQueryPartialObjectHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;

Expand All @@ -23,7 +24,7 @@ final class SimpleQueryPartialObjectHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -58,7 +59,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ObjectHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
7 changes: 4 additions & 3 deletions tests/Doctrine/Performance/Hydration/SimpleQueryScalarHydrationPerformanceBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace Doctrine\Performance\Hydration;

use Doctrine\DBAL\Result;
use Doctrine\ORM\Internal\Hydration\ScalarHydrator;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Performance\EntityManagerFactory;
use Doctrine\Tests\Mocks\HydratorMockResult;
use Doctrine\Tests\Mocks\ArrayResultFactory;
use Doctrine\Tests\Models\CMS\CmsUser;
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;

Expand All @@ -22,7 +23,7 @@ final class SimpleQueryScalarHydrationPerformanceBench
/** @var ResultSetMapping */
private $rsm;

/** @var HydratorMockResult */
/** @var Result */
private $result;

public function init(): void
Expand Down Expand Up @@ -57,7 +58,7 @@ public function init(): void
];
}

$this->result = new HydratorMockResult($resultSet);
$this->result = ArrayResultFactory::createFromArray($resultSet);
$this->hydrator = new ScalarHydrator(EntityManagerFactory::getEntityManager([]));
$this->rsm = new ResultSetMapping();

Expand Down
23 changes: 23 additions & 0 deletions tests/Doctrine/Tests/Mocks/ArrayResultFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace Doctrine\Tests\Mocks;

use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Result;

use function interface_exists;

final class ArrayResultFactory
{
public static function createFromArray(array $resultSet): Result
{
if (interface_exists(Result::class)) {
// DBAL 2 compatibility.
return new ResultMock($resultSet);
}

return new Result(new DriverResultMock($resultSet), new Connection([], new DriverMock()));
}
}
23 changes: 0 additions & 23 deletions tests/Doctrine/Tests/Mocks/ClassMetadataMock.php
View file
Open in desktop

This file was deleted.

26 changes: 15 additions & 11 deletions tests/Doctrine/Tests/Mocks/ConnectionMock.php
View file
Open in desktop
F438
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
use Doctrine\DBAL\Configuration;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Driver\Statement;
use Doctrine\DBAL\ForwardCompatibility\Result as ForwardCompatibilityResult;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Result;
use Exception;

use function is_string;
Expand All @@ -29,7 +28,7 @@ class ConnectionMock extends Connection
/** @var Exception|null */
private $_fetchOneException;

/** @var ForwardCompatibilityResult|null */
/** @var Result|null */
private $_queryResult;

/** @var DatabasePlatformMock */
Expand All @@ -47,16 +46,21 @@ class ConnectionMock extends Connection
/** @var array */
private $_deletes = [];

public function __construct(array $params, Driver $driver, ?Configuration $config = null, ?EventManager $eventManager = null)
public function __construct(array $params = [], ?Driver $driver = null, ?Configuration $config = null, ?EventManager $eventManager = null)
{
$this->_platformMock = new DatabasePlatformMock();

parent::__construct($params, $driver, $config, $eventManager);
parent::__construct($params, $driver ?? new DriverMock(), $config, $eventManager);

// Override possible assignment of platform to database platform mock
$this->_platform = $this->_platformMock;
}

public function getDatabase(): string
{
return 'mock';
}

/**
* {@inheritdoc}
*/
Expand All @@ -76,7 +80,7 @@ public function insert($tableName, array $data, array $types = [])
/**
* {@inheritdoc}
*/
public function executeUpdate($query, array $params = [], array $types = [])
public function executeUpdate($query, array $params = [], array $types = []): int
{
throw new BadMethodCallException(sprintf('Call to deprecated method %s().', __METHOD__));
}
Expand Down Expand Up @@ -119,12 +123,12 @@ public function fetchColumn($statement, array $params = [], $colunm = 0, array $
return $this->_fetchOneResult;
}

public function query(): Statement
public function query(?string $sql = null): Result
{
return $this->_queryResult;
throw new BadMethodCallException('Call to deprecated method.');
}

public function executeQuery($sql, array $params = [], $types = [], ?QueryCacheProfile $qcp = null): ForwardCompatibilityResult
public function executeQuery($sql, array $params = [], $types = [], ?QueryCacheProfile $qcp = null): Result
{
return $this->_queryResult ?? parent::executeQuery($sql, $params, $types, $qcp);
}
Expand Down Expand Up @@ -166,9 +170,9 @@ public function setLastInsertId(int $id): void
$this->_lastInsertId = $id;
}

public function setQueryResult(Statement $result): void
public function setQueryResult(Result $result): void
{
$this->_queryResult = ForwardCompatibilityResult::ensure($result);
$this->_queryResult = $result;
}

/**
Expand Down
5 changes: 5 additions & 0 deletions tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,9 @@ public function getBlobTypeDeclarationSQL(array $field)
{
throw DBALException::notSupported(__METHOD__);
}

public function getCurrentDatabaseExpression(): string
{
throw DBALException::notSupported(__METHOD__);
}
}
Loading
0