Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions

View File

@@ -9,6 +9,7 @@
namespace App\API\Serializer;
use App\Entity\User;
use App\Validator\ValidationFailedException;
use FOS\RestBundle\Serializer\Normalizer\FlattenExceptionHandler;
use JMS\Serializer\Context;
@@ -16,27 +17,17 @@ use JMS\Serializer\GraphNavigatorInterface;
use JMS\Serializer\Handler\SubscribingHandlerInterface;
use JMS\Serializer\JsonSerializationVisitor;
use Symfony\Component\ErrorHandler\Exception\FlattenException;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class ValidationFailedExceptionErrorHandler implements SubscribingHandlerInterface
final class ValidationFailedExceptionErrorHandler implements SubscribingHandlerInterface
{
/**
* @var TranslatorInterface
*/
private $translator;
/**
* @var FlattenExceptionHandler
*/
private $exceptionHandler;
public function __construct(TranslatorInterface $translator, FlattenExceptionHandler $exceptionHandler)
public function __construct(private TranslatorInterface $translator, private FlattenExceptionHandler $exceptionHandler, private Security $security)
{
$this->translator = $translator;
$this->exceptionHandler = $exceptionHandler;
}
public static function getSubscribingMethods()
public static function getSubscribingMethods(): array
{
return [[
'direction' => GraphNavigatorInterface::DIRECTION_SERIALIZATION,
@@ -87,10 +78,18 @@ class ValidationFailedExceptionErrorHandler implements SubscribingHandlerInterfa
private function getErrorMessage(ConstraintViolationInterface $error): string
{
if (null !== $error->getPlural()) {
return $this->translator->trans($error->getMessageTemplate(), ['%count%' => $error->getPlural()] + $error->getParameters(), 'validators');
$locale = \Locale::getDefault();
/** @var User $user */
$user = $this->security->getUser();
if ($user !== null) {
$locale = $user->getLocale();
}
return $this->translator->trans($error->getMessageTemplate(), $error->getParameters(), 'validators');
if (null !== $error->getPlural()) {
return $this->translator->trans($error->getMessageTemplate(), ['%count%' => $error->getPlural()] + $error->getParameters(), 'validators', $locale);
}
return $this->translator->trans($error->getMessageTemplate(), $error->getParameters(), 'validators', $locale);
}
}