From e6af3c25723065136c8e0f3bf23e707238f91921 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Tue, 27 Apr 2021 16:42:01 +0200 Subject: [PATCH] [Translation] [Loco] Simplify namespace --- .../DependencyInjection/FrameworkExtension.php | 2 +- .../Resources/config/translation_providers.php | 2 +- .../Bridge/Loco/{Provider => }/LocoProvider.php | 2 +- .../Bridge/Loco/{Provider => }/LocoProviderFactory.php | 2 +- .../Bridge/Loco/Tests/LocoProviderFactoryTest.php | 2 +- .../Translation/Bridge/Loco/Tests/LocoProviderTest.php | 2 +- .../Exception/UnsupportedSchemeException.php | 2 +- .../Tests/Command/TranslationProviderTestCase.php | 10 +--------- 8 files changed, 8 insertions(+), 16 deletions(-) rename src/Symfony/Component/Translation/Bridge/Loco/{Provider => }/LocoProvider.php (99%) rename src/Symfony/Component/Translation/Bridge/Loco/{Provider => }/LocoProviderFactory.php (97%) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 17282c683c..a9b1698ce0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -169,7 +169,7 @@ use Symfony\Component\Serializer\Normalizer\UnwrappingDenormalizer; use Symfony\Component\Stopwatch\Stopwatch; use Symfony\Component\String\LazyString; use Symfony\Component\String\Slugger\SluggerInterface; -use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProviderFactory; +use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory; use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand; use Symfony\Component\Translation\PseudoLocalizationTranslator; use Symfony\Component\Translation\Translator; diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php index ffc70033fc..365898ef9c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php @@ -11,7 +11,7 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator; -use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProviderFactory; +use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory; use Symfony\Component\Translation\Provider\NullProviderFactory; use Symfony\Component\Translation\Provider\TranslationProviderCollection; use Symfony\Component\Translation\Provider\TranslationProviderCollectionFactory; diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php similarity index 99% rename from src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProvider.php rename to src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php index 8b315cbd76..0024ee3992 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Bridge\Loco\Provider; +namespace Symfony\Component\Translation\Bridge\Loco; use Psr\Log\LoggerInterface; use Symfony\Component\Translation\Exception\ProviderException; diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php similarity index 97% rename from src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProviderFactory.php rename to src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php index 06cb0c71cc..d2cc8b30f5 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Provider/LocoProviderFactory.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Component\Translation\Bridge\Loco\Provider; +namespace Symfony\Component\Translation\Bridge\Loco; use Psr\Log\LoggerInterface; use Symfony\Component\Translation\Exception\UnsupportedSchemeException; diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderFactoryTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderFactoryTest.php index 8234525d15..e253270752 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderFactoryTest.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderFactoryTest.php @@ -2,7 +2,7 @@ namespace Symfony\Component\Translation\Bridge\Loco\Tests; -use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProviderFactory; +use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory; use Symfony\Component\Translation\Provider\ProviderFactoryInterface; use Symfony\Component\Translation\Test\ProviderFactoryTestCase; diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php index 55e30b12fa..6dc474d637 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php @@ -4,7 +4,7 @@ namespace Symfony\Component\Translation\Bridge\Loco\Tests; use Psr\Log\LoggerInterface; use Symfony\Component\HttpClient\MockHttpClient; -use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProvider; +use Symfony\Component\Translation\Bridge\Loco\LocoProvider; use Symfony\Component\Translation\Loader\ArrayLoader; use Symfony\Component\Translation\Loader\LoaderInterface; use Symfony\Component\Translation\Loader\XliffFileLoader; diff --git a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php index f96b5cdc1f..1ee9b55e83 100644 --- a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php +++ b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php @@ -18,7 +18,7 @@ class UnsupportedSchemeException extends LogicException { private const SCHEME_TO_PACKAGE_MAP = [ 'loco' => [ - 'class' => Bridge\Loco\Provider\LocoProviderFactory::class, + 'class' => Bridge\Loco\LocoProviderFactory::class, 'package' => 'symfony/loco-translation-provider', ], ]; diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationProviderTestCase.php b/src/Symfony/Component/Translation/Tests/Command/TranslationProviderTestCase.php index c490fa096c..690188c63f 100644 --- a/src/Symfony/Component/Translation/Tests/Command/TranslationProviderTestCase.php +++ b/src/Symfony/Component/Translation/Tests/Command/TranslationProviderTestCase.php @@ -12,18 +12,10 @@ namespace Symfony\Component\Translation\Tests\Command; use PHPUnit\Framework\TestCase; -use Psr\Log\LoggerInterface; use Symfony\Component\Filesystem\Filesystem; -use Symfony\Component\HttpClient\MockHttpClient; -use Symfony\Component\HttpClient\Response\CommonResponseTrait; -use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProvider; -use Symfony\Component\Translation\Loader\LoaderInterface; -use Symfony\Component\Translation\Loader\XliffFileLoader; use Symfony\Component\Translation\Provider\FilteringProvider; use Symfony\Component\Translation\Provider\ProviderInterface; use Symfony\Component\Translation\Provider\TranslationProviderCollection; -use Symfony\Component\Translation\TranslatorBag; -use Symfony\Contracts\HttpClient\ResponseInterface; /** * @author Mathieu Santostefano @@ -61,7 +53,7 @@ abstract class TranslationProviderTestCase extends TestCase protected function createFile(array $messages = ['note' => 'NOTE'], $targetLanguage = 'en', $fileNamePattern = 'messages.%locale%.xlf', string $xlfVersion = 'xlf12'): string { - if ($xlfVersion === 'xlf12') { + if ('xlf12' === $xlfVersion) { $transUnits = ''; foreach ($messages as $key => $value) { $transUnits .= <<