Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1ac0434

Browse filesBrowse files
fabpotfabpot
committed
feature #43010 Remove remaining support for Doctrine Cache (derrabus)
This PR was merged into the 6.0 branch. Discussion ---------- Remove remaining support for Doctrine Cache | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A This PR removes some leftovers of the already removed Doctrine Cache integration. Commits ------- 945fbe7 Remove remaining support for Doctrine Cache
2 parents 96c2e10 + 945fbe7 commit 1ac0434
Copy full SHA for 1ac0434

File tree

Expand file treeCollapse file tree

8 files changed

+9
-44
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+9
-44
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
"cache/integration-tests": "dev-master",
124124
"composer/package-versions-deprecated": "^1.8",
125125
"doctrine/annotations": "^1.13.1",
126-
"doctrine/cache": "^1.11|^2.0",
127126
"doctrine/collections": "~1.0",
128127
"doctrine/data-fixtures": "^1.1",
129128
"doctrine/dbal": "^2.10|^3.0",

‎phpunit.xml.dist

Copy file name to clipboardExpand all lines: phpunit.xml.dist
+7-8Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@
7272
<element key="time-sensitive">
7373
<array>
7474
<element key="0"><string>Cache\IntegrationTests</string></element>
75-
<element key="1"><string>Doctrine\Common\Cache</string></element>
76-
<element key="2"><string>Symfony\Component\Cache</string></element>
77-
<element key="3"><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
78-
<element key="4"><string>Symfony\Component\Cache\Tests\Traits</string></element>
79-
<element key="5"><string>Symfony\Component\Cache\Traits</string></element>
80-
<element key="6"><string>Symfony\Component\Console</string></element>
81-
<element key="7"><string>Symfony\Component\HttpFoundation</string></element>
82-
<element key="8"><string>Symfony\Component\Uid</string></element>
75+
<element key="1"><string>Symfony\Component\Cache</string></element>
76+
<element key="2"><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
77+
<element key="3"><string>Symfony\Component\Cache\Tests\Traits</string></element>
78+
<element key="4"><string>Symfony\Component\Cache\Traits</string></element>
79+
<element key="5"><string>Symfony\Component\Console</string></element>
80+
<element key="6"><string>Symfony\Component\HttpFoundation</string></element>
81+
<element key="7"><string>Symfony\Component\Uid</string></element>
8382
</array>
8483
</element>
8584
</array>

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
1313

1414
use Doctrine\Common\Annotations\Annotation;
15-
use Doctrine\Common\Annotations\PsrCachedReader;
16-
use Doctrine\Common\Cache\Cache;
1715
use Doctrine\DBAL\Connection;
1816
use Symfony\Bundle\FullStack;
1917
use Symfony\Component\Asset\Package;
@@ -930,9 +928,6 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
930928

931929
private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable)
932930
{
933-
$doctrineCache = $willBeAvailable('doctrine/cache', Cache::class, 'doctrine/annotation');
934-
$psr6Cache = $willBeAvailable('symfony/cache', PsrCachedReader::class, 'doctrine/annotation');
935-
936931
$rootNode
937932
->children()
938933
->arrayNode('annotations')
@@ -941,7 +936,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
941936
->children()
942937
->enumNode('cache')
943938
->values(['none', 'php_array', 'file'])
944-
->defaultValue(($doctrineCache || $psr6Cache) ? 'php_array' : 'none')
939+
->defaultValue('php_array')
945940
->end()
946941
->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
947942
->booleanNode('debug')->defaultValue($this->debug)->end()

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
-15Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Doctrine\Common\Annotations\AnnotationRegistry;
1616
use Doctrine\Common\Annotations\PsrCachedReader;
1717
use Doctrine\Common\Annotations\Reader;
18-
use Doctrine\Common\Cache\Psr6\DoctrineProvider;
1918
use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
2019
use Symfony\Component\Cache\Adapter\ArrayAdapter;
2120
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
@@ -46,13 +45,6 @@
4645
abstract_arg('Cache-Directory'),
4746
])
4847

49-
->set('annotations.filesystem_cache', DoctrineProvider::class)
50-
->factory([DoctrineProvider::class, 'wrap'])
51-
->args([
52-
service('annotations.filesystem_cache_adapter'),
53-
])
54-
->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
55-
5648
->set('annotations.cache_warmer', AnnotationsCacheWarmer::class)
5749
->args([
5850
service('annotations.reader'),
@@ -69,13 +61,6 @@
6961
])
7062
->tag('container.hot_path')
7163

72-
->set('annotations.cache', DoctrineProvider::class)
73-
->factory([DoctrineProvider::class, 'wrap'])
74-
->args([
75-
service('annotations.cache_adapter'),
76-
])
77-
->deprecate('symfony/framework-bundle', '5.4', '"%service_id% is deprecated"')
78-
7964
->alias('annotation_reader', 'annotations.reader')
8065
->alias(Reader::class, 'annotation_reader');
8166
};

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
},
3333
"require-dev": {
3434
"doctrine/annotations": "^1.13.1",
35-
"doctrine/cache": "^1.11|^2.0",
3635
"doctrine/persistence": "^1.3|^2.0",
3736
"symfony/asset": "^5.4|^6.0",
3837
"symfony/browser-kit": "^5.4|^6.0",
@@ -69,7 +68,6 @@
6968
},
7069
"conflict": {
7170
"doctrine/annotations": "<1.13.1",
72-
"doctrine/cache": "<1.11",
7371
"doctrine/persistence": "<1.3",
7472
"phpdocumentor/reflection-docblock": "<3.2.2",
7573
"phpdocumentor/type-resolver": "<1.4.0",

‎src/Symfony/Bundle/TwigBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/composer.json
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
"symfony/yaml": "^5.4|^6.0",
3838
"symfony/framework-bundle": "^5.4|^6.0",
3939
"symfony/web-link": "^5.4|^6.0",
40-
"doctrine/annotations": "^1.10.4",
41-
"doctrine/cache": "^1.0|^2.0"
40+
"doctrine/annotations": "^1.10.4"
4241
},
4342
"conflict": {
4443
"symfony/dependency-injection": "<5.4",

‎src/Symfony/Component/Validator/ValidatorBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/ValidatorBuilder.php
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
namespace Symfony\Component\Validator;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15-
use Doctrine\Common\Annotations\CachedReader;
1615
use Doctrine\Common\Annotations\PsrCachedReader;
1716
use Doctrine\Common\Annotations\Reader;
18-
use Doctrine\Common\Cache\ArrayCache;
1917
use Psr\Cache\CacheItemPoolInterface;
2018
use Symfony\Component\Cache\Adapter\ArrayAdapter;
2119
use Symfony\Component\Validator\Context\ExecutionContextFactory;
@@ -394,12 +392,6 @@ private function createAnnotationReader(): Reader
394392
return new PsrCachedReader(new AnnotationReader(), new ArrayAdapter());
395393
}
396394

397-
if (class_exists(CachedReader::class) && class_exists(ArrayCache::class)) {
398-
trigger_deprecation('symfony/validator', '5.4', 'Enabling annotation based constraint mapping without having symfony/cache installed is deprecated.');
399-
400-
return new CachedReader(new AnnotationReader(), new ArrayCache());
401-
}
402-
403395
throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and symfony/cache to be installed.');
404396
}
405397
}

‎src/Symfony/Component/Validator/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/composer.json
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
"symfony/property-info": "^5.4|^6.0",
3939
"symfony/translation": "^5.4|^6.0",
4040
"doctrine/annotations": "^1.13",
41-
"doctrine/cache": "^1.11|^2.0",
4241
"egulias/email-validator": "^2.1.10|^3"
4342
},
4443
"conflict": {
4544
"doctrine/annotations": "<1.13",
46-
"doctrine/cache": "<1.11",
4745
"doctrine/lexer": "<1.0.2",
4846
"phpunit/phpunit": "<5.4.3",
4947
"symfony/dependency-injection": "<5.4",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.