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

Commitd6d9ee1

Browse files
committed
fixed some issues.
1 parent13e88eb commitd6d9ee1

File tree

9 files changed

+47
-51
lines changed

9 files changed

+47
-51
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TranslationsCacheWarmer implements CacheWarmerInterface
2626
private$translator;
2727
private$messageCatalogueProvider;
2828

29-
publicfunction__construct(TranslatorInterface$translator,MessageCatalogueProviderInterface$messageCatalogueProvider)
29+
publicfunction__construct(TranslatorInterface$translator,MessageCatalogueProviderInterface$messageCatalogueProvider =null)
3030
{
3131
$this->translator =$translator;
3232
$this->messageCatalogueProvider =$messageCatalogueProvider;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argumenttype="service"id="security.csrf.token_manager" />
1616
<argument>%form.type_extension.csrf.enabled%</argument>
1717
<argument>%form.type_extension.csrf.field_name%</argument>
18-
<argumenttype="service"id="translator.default" />
18+
<argumenttype="service"id="translation.translator" />
1919
<argument>%validator.translation_domain%</argument>
2020
</service>
2121
</services>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<argumenttype="collection" /><!-- fallback locales-->
181181
</service>
182182

183-
<serviceid="translation.message_catalogue_provider.cache"class="Symfony\Component\Translation\MessageCatalogueProvider\CacheMessageCatalogueProvider"public="false">
183+
<serviceid="translation.message_catalogue_provider.cache"class="Symfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider"public="false">
184184
<argumenttype="service"id="translation.message_catalogue_provider.resource" />
185185
<argumenttype="service"id="config_cache_factory" />
186186
<argument>%kernel.cache_dir%/translations</argument><!-- cache directory-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public function testTranslator()
249249
'->registerTranslatorConfiguration() finds translation resources in custom paths'
250250
);
251251

252-
$this->assertEquals(array('fr'),$container->getDefinition('translation.message_catalogue_provider.fallback')->getArgument(1));
252+
$this->assertEquals(array('fr'),$container->getDefinition('translation.message_catalogue_provider.resource')->getArgument(3));
253253
}
254254

255255
/**
@@ -319,7 +319,7 @@ public function testTranslatorMultipleFallbacks()
319319
{
320320
$container =$this->createContainerFromFile('translator_fallbacks');
321321

322-
$this->assertEquals(array('en','fr'),$container->getDefinition('translation.message_catalogue_provider.fallback')->getArgument(1));
322+
$this->assertEquals(array('en','fr'),$container->getDefinition('translation.message_catalogue_provider.resource')->getArgument(3));
323323
}
324324

325325
/**

‎src/Symfony/Bundle/FrameworkBundle/Translation/WarmableMessageCatalogueProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
useSymfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
66
useSymfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProviderInterface;
77
useSymfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
8-
useSymfony\Component\Translation\MessageCatalogueProvider\CacheMessageCatalogueProvider;
8+
useSymfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
99

1010
class WarmableMessageCatalogueProviderimplements MessageCatalogueProviderInterface, WarmableInterface
1111
{
@@ -31,7 +31,7 @@ public function __construct(MessageCatalogueProviderInterface $messageCatalogueP
3131
publicfunctionwarmUp($cacheDir)
3232
{
3333
// skip warmUp when translator doesn't use cache
34-
if (!$this->messageCatalogueProviderinstanceofCacheMessageCatalogueProvider) {
34+
if (!$this->messageCatalogueProviderinstanceofCachedMessageCatalogueProvider) {
3535
return;
3636
}
3737

‎src/Symfony/Component/Translation/MessageCatalogueProvider/CacheMessageCatalogueProvider.phprenamed to‎src/Symfony/Component/Translation/MessageCatalogueProvider/CachedMessageCatalogueProvider.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
2323
*/
24-
classCacheMessageCatalogueProviderimplements MessageCatalogueProviderInterface
24+
classCachedMessageCatalogueProviderimplements MessageCatalogueProviderInterface
2525
{
2626
/**
2727
* @var MessageCatalogueProviderInterface
@@ -72,7 +72,7 @@ public function getCatalogue($locale)
7272
}
7373

7474
/**
75-
* This method is added because itneeds in the Translator for BC. It should be removed in 3.0.
75+
* This method is added because itis needed in the Translator for BC. It should be removed in 3.0.
7676
*
7777
* @internal
7878
*/
@@ -82,7 +82,7 @@ public function getInner()
8282
}
8383

8484
/**
85-
* This method is added because itneeds in the Translator for BC. It should be removed in 3.0.
85+
* This method is added because itis needed in the Translator for BC. It should be removed in 3.0.
8686
*
8787
* @internal
8888
*/
@@ -99,14 +99,13 @@ function (ConfigCacheInterface $cache) use ($self, $callback) {
9999
}
100100
);
101101

102-
/* Read catalogue from cache. */
103102
returninclude$cache->getPath();
104103
}
105104

106105
/**
107106
* Sets the ConfigCache factory to use.
108107
*
109-
* This method is added because itneeds in the Translator for BC. It should be removed in 3.0.
108+
* This method is added because itis needed in the Translator for BC. It should be removed in 3.0.
110109
*
111110
* @param ConfigCacheFactoryInterface $configCacheFactory
112111
*
@@ -120,7 +119,7 @@ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFa
120119
/**
121120
* Provides the ConfigCache factory implementation.
122121
*
123-
* This method is added because itneeds in the Translator for BC. It should be removed in 3.0.
122+
* This method is added because itis needed in the Translator for BC. It should be removed in 3.0.
124123
*
125124
* @return ConfigCacheFactoryInterface $configCacheFactory
126125
*
@@ -191,7 +190,7 @@ private function getFallbackContent(MessageCatalogue $catalogue)
191190
}
192191

193192
/**
194-
* This method is public because itneeds in the Translator for BC. It should be made private in 3.0.
193+
* This method is public because itis needed in the Translator for BC. It should be made private in 3.0.
195194
*
196195
* @internal
197196
*/

‎src/Symfony/Component/Translation/MessageCatalogueProvider/ResourceMessageCatalogueProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function getFallbackLocales()
157157
}
158158

159159
/**
160-
* This method is public because itneeds in the Translator for BC. It should be made private in 3.0.
160+
* This method is public because itis needed in the Translator for BC. It should be made private in 3.0.
161161
*
162162
* @internal
163163
*/
@@ -179,7 +179,7 @@ public function loadCatalogue($locale)
179179
}
180180

181181
/**
182-
* This method is public because itneeds in the Translator for BC. It should be made private in 3.0.
182+
* This method is public because itis needed in the Translator for BC. It should be made private in 3.0.
183183
*
184184
* @internal
185185
*/

‎src/Symfony/Component/Translation/Tests/MessageCatalogueProvider/CacheMessageCatalogueProviderTest.phprenamed to‎src/Symfony/Component/Translation/Tests/MessageCatalogueProvider/CachedMessageCatalogueProviderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
useSymfony\Component\Translation\Loader\ArrayLoader;
1515
useSymfony\Component\Config\Resource\SelfCheckingResourceInterface;
1616
useSymfony\Component\Translation\MessageCatalogue;
17-
useSymfony\Component\Translation\MessageCatalogueProvider\CacheMessageCatalogueProvider;
17+
useSymfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
1818
useSymfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
1919
useSymfony\Component\Config\ConfigCacheFactory;
2020

21-
classCacheMessageCatalogueProviderTestextends \PHPUnit_Framework_TestCase
21+
classCachedMessageCatalogueProviderTestextends \PHPUnit_Framework_TestCase
2222
{
2323
private$tmpDir;
2424

@@ -168,7 +168,7 @@ protected function getMessageCatalogueProvider($debug, $loaders = array(), $reso
168168
{
169169
$resourceCatalogue =newResourceMessageCatalogueProvider($loaders,$resources,$fallbackLocales);
170170

171-
returnnewCacheMessageCatalogueProvider($resourceCatalogue,newConfigCacheFactory($debug),$this->tmpDir);
171+
returnnewCachedMessageCatalogueProvider($resourceCatalogue,newConfigCacheFactory($debug),$this->tmpDir);
172172
}
173173

174174
privatefunctiongetCatalogue($locale,$messages,$resources =array())

‎src/Symfony/Component/Translation/Translator.php

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
useSymfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProviderInterface;
1515
useSymfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
16-
useSymfony\Component\Translation\MessageCatalogueProvider\CacheMessageCatalogueProvider;
16+
useSymfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
1717
useSymfony\Component\Translation\Loader\LoaderInterface;
1818
useSymfony\Component\Translation\Exception\NotFoundResourceException;
1919
useSymfony\Component\Config\ConfigCacheFactoryInterface;
@@ -62,7 +62,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
6262
private$resourceMessageCatalogueProvider;
6363

6464
/**
65-
* @varCacheMessageCatalogueProvider
65+
* @varCachedMessageCatalogueProvider
6666
*/
6767
private$cacheMessageCatalogueProvider;
6868

@@ -86,7 +86,7 @@ public function __construct($locale, $messageCatalogueProvider = null, $selector
8686
$this->selector =$selector ?:newMessageSelector();
8787

8888
do {
89-
if ($messageCatalogueProviderinstanceofCacheMessageCatalogueProvider) {
89+
if ($messageCatalogueProviderinstanceofCachedMessageCatalogueProvider) {
9090
$this->cacheMessageCatalogueProvider =$messageCatalogueProvider;
9191
}elseif ($messageCatalogueProviderinstanceof ResourceMessageCatalogueProvider) {
9292
$this->resourceMessageCatalogueProvider =$messageCatalogueProvider;
@@ -95,7 +95,7 @@ public function __construct($locale, $messageCatalogueProvider = null, $selector
9595
$messageCatalogueProvider =method_exists($messageCatalogueProvider,'getInner') ?$messageCatalogueProvider->getInner() :null;
9696
}while ($messageCatalogueProvider);
9797
}else {
98-
@trigger_error('The'.__CLASS__.' constructor will require a MessageCatalogueProviderInterface for secondparameter since 3.0.',E_USER_DEPRECATED);
98+
@trigger_error('The'.__CLASS__.' constructor will require a MessageCatalogueProviderInterface foritssecondargument since 3.0.',E_USER_DEPRECATED);
9999

100100
// Parameters are shifted of one offset
101101
$this->selector =$messageCatalogueProvider ?:newMessageSelector();
@@ -113,13 +113,13 @@ public function __construct($locale, $messageCatalogueProvider = null, $selector
113113
*
114114
* @param ConfigCacheFactoryInterface $configCacheFactory
115115
*
116-
* @deprecated since version 2.8, to be removed in 3.0. Rely onCacheMessageCatalogueProvider instead.
116+
* @deprecated since version 2.8, to be removed in 3.0. Rely onCachedMessageCatalogueProvider instead.
117117
*/
118118
publicfunctionsetConfigCacheFactory(ConfigCacheFactoryInterface$configCacheFactory)
119119
{
120-
@trigger_error('The'.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely onCacheMessageCatalogueProvider instead.',E_USER_DEPRECATED);
120+
@trigger_error('The'.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely onCachedMessageCatalogueProvider instead.',E_USER_DEPRECATED);
121121

122-
$this->getCacheMessageCatalogueProvider()->getConfigCacheFactory($configCacheFactory);
122+
$this->getCachedMessageCatalogueProvider()->getConfigCacheFactory($configCacheFactory);
123123
}
124124

125125
/**
@@ -267,34 +267,16 @@ public function getCatalogue($locale = null)
267267
}
268268

269269
// check if the Translator class is overwritten
270-
if ('Symfony\Component\Translation\Translator' !==get_class($this)) {
270+
if ('Symfony\Component\Translation\Translator' !==get_class($this) && !$this->messageCatalogueProvider) {
271271
if (isset($this->catalogues[$locale])) {
272272
return$this->catalogues[$locale];
273273
}
274274

275-
$reflector =new \ReflectionClass($this);
276-
277-
$reflectorMethod =$reflector->getMethod('loadCatalogue');
278-
$isOverwritten = ($reflectorMethod->getDeclaringClass()->getName() !=='Symfony\Component\Translation\Translator');
279-
if (true ===$isOverwritten) {
275+
if ($this->isMethodOverwritten('loadCatalogue')) {
280276
@trigger_error('The Translator::loadCatalogue method is deprecated since version 2.8 and will be removed in 3.0. Rely on MessageCatalogueProviderInterface::getCatalogue() instead.',E_USER_DEPRECATED);
281277
}
282278

283-
$reflectorMethod =$reflector->getMethod('initializeCatalogue');
284-
$isOverwritten = ($reflectorMethod->getDeclaringClass()->getName() !=='Symfony\Component\Translation\Translator');
285-
if (true ===$isOverwritten) {
286-
@trigger_error('The Translator::initializeCatalogue method is deprecated since version 2.8 and will be removed in 3.0. Rely on MessageCatalogueProviderInterface::getCatalogue() instead.',E_USER_DEPRECATED);
287-
}
288-
289-
$reflectorMethod =$reflector->getMethod('computeFallbackLocales');
290-
$isOverwritten = ($reflectorMethod->getDeclaringClass()->getName() !=='Symfony\Component\Translation\Translator');
291-
if (true ===$isOverwritten) {
292-
@trigger_error('The Translator::computeFallbackLocales method is deprecated since version 2.8 and will be removed in 3.0. Rely on ResourceMessageCatalogueProvider instead.',E_USER_DEPRECATED);
293-
}
294-
295-
$reflectorMethod =$reflector->getMethod('getLoaders');
296-
$isOverwritten = ($reflectorMethod->getDeclaringClass()->getName() !=='Symfony\Component\Translation\Translator');
297-
if (true ===$isOverwritten) {
279+
if ($this->isMethodOverwritten('getLoaders')) {
298280
@trigger_error('The Translator::getLoaders method is deprecated since version 2.8 and will be removed in 3.0. Rely on ResourceMessageCatalogueProvider::getLoaders instead.',E_USER_DEPRECATED);
299281
}
300282

@@ -347,6 +329,10 @@ public function getMessages($locale = null)
347329
*/
348330
protectedfunctionloadCatalogue($locale)
349331
{
332+
if ($this->isMethodOverwritten('initializeCatalogue')) {
333+
@trigger_error('The Translator::initializeCatalogue method is deprecated since version 2.8 and will be removed in 3.0. Rely on MessageCatalogueProviderInterface::getCatalogue() instead.',E_USER_DEPRECATED);
334+
}
335+
350336
if (null ===$this->cacheDir) {
351337
$this->initializeCatalogue($locale);
352338
}else {
@@ -363,6 +349,10 @@ protected function initializeCatalogue($locale)
363349
{
364350
$this->assertValidLocale($locale);
365351

352+
if ($this->isMethodOverwritten('computeFallbackLocales')) {
353+
@trigger_error('The Translator::computeFallbackLocales method is deprecated since version 2.8 and will be removed in 3.0. Rely on ResourceMessageCatalogueProvider instead.',E_USER_DEPRECATED);
354+
}
355+
366356
try {
367357
$this->catalogues[$locale] =$this->getResourceMessageCatalogueProvider()->loadCatalogue($locale);
368358
}catch (NotFoundResourceException$e) {
@@ -407,7 +397,7 @@ private function initializeCacheCatalogue($locale)
407397

408398
$this->assertValidLocale($locale);
409399
$self =$this;// required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0.
410-
$cache =$this->getCacheMessageCatalogueProvider()->cache($locale,function ()use ($self,$locale) {
400+
$cache =$this->getCachedMessageCatalogueProvider()->cache($locale,function ()use ($self,$locale) {
411401
return$self->initializeAndGetCatalogue($locale);
412402
});
413403

@@ -461,7 +451,7 @@ private function getMessageCatalogueProvider()
461451
}
462452

463453
if (null !==$this->cacheDir) {
464-
return$this->getCacheMessageCatalogueProvider();
454+
return$this->getCachedMessageCatalogueProvider();
465455
}
466456

467457
return$this->getResourceMessageCatalogueProvider();
@@ -476,12 +466,19 @@ private function getResourceMessageCatalogueProvider()
476466
return$this->resourceMessageCatalogueProvider =newResourceMessageCatalogueProvider();
477467
}
478468

479-
privatefunctiongetCacheMessageCatalogueProvider()
469+
privatefunctiongetCachedMessageCatalogueProvider()
480470
{
481471
if ($this->cacheMessageCatalogueProvider) {
482472
return$this->cacheMessageCatalogueProvider;
483473
}
484474

485-
return$this->cacheMessageCatalogueProvider =newCacheMessageCatalogueProvider($this->getResourceMessageCatalogueProvider(),newConfigCacheFactory($this->debug),$this->cacheDir);
475+
return$this->cacheMessageCatalogueProvider =newCachedMessageCatalogueProvider($this->getResourceMessageCatalogueProvider(),newConfigCacheFactory($this->debug),$this->cacheDir);
476+
}
477+
478+
privatefunctionisMethodOverwritten($name)
479+
{
480+
$reflector =new \ReflectionMethod($this,$name);
481+
482+
return ($reflector->getDeclaringClass()->getName() !=='Symfony\Component\Translation\Translator');
486483
}
487484
}

0 commit comments

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