Skip to content

Commit cc04b8a

Browse files
committed
Merge branch 'master' into graphqlite-5-upgrade
2 parents 639cc51 + a018fe4 commit cc04b8a

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
# Cancel previous runs of the same branch
1919
- name: cancel
20-
uses: styfle/[email protected].0
20+
uses: styfle/[email protected].1
2121
with:
2222
access_token: ${{ github.token }}
2323

DependencyInjection/GraphQLiteCompilerPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace TheCodingMachine\GraphQLite\Bundle\DependencyInjection;
55

6+
use Doctrine\Common\Annotations\PsrCachedReader;
67
use GraphQL\Server\ServerConfig;
78
use GraphQL\Validator\Rules\DisableIntrospection;
89
use GraphQL\Validator\Rules\QueryComplexity;
@@ -16,8 +17,6 @@
1617
use function class_exists;
1718
use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader;
1819
use Doctrine\Common\Annotations\AnnotationRegistry;
19-
use Doctrine\Common\Annotations\CachedReader;
20-
use Doctrine\Common\Cache\ApcuCache;
2120
use Mouf\Composer\ClassNameMapper;
2221
use Psr\SimpleCache\CacheInterface;
2322
use ReflectionParameter;
@@ -414,10 +413,11 @@ private function getAnnotationReader(): AnnotationReader
414413
{
415414
if ($this->annotationReader === null) {
416415
AnnotationRegistry::registerLoader('class_exists');
416+
417417
$doctrineAnnotationReader = new DoctrineAnnotationReader();
418418

419419
if (function_exists('apcu_fetch')) {
420-
$doctrineAnnotationReader = new CachedReader($doctrineAnnotationReader, new ApcuCache(), true);
420+
$doctrineAnnotationReader = new PsrCachedReader($doctrineAnnotationReader, new ApcuAdapter('graphqlite'), true);
421421
}
422422

423423
$this->annotationReader = new AnnotationReader($doctrineAnnotationReader, AnnotationReader::LAX_MODE);

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"symfony/framework-bundle": "^4.2 || ^5",
2424
"symfony/validator": "^4.2 || ^5",
2525
"symfony/translation": "^4.2 || ^5",
26-
"doctrine/annotations": "^1.10.4",
27-
"doctrine/cache": "^1.8",
26+
"doctrine/annotations": "^1.13",
2827
"symfony/psr-http-message-bridge": "^2.0",
2928
"nyholm/psr7": "^1.1",
3029
"laminas/laminas-diactoros": "^2.2.2",

0 commit comments

Comments
 (0)