Skip to content

Commit 452c426

Browse files
aitboudadaitboudad
committed
rename ResourceMessageCatalogueProvider.
1 parent df17da8 commit 452c426

13 files changed

+46
-38
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1515
use Symfony\Component\Translation\Translator;
16-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
16+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1717
use Symfony\Component\Translation\Loader\ArrayLoader;
1818

1919
class TranslationExtensionTest extends \PHPUnit_Framework_TestCase
@@ -203,6 +203,6 @@ protected function getTemplate($template, $translator = null)
203203

204204
private function getTranslator($locale, $loaders = array(), $resources = array())
205205
{
206-
return new Translator($locale, new ResourceMessageCatalogueProvider($loaders, $resources));
206+
return new Translator($locale, new MessageCatalogueProvider($loaders, $resources));
207207
}
208208
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<argument type="service" id="translation.message_catalogue_provider.resource" />
174174
</service>
175175

176-
<service id="translation.message_catalogue_provider.resource" class="Symfony\Component\Translation\MessageCatalogueProvider\ContainerAwareResourceMessageCatalogueProvider" public="false">
176+
<service id="translation.message_catalogue_provider.resource" class="Symfony\Component\Translation\MessageCatalogueProvider\ContainerAwareMessageCatalogueProvider" public="false">
177177
<argument type="service" id="service_container" />
178178
<argument type="collection" /> <!-- translation loaders -->
179179
<argument type="collection" /> <!-- translation resources -->

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
66
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProviderInterface;
7-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
7+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
88
use Symfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
99

1010
class WarmableMessageCatalogueProvider implements MessageCatalogueProviderInterface, WarmableInterface
@@ -15,11 +15,11 @@ class WarmableMessageCatalogueProvider implements MessageCatalogueProviderInterf
1515
private $messageCatalogueProvider;
1616

1717
/**
18-
* @var ResourceMessageCatalogueProvider
18+
* @var MessageCatalogueProvider
1919
*/
2020
private $resourceMessageCatalogueProvider;
2121

22-
public function __construct(MessageCatalogueProviderInterface $messageCatalogueProvider, ResourceMessageCatalogueProvider $resourceMessageCatalogueProvider)
22+
public function __construct(MessageCatalogueProviderInterface $messageCatalogueProvider, MessageCatalogueProvider $resourceMessageCatalogueProvider)
2323
{
2424
$this->messageCatalogueProvider = $messageCatalogueProvider;
2525
$this->resourceMessageCatalogueProvider = $resourceMessageCatalogueProvider;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private function getFallbackContent(MessageCatalogue $catalogue)
187187
*/
188188
public function getCatalogueCachePath($locale)
189189
{
190-
if ($this->messageCatalogueProvider instanceof ResourceMessageCatalogueProvider) {
190+
if ($this->messageCatalogueProvider instanceof MessageCatalogueProvider) {
191191
return $this->cacheDir.'/catalogue.'.$locale.'.'.sha1(serialize($this->messageCatalogueProvider->getFallbackLocales())).'.php';
192192
}
193193

‎src/Symfony/Component/Translation/MessageCatalogueProvider/ContainerAwareResourceMessageCatalogueProvider.php renamed to ‎src/Symfony/Component/Translation/MessageCatalogueProvider/ContainerAwareCatalogueProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
2121
*/
22-
class ContainerAwareResourceMessageCatalogueProvider extends ResourceMessageCatalogueProvider
22+
class ContainerAwareCatalogueProvider extends MessageCatalogueProvider
2323
{
2424
/**
2525
* @var ContainerInterface

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
2222
*/
23-
class ResourceMessageCatalogueProvider implements MessageCatalogueProviderInterface
23+
class MessageCatalogueProvider implements MessageCatalogueProviderInterface
2424
{
2525
/**
2626
* @var array

‎src/Symfony/Component/Translation/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use Symfony\Component\Translation\Translator;
99
use Symfony\Component\Translation\MessageSelector;
1010
use Symfony\Component\Translation\Loader\ArrayLoader;
1111

12-
$resourceCatalogue = new ResourceMessageCatalogueProvider();
12+
$resourceCatalogue = new MessageCatalogueProvider();
1313
$resourceCatalogue->addLoader('array', new ArrayLoader());
1414
$resourceCatalogue->addResource('array', array(
1515
'Hello World!' => 'Bonjour',

‎src/Symfony/Component/Translation/Tests/DataCollectorTranslatorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Translation\Translator;
1515
use Symfony\Component\Translation\DataCollectorTranslator;
1616
use Symfony\Component\Translation\Loader\ArrayLoader;
17-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
17+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1818

1919
class DataCollectorTranslatorTest extends \PHPUnit_Framework_TestCase
2020
{
@@ -94,7 +94,7 @@ private function createCollector()
9494

9595
private function getTranslator($locale, $loaders = array(), $resources = array(), $fallbackLocales = array())
9696
{
97-
$resourceCatalogue = new ResourceMessageCatalogueProvider($loaders, $resources, $fallbackLocales);
97+
$resourceCatalogue = new MessageCatalogueProvider($loaders, $resources, $fallbackLocales);
9898

9999
return new Translator($locale, $resourceCatalogue);
100100
}

‎src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Translation\Translator;
1515
use Symfony\Component\Translation\LoggingTranslator;
1616
use Symfony\Component\Translation\Loader\ArrayLoader;
17-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
17+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1818

1919
class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
2020
{
@@ -51,7 +51,7 @@ public function testTransChoiceFallbackIsLogged()
5151

5252
private function getTranslator($locale, $loaders = array(), $resources = array(), $fallbackLocales = array())
5353
{
54-
$resourceCatalogue = new ResourceMessageCatalogueProvider($loaders, $resources, $fallbackLocales);
54+
$resourceCatalogue = new MessageCatalogueProvider($loaders, $resources, $fallbackLocales);
5555

5656
return new Translator($locale, $resourceCatalogue);
5757
}

‎src/Symfony/Component/Translation/Tests/MessageCatalogueProvider/CachedMessageCatalogueProviderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
1616
use Symfony\Component\Translation\MessageCatalogue;
1717
use Symfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
18-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
18+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1919
use Symfony\Component\Config\ConfigCacheFactory;
2020

2121
class CachedMessageCatalogueProviderTest extends \PHPUnit_Framework_TestCase
@@ -166,7 +166,7 @@ private function createFailingLoader()
166166

167167
protected function getMessageCatalogueProvider($debug, $loaders = array(), $resources = array(), $fallbackLocales = array())
168168
{
169-
$resourceCatalogue = new ResourceMessageCatalogueProvider($loaders, $resources, $fallbackLocales);
169+
$resourceCatalogue = new MessageCatalogueProvider($loaders, $resources, $fallbackLocales);
170170

171171
return new CachedMessageCatalogueProvider($resourceCatalogue, new ConfigCacheFactory($debug), $this->tmpDir);
172172
}

‎src/Symfony/Component/Translation/Tests/MessageCatalogueProvider/ResourceMessageCatalogueProviderTest.php renamed to ‎src/Symfony/Component/Translation/Tests/MessageCatalogueProvider/MessageCatalogueProviderTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
namespace Symfony\Component\Translation\MessageCatalogueProvider\Tests;
1313

1414
use Symfony\Component\Translation\MessageCatalogue;
15-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
15+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1616
use Symfony\Component\Translation\Loader\ArrayLoader;
1717

18-
class ResourceMessageCatalogueProviderTest extends \PHPUnit_Framework_TestCase
18+
class MessageCatalogueProviderTest extends \PHPUnit_Framework_TestCase
1919
{
2020
/**
2121
* @dataProvider getInvalidLocalesTests
@@ -123,7 +123,7 @@ public function testLoadCatalogueWithFallbackLocale()
123123

124124
private function getMessageCatalogueProvider($loaders = array(), $resources = array(), $fallbacklocales = array())
125125
{
126-
return new ResourceMessageCatalogueProvider($loaders, $resources, $fallbacklocales);
126+
return new MessageCatalogueProvider($loaders, $resources, $fallbacklocales);
127127
}
128128

129129
public function getInvalidLocalesTests()

‎src/Symfony/Component/Translation/Tests/TranslatorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Translation\Translator;
1515
use Symfony\Component\Translation\Loader\ArrayLoader;
1616
use Symfony\Component\Translation\MessageCatalogue;
17-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
17+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1818

1919
class TranslatorTest extends \PHPUnit_Framework_TestCase
2020
{
@@ -321,7 +321,7 @@ public function testTransChoiceFallbackWithNoTranslation()
321321

322322
protected function getTranslator($locale, $loaders = array(), $resources = array(), $fallbackLocales = array())
323323
{
324-
$resourceCatalogue = new ResourceMessageCatalogueProvider($loaders, $resources, $fallbackLocales);
324+
$resourceCatalogue = new MessageCatalogueProvider($loaders, $resources, $fallbackLocales);
325325

326326
return new Translator($locale, $resourceCatalogue);
327327
}

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

+25-17
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Translation;
1313

1414
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProviderInterface;
15-
use Symfony\Component\Translation\MessageCatalogueProvider\ResourceMessageCatalogueProvider;
15+
use Symfony\Component\Translation\MessageCatalogueProvider\MessageCatalogueProvider;
1616
use Symfony\Component\Translation\MessageCatalogueProvider\CachedMessageCatalogueProvider;
1717
use Symfony\Component\Translation\Loader\LoaderInterface;
1818
use Symfony\Component\Translation\Exception\NotFoundResourceException;
@@ -59,7 +59,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
5959
private $messageCatalogueProvider;
6060

6161
/**
62-
* @var ResourceMessageCatalogueProvider
62+
* @var MessageCatalogueProvider
6363
*/
6464
private $resourceMessageCatalogueProvider;
6565

@@ -124,11 +124,11 @@ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFa
124124
* @param string $format The name of the loader (@see addResource())
125125
* @param LoaderInterface $loader A LoaderInterface instance
126126
*
127-
* @deprecated since version 2.8, to be removed in 3.0. Use ResourceMessageCatalogueProvider::addLoader instead.
127+
* @deprecated since version 2.8, to be removed in 3.0. Use MessageCatalogueProvider::addLoader instead.
128128
*/
129129
public function addLoader($format, LoaderInterface $loader)
130130
{
131-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use ResourceMessageCatalogueProvider::addLoader instead.', E_USER_DEPRECATED);
131+
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use MessageCatalogueProvider::addLoader instead.', E_USER_DEPRECATED);
132132

133133
$this->getResourceMessageCatalogueProvider()->addLoader($format, $loader);
134134
}
@@ -143,11 +143,11 @@ public function addLoader($format, LoaderInterface $loader)
143143
*
144144
* @throws \InvalidArgumentException If the locale contains invalid characters
145145
*
146-
* @deprecated since version 2.8, to be removed in 3.0. Use ResourceMessageCatalogueProvider::addResource instead.
146+
* @deprecated since version 2.8, to be removed in 3.0. Use MessageCatalogueProvider::addResource instead.
147147
*/
148148
public function addResource($format, $resource, $locale, $domain = null)
149149
{
150-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use ResourceMessageCatalogueProvider::addResource instead.', E_USER_DEPRECATED);
150+
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use MessageCatalogueProvider::addResource instead.', E_USER_DEPRECATED);
151151

152152
$this->getResourceMessageCatalogueProvider()->addResource($format, $resource, $locale, $domain);
153153
}
@@ -192,11 +192,11 @@ public function setFallbackLocale($locales)
192192
*
193193
* @throws \InvalidArgumentException If a locale contains invalid characters
194194
*
195-
* @deprecated since version 2.8, to be removed in 3.0. Use ResourceMessageCatalogueProvider::setFallbackLocales instead.
195+
* @deprecated since version 2.8, to be removed in 3.0. Use MessageCatalogueProvider::setFallbackLocales instead.
196196
*/
197197
public function setFallbackLocales(array $locales)
198198
{
199-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use ResourceMessageCatalogueProvider::setFallbackLocales instead.', E_USER_DEPRECATED);
199+
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use MessageCatalogueProvider::setFallbackLocales instead.', E_USER_DEPRECATED);
200200

201201
$this->getResourceMessageCatalogueProvider()->setFallbackLocales($locales);
202202
}
@@ -206,11 +206,11 @@ public function setFallbackLocales(array $locales)
206206
*
207207
* @return array $locales The fallback locales
208208
*
209-
* @deprecated since version 2.8, to be removed in 3.0. Use ResourceMessageCatalogueProvider::getFallbackLocales instead.
209+
* @deprecated since version 2.8, to be removed in 3.0. Use MessageCatalogueProvider::getFallbackLocales instead.
210210
*/
211211
public function getFallbackLocales()
212212
{
213-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use ResourceMessageCatalogueProvider::getFallbackLocales instead.', E_USER_DEPRECATED);
213+
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use MessageCatalogueProvider::getFallbackLocales instead.', E_USER_DEPRECATED);
214214

215215
return $this->getResourceMessageCatalogueProvider()->getFallbackLocales();
216216
}
@@ -273,7 +273,7 @@ public function getCatalogue($locale = null)
273273
}
274274

275275
if ($this->isMethodOverwritten('getLoaders')) {
276-
@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);
276+
@trigger_error('The Translator::getLoaders method is deprecated since version 2.8 and will be removed in 3.0. Rely on MessageCatalogueProvider::getLoaders instead.', E_USER_DEPRECATED);
277277
}
278278

279279
$this->loadCatalogue($locale);
@@ -289,7 +289,7 @@ public function getCatalogue($locale = null)
289289
*
290290
* @return array LoaderInterface[]
291291
*
292-
* @deprecated since version 2.8, to be removed in 3.0. Rely on ResourceMessageCatalogueProvider::getLoaders instead.
292+
* @deprecated since version 2.8, to be removed in 3.0. Rely on MessageCatalogueProvider::getLoaders instead.
293293
*/
294294
protected function getLoaders()
295295
{
@@ -303,11 +303,11 @@ protected function getLoaders()
303303
*
304304
* @return array[array] indexed by catalog
305305
*
306-
* @deprecated since version 2.8, to be removed in 3.0. Use ResourceMessageCatalogueProviderInterface::getCatalogue() method instead.
306+
* @deprecated since version 2.8, to be removed in 3.0. Use MessageCatalogueProviderInterface::getCatalogue() method instead.
307307
*/
308308
public function getMessages($locale = null)
309309
{
310-
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use ResourceMessageCatalogueProviderInterface::getCatalogue() method instead.', E_USER_DEPRECATED);
310+
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use MessageCatalogueProviderInterface::getCatalogue() method instead.', E_USER_DEPRECATED);
311311

312312
$catalogue = $this->getCatalogue($locale);
313313
$messages = $catalogue->all();
@@ -346,7 +346,7 @@ protected function initializeCatalogue($locale)
346346
$this->assertValidLocale($locale);
347347

348348
if ($this->isMethodOverwritten('computeFallbackLocales')) {
349-
@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);
349+
@trigger_error('The Translator::computeFallbackLocales method is deprecated since version 2.8 and will be removed in 3.0. Rely on MessageCatalogueProvider instead.', E_USER_DEPRECATED);
350350
}
351351

352352
try {
@@ -407,7 +407,7 @@ private function initializeCacheCatalogue($locale)
407407
}
408408

409409
/**
410-
* @deprecated since version 2.8, to be removed in 3.0. Rely on ResourceMessageCatalogueProvider instead.
410+
* @deprecated since version 2.8, to be removed in 3.0. Rely on MessageCatalogueProvider instead.
411411
*/
412412
protected function computeFallbackLocales($locale)
413413
{
@@ -455,15 +455,23 @@ private function getMessageCatalogueProvider()
455455

456456
private function getResourceMessageCatalogueProvider()
457457
{
458+
if ($this->messageCatalogueProvider instanceof MessageCatalogueProvider) {
459+
return $this->messageCatalogueProvider;
460+
}
461+
458462
if ($this->resourceMessageCatalogueProvider) {
459463
return $this->resourceMessageCatalogueProvider;
460464
}
461465

462-
return $this->resourceMessageCatalogueProvider = new ResourceMessageCatalogueProvider();
466+
return $this->resourceMessageCatalogueProvider = new MessageCatalogueProvider();
463467
}
464468

465469
private function getCachedMessageCatalogueProvider()
466470
{
471+
if ($this->messageCatalogueProvider instanceof CachedMessageCatalogueProvider) {
472+
return $this->messageCatalogueProvider;
473+
}
474+
467475
if ($this->cacheMessageCatalogueProvider) {
468476
return $this->cacheMessageCatalogueProvider;
469477
}

0 commit comments

Comments
 (0)