Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merge release 1.12.0 into 2.1.x #384

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
alcaeus merged 3 commits into from
Jul 14, 2021
Merged

Merge release 1.12.0 into 2.1.x #384

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
967555a
Fix wrong return type for DoctrineProvider::wrap
alcaeus May 25, 2021
3bb5588
Merge pull request #376 from alcaeus/fix-wrong-return-type
greg0ire May 25, 2021
92032be
Allow psr/cache v3 (#383)
derrabus Jul 14, 2021
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 lib/Doctrine/Common/Cache/Psr6/DoctrineProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Doctrine\Common\Cache\Psr6;

use Doctrine\Common\Cache\Cache;
use Doctrine\Common\Cache\CacheProvider;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\Adapter\DoctrineAdapter as SymfonyDoctrineAdapter;
Expand All @@ -27,7 +28,7 @@ final class DoctrineProvider extends CacheProvider
/** @var CacheItemPoolInterface */
private $pool;

public static function wrap(CacheItemPoolInterface $pool): CacheProvider
public static function wrap(CacheItemPoolInterface $pool): Cache
{
if ($pool instanceof CacheAdapter) {
return $pool->getCache();
Expand Down