Skip to content
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.

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

Merge 3.1.x into 3.2.x #4664

Merged
merged 14 commits into from
Jun 5, 2021
Merged
Changes from 2 commits
Commits
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
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
"require": {
"php": "^7.1 || ^8",
"ext-pdo": "*",
"doctrine/cache": "^1.0",
"doctrine/cache": "^1.0|^2.0",
"doctrine/deprecations": "^0.5.3",
"doctrine/event-manager": "^1.0"
},
@@ -44,6 +44,7 @@
"phpstan/phpstan": "0.12.81",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
"squizlabs/php_codesniffer": "3.6.0",
"symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.6.4"
},
21 changes: 19 additions & 2 deletions tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
namespace Doctrine\Tests\DBAL\Functional;

use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Common\Cache\Cache;
use Doctrine\Common\Cache\Psr6\DoctrineProvider;
use Doctrine\DBAL\Cache\QueryCacheProfile;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\ConnectionException;
@@ -19,8 +21,10 @@
use Exception;
use PDO;
use RuntimeException;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Throwable;

use function class_exists;
use function file_exists;
use function in_array;
use function unlink;
@@ -389,7 +393,7 @@ public function testResultCompatibilityWhenExecutingQueryWithQueryCacheParam():
$this->connection->getDatabasePlatform()->getDummySelectSQL(),
[],
[],
new QueryCacheProfile(1, 'cacheKey', new ArrayCache())
new QueryCacheProfile(1, 'cacheKey', $this->getArrayCache())
);

self::assertInstanceOf(Result::class, $result);
@@ -402,10 +406,23 @@ public function testResultCompatibilityWhenExecutingCacheQuery(): void
$this->connection->getDatabasePlatform()->getDummySelectSQL(),
[],
[],
new QueryCacheProfile(1, 'cacheKey', new ArrayCache())
new QueryCacheProfile(1, 'cacheKey', $this->getArrayCache())
);

self::assertInstanceOf(Result::class, $result);
self::assertInstanceOf(Driver\ResultStatement::class, $result);
}

private function getArrayCache(): Cache
{
if (class_exists(DoctrineProvider::class)) {
return DoctrineProvider::wrap(new ArrayAdapter());
}

if (class_exists(ArrayCache::class)) {
return new ArrayCache();
}

self::fail('Cannot instantiate cache backend.');
}
}
25 changes: 21 additions & 4 deletions tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php
Original file line number Diff line number Diff line change
@@ -3,17 +3,21 @@
namespace Doctrine\Tests\DBAL\Functional;

use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Common\Cache\Cache;
use Doctrine\Common\Cache\Psr6\DoctrineProvider;
use Doctrine\DBAL\Cache\QueryCacheProfile;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\FetchMode;
use Doctrine\DBAL\Logging\DebugStack;
use Doctrine\DBAL\Schema\Table;
use Doctrine\Tests\DbalFunctionalTestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;

use function array_change_key_case;
use function array_merge;
use function array_shift;
use function array_values;
use function class_exists;
use function is_array;

use const CASE_LOWER;
@@ -49,7 +53,7 @@ protected function setUp(): void
$config = $this->connection->getConfiguration();
$config->setSQLLogger($this->sqlLogger = new DebugStack());

$cache = new ArrayCache();
$cache = $this->getArrayCache();
$config->setResultCacheImpl($cache);
}

@@ -217,7 +221,7 @@ public function testDontFinishNoCache(): void
*/
public function testFetchingAllRowsSavesCache(callable $fetchAll): void
{
$layerCache = new ArrayCache();
$layerCache = $this->getArrayCache();

$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
@@ -266,7 +270,7 @@ public function testFetchAllColumn(): void
$query = $this->connection->getDatabasePlatform()
->getDummySelectSQL('1');

$qcp = new QueryCacheProfile(0, null, new ArrayCache());
$qcp = new QueryCacheProfile(0, null, $this->getArrayCache());

$stmt = $this->connection->executeCacheQuery($query, [], [], $qcp);
$stmt->fetchAll(FetchMode::COLUMN);
@@ -339,7 +343,7 @@ public function testChangeCacheImpl(): void

$this->hydrateStmt($stmt);

$secondCache = new ArrayCache();
$secondCache = $this->getArrayCache();

$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
@@ -381,4 +385,17 @@ private function hydrateStmtIterator(Driver\ResultStatement $stmt, int $fetchMod

return $data;
}

private function getArrayCache(): Cache
{
if (class_exists(DoctrineProvider::class)) {
return DoctrineProvider::wrap(new ArrayAdapter());
}

if (class_exists(ArrayCache::class)) {
return new ArrayCache();
}

self::fail('Cannot instantiate cache backend.');
}
}