Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit91d992d

Browse files
committed
[FrameworkBundle] Wire PhpArrayAdapter with a new cache warmer for annotations
1 parentd42bd60 commit91d992d

File tree

8 files changed

+160
-11
lines changed

8 files changed

+160
-11
lines changed
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Bundle\FrameworkBundle\CacheWarmer;
13+
14+
useDoctrine\Common\Annotations\CachedReader;
15+
useDoctrine\Common\Annotations\Reader;
16+
usePsr\Cache\CacheItemPoolInterface;
17+
useSymfony\Component\Cache\Adapter\AdapterInterface;
18+
useSymfony\Component\Cache\Adapter\ArrayAdapter;
19+
useSymfony\Component\Cache\Adapter\PhpArrayAdapter;
20+
useSymfony\Component\Cache\Adapter\ProxyAdapter;
21+
useSymfony\Component\Cache\DoctrineProvider;
22+
useSymfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
23+
24+
/**
25+
* Warms up annotation caches for classes found in composer's autoload class map
26+
* and declared in DI bundle extensions using the addAnnotatedClassesToCache method.
27+
*
28+
* @author Titouan Galopin <galopintitouan@gmail.com>
29+
*/
30+
class AnnotationsCacheWarmerimplements CacheWarmerInterface
31+
{
32+
private$annotationReader;
33+
private$phpArrayFile;
34+
private$fallbackPool;
35+
36+
/**
37+
* @param Reader $annotationReader
38+
* @param string $phpArrayFile The PHP file where annotations are cached.
39+
* @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached.
40+
*/
41+
publicfunction__construct(Reader$annotationReader,$phpArrayFile,CacheItemPoolInterface$fallbackPool)
42+
{
43+
$this->annotationReader =$annotationReader;
44+
$this->phpArrayFile =$phpArrayFile;
45+
if (!$fallbackPoolinstanceof AdapterInterface) {
46+
$fallbackPool =newProxyAdapter($fallbackPool);
47+
}
48+
$this->fallbackPool =$fallbackPool;
49+
}
50+
51+
/**
52+
* {@inheritdoc}
53+
*/
54+
publicfunctionwarmUp($cacheDir)
55+
{
56+
$adapter =newPhpArrayAdapter($this->phpArrayFile,$this->fallbackPool);
57+
$annotatedClassPatterns =$cacheDir.'/annotations.map';
58+
59+
if (!is_file($annotatedClassPatterns)) {
60+
$adapter->warmUp(array());
61+
62+
return;
63+
}
64+
65+
$annotatedClasses =include$annotatedClassPatterns;
66+
67+
$arrayPool =newArrayAdapter(0,false);
68+
$reader =newCachedReader($this->annotationReader,newDoctrineProvider($arrayPool));
69+
70+
foreach ($annotatedClassesas$class) {
71+
$this->readAllComponents($reader,$class);
72+
}
73+
74+
$values =$arrayPool->getValues();
75+
$adapter->warmUp($values);
76+
77+
foreach ($valuesas$k =>$v) {
78+
$item =$this->fallbackPool->getItem($k);
79+
$this->fallbackPool->saveDeferred($item->set($v));
80+
}
81+
$this->fallbackPool->commit();
82+
}
83+
84+
/**
85+
* {@inheritdoc}
86+
*/
87+
publicfunctionisOptional()
88+
{
89+
returntrue;
90+
}
91+
92+
privatefunctionreadAllComponents(Reader$reader,$class)
93+
{
94+
$reflectionClass =new \ReflectionClass($class);
95+
$reader->getClassAnnotations($reflectionClass);
96+
97+
foreach ($reflectionClass->getMethods()as$reflectionMethod) {
98+
$reader->getMethodAnnotations($reflectionMethod);
99+
}
100+
101+
foreach ($reflectionClass->getProperties()as$reflectionProperty) {
102+
$reader->getPropertyAnnotations($reflectionProperty);
103+
}
104+
}
105+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode)
594594
->info('annotation configuration')
595595
->addDefaultsIfNotSet()
596596
->children()
597-
->scalarNode('cache')->defaultValue('file')->end()
597+
->scalarNode('cache')->defaultValue('php_array')->end()
598598
->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
599599
->booleanNode('debug')->defaultValue($this->debug)->end()
600600
->end()

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,22 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
914914
$loader->load('annotations.xml');
915915

916916
if ('none' !==$config['cache']) {
917-
if ('file' ===$config['cache']) {
917+
$cacheService =$config['cache'];
918+
919+
if ('php_array' ===$config['cache']) {
920+
$cacheService ='annotations.cache';
921+
922+
// Enable warmer only if PHP array is used for cache
923+
$definition =$container->findDefinition('annotations.cache_warmer');
924+
$definition->addTag('kernel.cache_warmer');
925+
926+
$this->addClassesToCompile(array(
927+
'Symfony\Component\Cache\Adapter\PhpArrayAdapter',
928+
'Symfony\Component\Cache\DoctrineProvider',
929+
));
930+
}elseif ('file' ===$config['cache']) {
918931
$cacheDir =$container->getParameterBag()->resolveValue($config['file_cache_dir']);
932+
919933
if (!is_dir($cacheDir) &&false === @mkdir($cacheDir,0777,true) && !is_dir($cacheDir)) {
920934
thrownew \RuntimeException(sprintf('Could not create cache directory "%s".',$cacheDir));
921935
}
@@ -924,11 +938,13 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
924938
->getDefinition('annotations.filesystem_cache')
925939
->replaceArgument(0,$cacheDir)
926940
;
941+
942+
$cacheService ='annotations.filesystem_cache';
927943
}
928944

929945
$container
930946
->getDefinition('annotations.cached_reader')
931-
->replaceArgument(1,newReference('file' !==$config['cache'] ?$config['cache'] :'annotations.filesystem_cache'))
947+
->replaceArgument(1,newReference($cacheService))
932948
->replaceArgument(2,$config['debug'])
933949
->addAutowiringType(Reader::class)
934950
;
@@ -1138,10 +1154,8 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
11381154
}
11391155

11401156
$this->addClassesToCompile(array(
1141-
'Psr\Cache\CacheItemInterface',
1142-
'Psr\Cache\CacheItemPoolInterface',
1143-
'Symfony\Component\Cache\Adapter\AdapterInterface',
1144-
'Symfony\Component\Cache\Adapter\AbstractAdapter',
1157+
'Symfony\Component\Cache\Adapter\ApcuAdapter',
1158+
'Symfony\Component\Cache\Adapter\FilesystemAdapter',
11451159
'Symfony\Component\Cache\CacheItem',
11461160
));
11471161
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@
1919
<argument /><!-- Cache-Directory-->
2020
</service>
2121

22+
<serviceid="annotations.cache_warmer"class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer"public="false">
23+
<argumenttype="service"id="annotations.reader" />
24+
<argument>%kernel.cache_dir%/annotations.php</argument>
25+
<argumenttype="service"id="cache.annotations" />
26+
</service>
27+
28+
<serviceid="annotations.cache"class="Symfony\Component\Cache\DoctrineProvider"public="false">
29+
<argumenttype="service">
30+
<serviceclass="Symfony\Component\Cache\Adapter\PhpArrayAdapter">
31+
<factoryclass="Symfony\Component\Cache\Adapter\PhpArrayAdapter"method="create" />
32+
<argument>%kernel.cache_dir%/annotations.php</argument>
33+
<argumenttype="service"id="cache.annotations" />
34+
</service>
35+
</argument>
36+
</service>
37+
2238
<serviceid="annotation_reader"alias="annotations.reader" />
2339
</services>
2440
</container>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<tagname="cache.pool" />
2323
</service>
2424

25+
<serviceid="cache.annotations"parent="cache.system"public="false">
26+
<tagname="cache.pool" />
27+
</service>
28+
2529
<serviceid="cache.adapter.system"class="Symfony\Component\Cache\Adapter\AdapterInterface"abstract="true">
2630
<factoryclass="Symfony\Component\Cache\Adapter\AbstractAdapter"method="createSystemCache" />
2731
<tagname="cache.pool"clearer="cache.default_clearer" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ protected static function getBundleDefaultConfig()
214214
'cache' =>'validator.mapping.cache.symfony',
215215
),
216216
'annotations' =>array(
217-
'cache' =>'file',
217+
'cache' =>'php_array',
218218
'file_cache_dir' =>'%kernel.cache_dir%/annotations',
219219
'debug' =>true,
220220
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php":">=5.5.9",
2020
"symfony/asset":"~2.8|~3.0",
21-
"symfony/cache":"~3.1",
21+
"symfony/cache":"~3.2",
2222
"symfony/class-loader":"~3.2",
2323
"symfony/dependency-injection":"~3.2",
2424
"symfony/config":"~2.8|~3.0",

‎src/Symfony/Component/Cache/Adapter/ArrayAdapter.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function ($key, $value, $isHit) use ($defaultLifetime) {
5656
publicfunctiongetItem($key)
5757
{
5858
if (!$isHit =$this->hasItem($key)) {
59-
$value =null;
59+
$this->values[$key] =$value =null;
6060
}elseif ($this->storeSerialized) {
6161
$value =unserialize($this->values[$key]);
6262
}else {
@@ -79,6 +79,16 @@ public function getItems(array $keys = array())
7979
return$this->generateItems($keys,time());
8080
}
8181

82+
/**
83+
* Returns all cached values, with cache miss as null.
84+
*
85+
* @return array
86+
*/
87+
publicfunctiongetValues()
88+
{
89+
return$this->values;
90+
}
91+
8292
/**
8393
* {@inheritdoc}
8494
*/
@@ -183,7 +193,7 @@ private function generateItems(array $keys, $now)
183193

184194
foreach ($keysas$key) {
185195
if (!$isHit =isset($this->expiries[$key]) && ($this->expiries[$key] >=$now || !$this->deleteItem($key))) {
186-
$value =null;
196+
$this->values[$key] =$value =null;
187197
}elseif ($this->storeSerialized) {
188198
$value =unserialize($this->values[$key]);
189199
}else {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp