iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved translation helpers to sub namespace

This commit is contained in:
Igor Scheller 2019-07-08 01:31:59 +02:00
parent e9f157ec5c
commit f90ab26fee
14 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -17,7 +17,7 @@ return [
\Engelsystem\Database\DatabaseServiceProvider::class, \Engelsystem\Database\DatabaseServiceProvider::class,
\Engelsystem\Http\RequestServiceProvider::class, \Engelsystem\Http\RequestServiceProvider::class,
\Engelsystem\Http\SessionServiceProvider::class, \Engelsystem\Http\SessionServiceProvider::class,
\Engelsystem\Helpers\TranslationServiceProvider::class, \Engelsystem\Helpers\Translation\TranslationServiceProvider::class,
\Engelsystem\Http\ResponseServiceProvider::class, \Engelsystem\Http\ResponseServiceProvider::class,
\Engelsystem\Http\Psr7ServiceProvider::class, \Engelsystem\Http\Psr7ServiceProvider::class,
\Engelsystem\Helpers\AuthenticatorServiceProvider::class, \Engelsystem\Helpers\AuthenticatorServiceProvider::class,

3
includes/helper/email_helper.php
View File

@ -1,5 +1,6 @@
<?php <?php
use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Mail\EngelsystemMailer; use Engelsystem\Mail\EngelsystemMailer;
use Engelsystem\Models\User\User; use Engelsystem\Models\User\User;
use Psr\Log\LogLevel; use Psr\Log\LogLevel;
@ -17,7 +18,7 @@ function engelsystem_email_to_user($recipientUser, $title, $message, $notIfItsMe
return true; return true;
} }
/** @var \Engelsystem\Helpers\Translator $translator */ /** @var Translator $translator */
$translator = app()->get('translator'); $translator = app()->get('translator');
$locale = $translator->getLocale(); $locale = $translator->getLocale();

2
src/Helpers/TranslationServiceProvider.php → src/Helpers/Translation/TranslationServiceProvider.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Engelsystem\Helpers; namespace Engelsystem\Helpers\Translation;
use Engelsystem\Config\Config; use Engelsystem\Config\Config;
use Engelsystem\Container\ServiceProvider; use Engelsystem\Container\ServiceProvider;

2
src/Helpers/Translator.php → src/Helpers/Translation/Translator.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Engelsystem\Helpers; namespace Engelsystem\Helpers\Translation;
class Translator class Translator
{ {

2
src/Middleware/LegacyMiddleware.php
View File

@ -3,7 +3,7 @@
namespace Engelsystem\Middleware; namespace Engelsystem\Middleware;
use Engelsystem\Helpers\Authenticator; use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Http\Response; use Engelsystem\Http\Response;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;

2
src/Middleware/SetLocale.php
View File

@ -2,7 +2,7 @@
namespace Engelsystem\Middleware; namespace Engelsystem\Middleware;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\MiddlewareInterface;

2
src/Renderer/Twig/Extensions/Translation.php
View File

@ -2,7 +2,7 @@
namespace Engelsystem\Renderer\Twig\Extensions; namespace Engelsystem\Renderer\Twig\Extensions;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Twig_Extension as TwigExtension; use Twig_Extension as TwigExtension;
use Twig_Extensions_TokenParser_Trans as TranslationTokenParser; use Twig_Extensions_TokenParser_Trans as TranslationTokenParser;
use Twig_Filter as TwigFilter; use Twig_Filter as TwigFilter;

2
src/helpers.php
View File

@ -4,7 +4,7 @@
use Engelsystem\Application; use Engelsystem\Application;
use Engelsystem\Config\Config; use Engelsystem\Config\Config;
use Engelsystem\Helpers\Authenticator; use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Http\Response; use Engelsystem\Http\Response;
use Engelsystem\Http\UrlGeneratorInterface; use Engelsystem\Http\UrlGeneratorInterface;

8
tests/Unit/Helpers/TranslationServiceProviderTest.php → tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
View File

@ -1,10 +1,10 @@
<?php <?php
namespace Engelsystem\Test\Unit\Helpers; namespace Engelsystem\Test\Unit\Helpers\Translation;
use Engelsystem\Config\Config; use Engelsystem\Config\Config;
use Engelsystem\Helpers\TranslationServiceProvider; use Engelsystem\Helpers\Translation\TranslationServiceProvider;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Test\Unit\ServiceProviderTest; use Engelsystem\Test\Unit\ServiceProviderTest;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Session;
@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
class TranslationServiceProviderTest extends ServiceProviderTest class TranslationServiceProviderTest extends ServiceProviderTest
{ {
/** /**
* @covers \Engelsystem\Helpers\TranslationServiceProvider::register() * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::register()
*/ */
public function testRegister() public function testRegister()
{ {

22
tests/Unit/Helpers/TranslatorTest.php → tests/Unit/Helpers/Translation/TranslatorTest.php
View File

@ -1,8 +1,8 @@
<?php <?php
namespace Engelsystem\Test\Unit\Helpers; namespace Engelsystem\Test\Unit\Helpers\Translation;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Test\Unit\ServiceProviderTest; use Engelsystem\Test\Unit\ServiceProviderTest;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use stdClass; use stdClass;
@ -10,12 +10,12 @@ use stdClass;
class TranslatorTest extends ServiceProviderTest class TranslatorTest extends ServiceProviderTest
{ {
/** /**
* @covers \Engelsystem\Helpers\Translator::__construct * @covers \Engelsystem\Helpers\Translation\Translator::__construct
* @covers \Engelsystem\Helpers\Translator::getLocale * @covers \Engelsystem\Helpers\Translation\Translator::getLocale
* @covers \Engelsystem\Helpers\Translator::getLocales * @covers \Engelsystem\Helpers\Translation\Translator::getLocales
* @covers \Engelsystem\Helpers\Translator::hasLocale * @covers \Engelsystem\Helpers\Translation\Translator::hasLocale
* @covers \Engelsystem\Helpers\Translator::setLocale * @covers \Engelsystem\Helpers\Translation\Translator::setLocale
* @covers \Engelsystem\Helpers\Translator::setLocales * @covers \Engelsystem\Helpers\Translation\Translator::setLocales
*/ */
public function testInit() public function testInit()
{ {
@ -47,8 +47,8 @@ class TranslatorTest extends ServiceProviderTest
} }
/** /**
* @covers \Engelsystem\Helpers\Translator::replaceText * @covers \Engelsystem\Helpers\Translation\Translator::replaceText
* @covers \Engelsystem\Helpers\Translator::translate * @covers \Engelsystem\Helpers\Translation\Translator::translate
*/ */
public function testTranslate() public function testTranslate()
{ {
@ -70,7 +70,7 @@ class TranslatorTest extends ServiceProviderTest
} }
/** /**
* @covers \Engelsystem\Helpers\Translator::translatePlural * @covers \Engelsystem\Helpers\Translation\Translator::translatePlural
*/ */
public function testTranslatePlural() public function testTranslatePlural()
{ {

2
tests/Unit/HelpersTest.php
View File

@ -6,7 +6,7 @@ use Engelsystem\Application;
use Engelsystem\Config\Config; use Engelsystem\Config\Config;
use Engelsystem\Container\Container; use Engelsystem\Container\Container;
use Engelsystem\Helpers\Authenticator; use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Http\Response; use Engelsystem\Http\Response;
use Engelsystem\Http\UrlGeneratorInterface; use Engelsystem\Http\UrlGeneratorInterface;

2
tests/Unit/Middleware/LegacyMiddlewareTest.php
View File

@ -3,7 +3,7 @@
namespace Engelsystem\Test\Unit\Middleware; namespace Engelsystem\Test\Unit\Middleware;
use Engelsystem\Helpers\Authenticator; use Engelsystem\Helpers\Authenticator;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Http\Request; use Engelsystem\Http\Request;
use Engelsystem\Middleware\LegacyMiddleware; use Engelsystem\Middleware\LegacyMiddleware;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;

2
tests/Unit/Middleware/SetLocaleTest.php
View File

@ -2,7 +2,7 @@
namespace Engelsystem\Test\Unit\Middleware; namespace Engelsystem\Test\Unit\Middleware;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Middleware\SetLocale; use Engelsystem\Middleware\SetLocale;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;

2
tests/Unit/Renderer/Twig/Extensions/TranslationTest.php
View File

@ -2,7 +2,7 @@
namespace Engelsystem\Test\Unit\Renderer\Twig\Extensions; namespace Engelsystem\Test\Unit\Renderer\Twig\Extensions;
use Engelsystem\Helpers\Translator; use Engelsystem\Helpers\Translation\Translator;
use Engelsystem\Renderer\Twig\Extensions\Translation; use Engelsystem\Renderer\Twig\Extensions\Translation;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use Twig_Extensions_TokenParser_Trans as TranslationTokenParser; use Twig_Extensions_TokenParser_Trans as TranslationTokenParser;