Automated cleaning

This commit is contained in:
Greyscale 2020-07-21 19:27:21 +02:00
parent 941ee91d84
commit 1f1d106447
3 changed files with 9 additions and 10 deletions

View file

@ -187,22 +187,21 @@ class App
return $container->get(Slim\Views\Twig::class);
});
$container->set('SelectedLanguage', function (ContainerInterface $container){
$container->set('SelectedLanguage', function (ContainerInterface $container) {
/** @var SessionService $sessionService */
$sessionService = $container->get(SessionService::class);
$selectedLanguage = $sessionService->has('Language') ? $sessionService->get('Language') : 'en_US';
return $selectedLanguage;
return $sessionService->has('Language') ? $sessionService->get('Language') : 'en_US';
});
$container->set(Translation\Translator::class, function(ContainerInterface $container){
$container->set(Translation\Translator::class, function (ContainerInterface $container) {
$selectedLanguage = $container->get('SelectedLanguage');
$translator = new Translation\Translator(
$container->get('ActiveLanguage'),
new Translation\MessageSelector()
);
// set default locale
$translator->setFallbackLocale('en');
@ -213,8 +212,8 @@ class App
$translator->addLoader('yaml', $yamlLoader);
// add some resources to the translator
$translator->addResource('yaml', APP_ROOT . "/src/Translations/{$selectedLanguage}.yaml", $selectedLanguage);
$translator->addResource('yaml', APP_ROOT."/src/Translations/{$selectedLanguage}.yaml", $selectedLanguage);
return $translator;
});
@ -394,7 +393,7 @@ class App
return self::Instance()->get($key);
}
public function getApp() : \Slim\App
public function getApp(): Slim\App
{
return $this->app;
}

View file

@ -127,7 +127,7 @@ class SessionService implements \SessionHandlerInterface
return true;
}
public function has(string $key) : bool
public function has(string $key): bool
{
return isset($_SESSION[$key]);
}

View file

@ -3,6 +3,7 @@
namespace Benzine\Tests;
use Benzine\App;
use Benzine\Router\Router;
use Psr\Http\Message\ResponseInterface;
use Slim\Http\Environment;
use Slim\Http\Headers;
@ -10,7 +11,6 @@ use Slim\Http\Request;
use Slim\Http\RequestBody;
use Slim\Http\Response;
use Slim\Http\Uri;
use Benzine\Router\Router;
abstract class RoutesTestCase extends BaseTestCase
{