diff --git a/all_batch.bat b/all_batch.bat index 440e2c7a0..5c3e6aa47 100644 --- a/all_batch.bat +++ b/all_batch.bat @@ -7,7 +7,7 @@ php bin/console lint:xliff translations php bin/console lint:container && ^ php bin/console doctrine:schema:validate --skip-sync --no-interaction && ^ ECHO -------------------------------------- PHP-CS-FIXER -------------------------------------- && ^ -.\vendor-bin\php-cs-fixer\vendor\bin\php-cs-fixer.bat fix --diff --dry-run --quiet && ^ +.\vendor-bin\php-cs-fixer\vendor\bin\php-cs-fixer.bat fix --diff --dry-run && ^ ECHO -------------------------------------- PHP-PSALM ----------------------------------------- && ^ .\vendor-bin\psalm\vendor\bin\psalm.bat --no-progress src && ^ ECHO -------------------------------------- PHP-STAN ------------------------------------------ && ^ diff --git a/composer.lock b/composer.lock index 11e4f593e..602a1a97e 100644 --- a/composer.lock +++ b/composer.lock @@ -4469,16 +4469,16 @@ }, { "name": "symfony/flex", - "version": "v2.1.8", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "dcbe58c3fbafeaeb32f619bf94c3912c0c732b65" + "reference": "581a978fbcc878a3fef24c9560ac4df3720101a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/dcbe58c3fbafeaeb32f619bf94c3912c0c732b65", - "reference": "dcbe58c3fbafeaeb32f619bf94c3912c0c732b65", + "url": "https://api.github.com/repos/symfony/flex/zipball/581a978fbcc878a3fef24c9560ac4df3720101a3", + "reference": "581a978fbcc878a3fef24c9560ac4df3720101a3", "shasum": "" }, "require": { @@ -4514,7 +4514,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v2.1.8" + "source": "https://github.com/symfony/flex/tree/v2.2.1" }, "funding": [ { @@ -4530,7 +4530,7 @@ "type": "tidelift" } ], - "time": "2022-05-02T10:23:41+00:00" + "time": "2022-06-06T15:53:14+00:00" }, { "name": "symfony/form", @@ -10754,21 +10754,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -10806,9 +10806,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "aliases": [], diff --git a/public/css/colums.css b/public/css/colums.css index 386d7a8b3..630872e5d 100644 --- a/public/css/colums.css +++ b/public/css/colums.css @@ -136,3 +136,18 @@ .thead-light th.text-border { border-left-color: #e9ecef !important; } + +.f-100 { + width: 100px; +} + +.f-200 { + width: 200px; +} + +.f-300 { + width: 200px; +} +.f-400 { + width: 400px; +} diff --git a/public/js/test/recaptcha.js b/public/js/test/recaptcha.js index 66c825f0a..28697ed33 100644 --- a/public/js/test/recaptcha.js +++ b/public/js/test/recaptcha.js @@ -15,6 +15,8 @@ grecaptcha.ready(function () { const $form = $('#edit-form'); const key = $form.data('key'); const action = $form.data('action'); + + grecaptcha.execute(key, { action: action }).then(function (token) { diff --git a/src/Captcha/AbstractAlphaCaptcha.php b/src/Captcha/AbstractAlphaCaptcha.php index 35ef2a3e9..400d802b3 100644 --- a/src/Captcha/AbstractAlphaCaptcha.php +++ b/src/Captcha/AbstractAlphaCaptcha.php @@ -28,7 +28,7 @@ abstract class AbstractAlphaCaptcha implements AlphaCaptchaInterface */ public function __construct(protected DictionaryService $dictionary, TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Chart/BaseChart.php b/src/Chart/BaseChart.php index d0dd62ea7..be905f8e6 100644 --- a/src/Chart/BaseChart.php +++ b/src/Chart/BaseChart.php @@ -78,7 +78,7 @@ class BaseChart extends Highchart public function __construct(protected ApplicationService $application, ThemeService $service, TranslatorInterface $translator) { parent::__construct(); - $this->setTranslator($translator); + $this->translator = $translator; $this->darkTheme = $service->isDarkTheme(); $this->hideCredits() diff --git a/src/Controller/AboutController.php b/src/Controller/AboutController.php index 6a6649788..db65ec740 100644 --- a/src/Controller/AboutController.php +++ b/src/Controller/AboutController.php @@ -31,6 +31,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Intl\Locales; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller for application information. @@ -44,8 +45,9 @@ class AboutController extends AbstractController * * @param string $appMode the application mode */ - public function __construct(private readonly string $appMode) + public function __construct(TranslatorInterface $translator, private readonly string $appMode) { + parent::__construct($translator); } /** diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php index f4830cedb..535419ed2 100644 --- a/src/Controller/AbstractController.php +++ b/src/Controller/AbstractController.php @@ -25,7 +25,6 @@ use App\Spreadsheet\SpreadsheetDocument; use App\Traits\TranslatorFlashMessageTrait; use App\Util\Utils; -use Psr\Container\ContainerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseController; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\FormInterface; @@ -70,6 +69,14 @@ abstract class AbstractController extends BaseController */ protected ?UserService $userService = null; + /** + * Constructor. + */ + public function __construct(TranslatorInterface $translator) + { + $this->translator = $translator; + } + /** * Gets the address from (email and name) used to send email. */ @@ -158,10 +165,6 @@ public static function getSubscribedServices(): array */ public function getTranslator(): TranslatorInterface { - if (null === $this->translator) { - $this->translator = $this->getService(TranslatorInterface::class); - } - return $this->translator; } @@ -233,19 +236,6 @@ public function redirectToHomePage(): RedirectResponse return $this->redirectToRoute(self::HOME_PAGE); } - /** - * {@inheritDoc} - */ - public function setContainer(ContainerInterface $container): ?ContainerInterface - { - $previous = parent::setContainer($container); - if (null === $this->translator) { - $this->setTranslator($this->getService(TranslatorInterface::class)); - } - - return $previous; - } - /** * {@inheritDoc} Override the parent function to allow to use the default type like defined in the FormFactoryInterface. * @@ -333,9 +323,6 @@ protected function getRequestString(Request $request, string $key, string $defau * @template T * @psalm-param class-string $id * @psalm-return T - * - * @throws \Psr\Container\NotFoundExceptionInterface no entry was found for the identifier - * @throws \Psr\Container\ContainerExceptionInterface error while retrieving the entry */ protected function getService(string $id): mixed { @@ -445,6 +432,7 @@ protected function renderPdfDocument(PdfDocument $doc, bool $inline = true, stri * @param string $name the name of the Spreadsheet file or null to use default ('document.xlsx') * * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the report can not be rendered + * @throws \PhpOffice\PhpSpreadsheet\Exception */ protected function renderSpreadsheetDocument(SpreadsheetDocument $doc, bool $inline = true, string $name = ''): SpreadsheetResponse { diff --git a/src/Controller/AbstractEntityController.php b/src/Controller/AbstractEntityController.php index e6acf2014..dcbac4de5 100644 --- a/src/Controller/AbstractEntityController.php +++ b/src/Controller/AbstractEntityController.php @@ -27,6 +27,7 @@ use Psr\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Abstract controller for entities management. @@ -52,8 +53,9 @@ abstract class AbstractEntityController extends AbstractController * * @param AbstractRepository $repository */ - public function __construct(protected AbstractRepository $repository) + public function __construct(TranslatorInterface $translator, protected AbstractRepository $repository) { + parent::__construct($translator); $this->className = $repository->getClassName(); $this->lowerName = \strtolower(Utils::getShortName($this->className)); } diff --git a/src/Controller/CalculationController.php b/src/Controller/CalculationController.php index 15cf5f007..0ea088e5e 100644 --- a/src/Controller/CalculationController.php +++ b/src/Controller/CalculationController.php @@ -36,6 +36,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller for calculation entities. @@ -50,9 +51,9 @@ class CalculationController extends AbstractEntityController /** * Constructor. */ - public function __construct(CalculationRepository $repository, private readonly CalculationService $service, private readonly TaskRepository $taskRepository) + public function __construct(TranslatorInterface $translator, CalculationRepository $repository, private readonly CalculationService $service, private readonly TaskRepository $taskRepository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/CalculationStateController.php b/src/Controller/CalculationStateController.php index 947e4f60c..e9709e7f8 100644 --- a/src/Controller/CalculationStateController.php +++ b/src/Controller/CalculationStateController.php @@ -29,6 +29,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller for calculation state entities. @@ -43,9 +44,9 @@ class CalculationStateController extends AbstractEntityController /** * Constructor. */ - public function __construct(CalculationStateRepository $repository) + public function __construct(TranslatorInterface $translator, CalculationStateRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/CategoryController.php b/src/Controller/CategoryController.php index 768200848..753d838f5 100644 --- a/src/Controller/CategoryController.php +++ b/src/Controller/CategoryController.php @@ -31,6 +31,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for category entities. @@ -45,9 +46,9 @@ class CategoryController extends AbstractEntityController /** * Constructor. */ - public function __construct(CategoryRepository $repository) + public function __construct(TranslatorInterface $translator, CategoryRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index ff562d2c9..5ad0f915c 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -27,6 +27,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for customer entities. @@ -43,9 +44,9 @@ class CustomerController extends AbstractEntityController /** * Constructor. */ - public function __construct(CustomerRepository $repository) + public function __construct(TranslatorInterface $translator, CustomerRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/ExchangeRateController.php b/src/Controller/ExchangeRateController.php index b9a27de7c..096c0c7c8 100644 --- a/src/Controller/ExchangeRateController.php +++ b/src/Controller/ExchangeRateController.php @@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller for the exchange rate service. @@ -32,8 +33,9 @@ class ExchangeRateController extends AbstractController /** * Constructor. */ - public function __construct(private readonly ExchangeRateService $service) + public function __construct(TranslatorInterface $translator, private readonly ExchangeRateService $service) { + parent::__construct($translator); } /** diff --git a/src/Controller/GlobalMarginController.php b/src/Controller/GlobalMarginController.php index 61e6fce51..0e7c56e16 100644 --- a/src/Controller/GlobalMarginController.php +++ b/src/Controller/GlobalMarginController.php @@ -27,6 +27,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for global margins entities. @@ -41,9 +42,9 @@ class GlobalMarginController extends AbstractEntityController /** * Constructor. */ - public function __construct(GlobalMarginRepository $repository) + public function __construct(TranslatorInterface $translator, GlobalMarginRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php index 5f63a1080..e21d8f5a1 100644 --- a/src/Controller/GroupController.php +++ b/src/Controller/GroupController.php @@ -29,6 +29,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for group entities. @@ -43,9 +44,9 @@ class GroupController extends AbstractEntityController /** * Constructor. */ - public function __construct(GroupRepository $repository) + public function __construct(TranslatorInterface $translator, GroupRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php index 4a02dc44f..dc7c94e89 100644 --- a/src/Controller/IndexController.php +++ b/src/Controller/IndexController.php @@ -27,6 +27,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\User\UserInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller to display the home page. @@ -44,12 +45,15 @@ class IndexController extends AbstractController /** * Constructor. */ - public function __construct(private readonly EntityManagerInterface $manager) + public function __construct(TranslatorInterface $translator, private readonly EntityManagerInterface $manager) { + parent::__construct($translator); } /** * Display the home page. + * + * @throws \Psr\Cache\InvalidArgumentException */ #[Route(path: '/', name: 'homepage')] public function invoke(Request $request): Response diff --git a/src/Controller/OpenWeatherController.php b/src/Controller/OpenWeatherController.php index f4ffd502f..4bd032c7f 100644 --- a/src/Controller/OpenWeatherController.php +++ b/src/Controller/OpenWeatherController.php @@ -28,6 +28,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Validator\Constraints\File; use Symfony\Component\Validator\Constraints\Length; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller for the OpenWeather API. @@ -67,8 +68,9 @@ class OpenWeatherController extends AbstractController /** * Constructor. */ - public function __construct(private readonly OpenWeatherService $service) + public function __construct(TranslatorInterface $translator, private readonly OpenWeatherService $service) { + parent::__construct($translator); } /** diff --git a/src/Controller/PivotController.php b/src/Controller/PivotController.php index f30f8e45a..c517dd4bc 100644 --- a/src/Controller/PivotController.php +++ b/src/Controller/PivotController.php @@ -24,6 +24,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller to display the pivot table. @@ -36,8 +37,9 @@ class PivotController extends AbstractController /** * Constructor. */ - public function __construct(private readonly CalculationRepository $repository) + public function __construct(TranslatorInterface $translator, private readonly CalculationRepository $repository) { + parent::__construct($translator); } /** diff --git a/src/Controller/ProductController.php b/src/Controller/ProductController.php index 585b1bdde..a39aef9ee 100644 --- a/src/Controller/ProductController.php +++ b/src/Controller/ProductController.php @@ -28,6 +28,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for product entities. @@ -42,9 +43,9 @@ class ProductController extends AbstractEntityController /** * Constructor. */ - public function __construct(ProductRepository $repository) + public function __construct(TranslatorInterface $translator, ProductRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php index 9456a07a3..a88e36324 100644 --- a/src/Controller/RegistrationController.php +++ b/src/Controller/RegistrationController.php @@ -27,6 +27,7 @@ use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; use Symfony\Component\Security\Http\Util\TargetPathTrait; +use Symfony\Contracts\Translation\TranslatorInterface; use SymfonyCasts\Bundle\VerifyEmail\Exception\VerifyEmailExceptionInterface; /** @@ -41,10 +42,12 @@ class RegistrationController extends AbstractController private const VERIFY_ROUTE = 'verify_email'; public function __construct( + TranslatorInterface $translator, private readonly EmailVerifier $verifier, private readonly UserRepository $repository, private readonly UserExceptionService $service ) { + parent::__construct($translator); } /** diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php index 02a4619fc..5eefb1fb7 100644 --- a/src/Controller/ResetPasswordController.php +++ b/src/Controller/ResetPasswordController.php @@ -27,6 +27,7 @@ use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; +use Symfony\Contracts\Translation\TranslatorInterface; use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait; use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface; use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface; @@ -45,10 +46,12 @@ class ResetPasswordController extends AbstractController private const RESET_ROUTE = 'app_reset_password'; public function __construct( + TranslatorInterface $translator, private readonly ResetPasswordHelperInterface $helper, private readonly UserRepository $repository, private readonly UserExceptionService $service ) { + parent::__construct($translator); } /** diff --git a/src/Controller/SchemaController.php b/src/Controller/SchemaController.php index 4336bf269..2c1bd72a8 100644 --- a/src/Controller/SchemaController.php +++ b/src/Controller/SchemaController.php @@ -23,6 +23,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Controller to display the database schema. @@ -45,8 +46,9 @@ class SchemaController extends AbstractController /** * Constructor. */ - public function __construct(EntityManagerInterface $manager) + public function __construct(TranslatorInterface $translator, EntityManagerInterface $manager) { + parent::__construct($translator); $this->manager = $manager->getConnection()->createSchemaManager(); $this->metaDatas = $this->filterMetaDatas($manager); } diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index e5c790f55..6a74d8d3e 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -30,6 +30,7 @@ use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Contracts\Translation\TranslatorInterface; /** * The controller for task entities. @@ -44,9 +45,9 @@ class TaskController extends AbstractEntityController /** * Constructor. */ - public function __construct(TaskRepository $repository) + public function __construct(TranslatorInterface $translator, TaskRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Controller/TestController.php b/src/Controller/TestController.php index 9d1c5314b..2bfe55088 100644 --- a/src/Controller/TestController.php +++ b/src/Controller/TestController.php @@ -203,6 +203,8 @@ public function ipStrack(Request $request, IpStackService $service): JsonRespons /** * Test notifications. + * + * @throws \Psr\Cache\InvalidArgumentException */ #[Route(path: '/notifications', name: 'test_notifications')] public function notifications(): Response diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 0d8fdf6c7..68defc1b0 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -45,6 +45,7 @@ use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; +use Symfony\Contracts\Translation\TranslatorInterface; use Vich\UploaderBundle\Storage\StorageInterface; /** @@ -60,9 +61,9 @@ class UserController extends AbstractEntityController /** * Constructor. */ - public function __construct(UserRepository $repository) + public function __construct(TranslatorInterface $translator, UserRepository $repository) { - parent::__construct($repository); + parent::__construct($translator, $repository); } /** diff --git a/src/Form/CalculationState/CalculationStateListType.php b/src/Form/CalculationState/CalculationStateListType.php index a3e75f83a..330d0d965 100644 --- a/src/Form/CalculationState/CalculationStateListType.php +++ b/src/Form/CalculationState/CalculationStateListType.php @@ -35,7 +35,7 @@ class CalculationStateListType extends AbstractListEntityType public function __construct(TranslatorInterface $translator) { parent::__construct(CalculationState::class); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/DataTransformer/CategoryTransformer.php b/src/Form/DataTransformer/CategoryTransformer.php index 178130cb4..fc0d88232 100644 --- a/src/Form/DataTransformer/CategoryTransformer.php +++ b/src/Form/DataTransformer/CategoryTransformer.php @@ -33,7 +33,7 @@ class CategoryTransformer implements DataTransformerInterface */ public function __construct(private readonly CategoryRepository $repository, TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/DataTransformer/GroupTransformer.php b/src/Form/DataTransformer/GroupTransformer.php index 9de42f871..ccddeabe0 100644 --- a/src/Form/DataTransformer/GroupTransformer.php +++ b/src/Form/DataTransformer/GroupTransformer.php @@ -33,7 +33,7 @@ class GroupTransformer implements DataTransformerInterface */ public function __construct(private readonly GroupRepository $repository, TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/Type/PlainType.php b/src/Form/Type/PlainType.php index 96f433e14..b284f768d 100644 --- a/src/Form/Type/PlainType.php +++ b/src/Form/Type/PlainType.php @@ -92,7 +92,7 @@ class PlainType extends AbstractType */ public function __construct(TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/User/ThemeType.php b/src/Form/User/ThemeType.php index 291017d0b..59c107d07 100644 --- a/src/Form/User/ThemeType.php +++ b/src/Form/User/ThemeType.php @@ -54,7 +54,7 @@ class ThemeType extends AbstractHelperType */ public function __construct(private readonly ThemeService $service, TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/User/UserRegistrationType.php b/src/Form/User/UserRegistrationType.php index f15aceec9..c2eded5a1 100644 --- a/src/Form/User/UserRegistrationType.php +++ b/src/Form/User/UserRegistrationType.php @@ -33,7 +33,7 @@ class UserRegistrationType extends AbstractUserCaptchaType public function __construct(CaptchaImageService $service, ApplicationService $application, TranslatorInterface $translator) { parent::__construct($service, $application); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Form/User/UserRightsType.php b/src/Form/User/UserRightsType.php index 899c76bd5..5827c646f 100644 --- a/src/Form/User/UserRightsType.php +++ b/src/Form/User/UserRightsType.php @@ -32,7 +32,7 @@ class UserRightsType extends RightsType public function __construct(RoleHierarchyInterface $roleHierarchy, bool $isDebug, TranslatorInterface $translator) { parent::__construct($roleHierarchy, $isDebug); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Generator/AbstractEntityGenerator.php b/src/Generator/AbstractEntityGenerator.php index 32ac1a860..9e4a483ee 100644 --- a/src/Generator/AbstractEntityGenerator.php +++ b/src/Generator/AbstractEntityGenerator.php @@ -42,7 +42,7 @@ abstract class AbstractEntityGenerator implements LoggerAwareInterface, Generato public function __construct(private readonly EntityManagerInterface $manager, FakerService $fakerService, TranslatorInterface $translator) { $this->generator = $fakerService->getGenerator(); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Listener/LoginListener.php b/src/Listener/LoginListener.php index d81bc8d53..761e47676 100644 --- a/src/Listener/LoginListener.php +++ b/src/Listener/LoginListener.php @@ -33,7 +33,7 @@ class LoginListener implements EventSubscriberInterface */ public function __construct(private readonly EntityManagerInterface $manager, TranslatorInterface $translator, private readonly string $appNameVersion) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Listener/PersistenceListener.php b/src/Listener/PersistenceListener.php index 1581d8ef9..c978a9fe6 100644 --- a/src/Listener/PersistenceListener.php +++ b/src/Listener/PersistenceListener.php @@ -69,7 +69,7 @@ class PersistenceListener implements EventSubscriber public function __construct(RequestStack $requestStack, TranslatorInterface $translator, KernelInterface $kernel, private readonly string $appName) { $this->isDebug = $kernel->isDebug(); - $this->setTranslator($translator); + $this->translator = $translator; $this->setRequestStack($requestStack); $id = \sprintf('environment.%s', $kernel->getEnvironment()); $this->title = $this->trans($id); diff --git a/src/Listener/SwitchUserListener.php b/src/Listener/SwitchUserListener.php index fb59a3938..9cc9f8be8 100644 --- a/src/Listener/SwitchUserListener.php +++ b/src/Listener/SwitchUserListener.php @@ -41,7 +41,7 @@ class SwitchUserListener implements EventSubscriberInterface */ public function __construct(TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Mime/NotificationEmail.php b/src/Mime/NotificationEmail.php index d3086ced6..851d4fe9f 100644 --- a/src/Mime/NotificationEmail.php +++ b/src/Mime/NotificationEmail.php @@ -27,31 +27,32 @@ class NotificationEmail extends BaseNotificationEmail private ?string $footerText = null; - public function __construct(?TranslatorInterface $translator, Headers $headers = null, AbstractPart $body = null) + public function __construct(TranslatorInterface $translator, Headers $headers = null, AbstractPart $body = null) { parent::__construct($headers, $body); - if (null !== $translator) { - $this->setTranslator($translator); - } + $this->translator = $translator; $this->htmlTemplate('emails/notification.html.twig'); } public function getContext(): array { - if (null !== $this->footerText) { - return \array_merge(parent::getContext(), ['footer_text' => $this->footerText]); + $context = parent::getContext(); + if (!empty($this->footerText)) { + return \array_merge($context, ['footer_text' => $this->footerText]); } - return parent::getContext(); + return $context; } - /** - * @psalm-suppress InternalMethod - */ public function getPreparedHeaders(): Headers { $headers = parent::getPreparedHeaders(); - $headers->setHeaderBody('Text', 'Subject', $this->translateSubject()); + $subject = $headers->get('Subject'); + if (null !== $subject) { + $subject->setBody($this->translateSubject()); + } else { + $headers->addTextHeader('Subject', $this->translateSubject()); + } return $headers; } diff --git a/src/Report/AbstractReport.php b/src/Report/AbstractReport.php index b4b6e3562..39a819269 100644 --- a/src/Report/AbstractReport.php +++ b/src/Report/AbstractReport.php @@ -47,10 +47,8 @@ abstract class AbstractReport extends PdfDocument public function __construct(protected AbstractController $controller, PdfDocumentOrientation|string $orientation = PdfDocumentOrientation::PORTRAIT, PdfDocumentUnit|string $unit = PdfDocumentUnit::MILLIMETER, PdfDocumentSize|array $size = PdfDocumentSize::A4) { parent::__construct($orientation, $unit, $size); - - $this->translator = $controller->getTranslator(); + $this->translator = $this->controller->getTranslator(); $this->extension = new FormatExtension($this->translator); - $application = $controller->getApplication(); $appName = $controller->getApplicationName(); diff --git a/src/Report/CalculationReport.php b/src/Report/CalculationReport.php index 1eb74cd6d..b1e8d9630 100644 --- a/src/Report/CalculationReport.php +++ b/src/Report/CalculationReport.php @@ -39,6 +39,8 @@ class CalculationReport extends AbstractReport implements LoggerAwareInterface /** * Constructor. + * + * @throws \Psr\Cache\InvalidArgumentException */ public function __construct(AbstractController $controller, private readonly Calculation $calculation, private readonly ?string $qrcode = null) { diff --git a/src/Report/CalculationTableGroups.php b/src/Report/CalculationTableGroups.php index bd0fdda25..96210d160 100644 --- a/src/Report/CalculationTableGroups.php +++ b/src/Report/CalculationTableGroups.php @@ -38,7 +38,7 @@ class CalculationTableGroups extends PdfTableBuilder public function __construct(CalculationReport $parent) { parent::__construct($parent); - $this->setTranslator($parent->getTranslator()); + $this->translator = $parent->getTranslator(); $this->calculation = $parent->getCalculation(); } diff --git a/src/Report/CalculationTableItems.php b/src/Report/CalculationTableItems.php index df03f5e08..65a44504b 100644 --- a/src/Report/CalculationTableItems.php +++ b/src/Report/CalculationTableItems.php @@ -46,7 +46,7 @@ class CalculationTableItems extends PdfGroupTableBuilder public function __construct(CalculationReport $parent) { parent::__construct($parent); - $this->setTranslator($parent->getTranslator()); + $this->translator = $parent->getTranslator(); $this->calculation = $parent->getCalculation(); } diff --git a/src/Report/CalculationTableOverall.php b/src/Report/CalculationTableOverall.php index 99f749a95..c0e823deb 100644 --- a/src/Report/CalculationTableOverall.php +++ b/src/Report/CalculationTableOverall.php @@ -38,7 +38,7 @@ class CalculationTableOverall extends PdfTableBuilder public function __construct(CalculationReport $parent) { parent::__construct($parent); - $this->setTranslator($parent->getTranslator()); + $this->translator = $parent->getTranslator(); $this->calculation = $parent->getCalculation(); $this->minMargin = $parent->getMinMargin(); } @@ -97,7 +97,7 @@ public function output(): void $style = PdfStyle::getHeaderStyle()->setTextColor(PdfTextColor::red()); } - // overall margin and amouts + // overall margin and amount $this->startHeaderRow() ->add($this->trans('calculation.fields.overallTotal')) ->add(FormatUtils::formatAmount($totalItems)) @@ -112,12 +112,10 @@ public function output(): void ->setFontItalic() ->setFontSize(7); $oldMargins = $this->parent->setCellMargin(0); - if (null !== $this->translator) { - $this->startRow() - ->add($calculation->getCreatedText($this->translator), 1, $style, PdfTextAlignment::LEFT) - ->add($calculation->getUpdatedText($this->translator), 4, $style, PdfTextAlignment::RIGHT) - ->endRow(); - } + $this->startRow() + ->add($calculation->getCreatedText($this->translator), 1, $style, PdfTextAlignment::LEFT) + ->add($calculation->getUpdatedText($this->translator), 4, $style, PdfTextAlignment::RIGHT) + ->endRow(); $this->parent->setCellMargin($oldMargins); } diff --git a/src/Service/AkismetService.php b/src/Service/AkismetService.php index c64c3522e..78b61b6ea 100644 --- a/src/Service/AkismetService.php +++ b/src/Service/AkismetService.php @@ -85,7 +85,7 @@ public function __construct(ParameterBagInterface $params, CacheItemPoolInterfac $key = $params->get(self::PARAM_KEY); parent::__construct($adapter, $isDebug, $key); $this->endpoint = \sprintf(self::HOST_NAME, $key); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Service/ApplicationService.php b/src/Service/ApplicationService.php index f395726eb..ea6c9acbd 100644 --- a/src/Service/ApplicationService.php +++ b/src/Service/ApplicationService.php @@ -65,7 +65,7 @@ public function __construct( KernelInterface $kernel ) { $this->setLogger($logger); - $this->setTranslator($translator); + $this->translator = $translator; $this->setAdapter($applicationCache); $this->setDebug($kernel->isDebug()); diff --git a/src/Service/ArchiveService.php b/src/Service/ArchiveService.php index 8ee7fad46..8c8d696b0 100644 --- a/src/Service/ArchiveService.php +++ b/src/Service/ArchiveService.php @@ -53,7 +53,7 @@ public function __construct( TranslatorInterface $translator, RequestStack $requestStack ) { - $this->setTranslator($translator); + $this->translator = $translator; $this->setRequestStack($requestStack); } diff --git a/src/Service/CalculationService.php b/src/Service/CalculationService.php index 300cf2fa5..560572229 100644 --- a/src/Service/CalculationService.php +++ b/src/Service/CalculationService.php @@ -75,7 +75,7 @@ public function __construct( private readonly ApplicationService $service, TranslatorInterface $translator ) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Service/ExchangeRateService.php b/src/Service/ExchangeRateService.php index 1b12eaffb..08fe0dc20 100644 --- a/src/Service/ExchangeRateService.php +++ b/src/Service/ExchangeRateService.php @@ -75,7 +75,7 @@ public function __construct(ParameterBagInterface $params, CacheItemPoolInterfac $key = $params->get(self::PARAM_KEY); parent::__construct($adapter, $isDebug, $key); $this->endpoint = \sprintf(self::HOST_NAME, $key); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Service/HelpService.php b/src/Service/HelpService.php index 491a9fe28..e4f5e342a 100644 --- a/src/Service/HelpService.php +++ b/src/Service/HelpService.php @@ -58,7 +58,7 @@ public function __construct(CacheItemPoolInterface $adapter, TranslatorInterface if (!$isDebug) { $this->setAdapter($adapter); } - $this->setTranslator($translator); + $this->translator = $translator; $this->file = $projectDir . self::FILE_PATH; $this->imagePath = $projectDir . self::IMAGE_PATH; } diff --git a/src/Service/ImageResizer.php b/src/Service/ImageResizer.php index c28e30e6c..e81d5029c 100644 --- a/src/Service/ImageResizer.php +++ b/src/Service/ImageResizer.php @@ -43,7 +43,7 @@ class ImageResizer implements LoggerAwareInterface, ImageExtensionInterface */ public function __construct(TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; try { $this->imagine = new Imagine(); diff --git a/src/Service/IpStackService.php b/src/Service/IpStackService.php index 832d7830d..6fbfa86ee 100644 --- a/src/Service/IpStackService.php +++ b/src/Service/IpStackService.php @@ -54,7 +54,7 @@ public function __construct(ParameterBagInterface $params, CacheItemPoolInterfac /** @var string $key */ $key = $params->get(self::PARAM_KEY); parent::__construct($adapter, $isDebug, $key); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Service/MailService.php b/src/Service/MailService.php index c8857d18d..a55a5415a 100644 --- a/src/Service/MailService.php +++ b/src/Service/MailService.php @@ -36,7 +36,7 @@ class MailService public function __construct(TranslatorInterface $translator, private readonly MailerInterface $mailer, UrlGeneratorInterface $generator, private readonly string $appNameVersion) { $this->homeUrl = $generator->generate(AbstractController::HOME_PAGE, [], UrlGeneratorInterface::ABSOLUTE_URL); - $this->setTranslator($translator); + $this->translator = $translator; } /** @@ -97,10 +97,6 @@ private function convert(string $message): string private function getFooter(): string { - if (null !== $this->translator) { - return $this->trans('notification.footer', ['%name%' => $this->appNameVersion]); - } - - return $this->appNameVersion; + return $this->trans('notification.footer', ['%name%' => $this->appNameVersion]); } } diff --git a/src/Service/ProductUpdater.php b/src/Service/ProductUpdater.php index e9884ab17..12c6dce3b 100644 --- a/src/Service/ProductUpdater.php +++ b/src/Service/ProductUpdater.php @@ -59,7 +59,7 @@ public function __construct( TranslatorInterface $translator, RequestStack $requestStack ) { - $this->setTranslator($translator); + $this->translator = $translator; $this->setRequestStack($requestStack); } diff --git a/src/Service/SwissPostUpdater.php b/src/Service/SwissPostUpdater.php index 480b4ba5b..49922bd06 100644 --- a/src/Service/SwissPostUpdater.php +++ b/src/Service/SwissPostUpdater.php @@ -77,7 +77,7 @@ public function __construct(private readonly ApplicationService $application, pr $this->dataDirectory = $service->getDataDirectory(); $this->databaseName = $service->getDatabaseName(); $this->results = new SwissPostUpdateResult(); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Service/UserService.php b/src/Service/UserService.php index 50e56e075..3e237d3ff 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -52,7 +52,7 @@ public function __construct( CacheItemPoolInterface $userCache ) { $this->setLogger($logger); - $this->setTranslator($translator); + $this->translator = $translator; $this->setAdapter($userCache); } diff --git a/src/Spreadsheet/SpreadsheetDocument.php b/src/Spreadsheet/SpreadsheetDocument.php index f282b89ed..42fcc9687 100644 --- a/src/Spreadsheet/SpreadsheetDocument.php +++ b/src/Spreadsheet/SpreadsheetDocument.php @@ -82,7 +82,7 @@ class SpreadsheetDocument extends Spreadsheet public function __construct(TranslatorInterface $translator) { parent::__construct(); - $this->setTranslator($translator); + $this->translator = $translator; $this->setPageSize(PageSetup::PAPERSIZE_A4); } diff --git a/src/Table/CalculationStateTable.php b/src/Table/CalculationStateTable.php index 66774106f..b6d4c5041 100644 --- a/src/Table/CalculationStateTable.php +++ b/src/Table/CalculationStateTable.php @@ -34,7 +34,7 @@ class CalculationStateTable extends AbstractEntityTable public function __construct(CalculationStateRepository $repository, TranslatorInterface $translator, private readonly Environment $twig) { parent::__construct($repository); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Table/Definition/calculation.json b/src/Table/Definition/calculation.json index 4c7759c97..e6d4d4f60 100644 --- a/src/Table/Definition/calculation.json +++ b/src/Table/Definition/calculation.json @@ -25,12 +25,12 @@ { "field": "customer", "title": "calculation.fields.customer", - "class": "w-20 text-cell" + "class": "f-200 mw-100 text-cell" }, { "field": "description", "title": "calculation.fields.description", - "class": "w-30 text-cell" + "class": "f-200 mw-100 text-cell" }, { "field": "overallMargin", diff --git a/src/Table/Definition/calculation_items.json b/src/Table/Definition/calculation_items.json index 4c88b0266..1606bb476 100644 --- a/src/Table/Definition/calculation_items.json +++ b/src/Table/Definition/calculation_items.json @@ -25,17 +25,17 @@ { "field": "customer", "title": "calculation.fields.customer", - "class": "text-cell w-25" + "class": "w-25 text-cell" }, { "field": "description", "title": "calculation.fields.description", - "class": "text-cell w-25" + "class": "w-25 text-cell" }, { "field": "items", "title": "calculation.fields.items", - "class": "text-cell w-25 text-danger", + "class": "w-25 text-cell text-danger", "cardClass": "text-danger", "sortable": false, "searchable": false, diff --git a/src/Table/Definition/calculation_state.json b/src/Table/Definition/calculation_state.json index e1bd70109..b2a300340 100644 --- a/src/Table/Definition/calculation_state.json +++ b/src/Table/Definition/calculation_state.json @@ -14,7 +14,7 @@ { "field": "description", "title": "calculationstate.fields.description", - "class": "w-auto text-cell" + "class": "f-400 mw-100 text-cell" }, { "field": "editable", diff --git a/src/Table/Definition/category.json b/src/Table/Definition/category.json index 6b881a5f9..4141388f1 100644 --- a/src/Table/Definition/category.json +++ b/src/Table/Definition/category.json @@ -13,7 +13,7 @@ { "field": "description", "title": "category.fields.description", - "class": "w-auto text-cell" + "class": "f-400 mw-100 text-cell" }, { "field": "group.code", diff --git a/src/Table/Definition/group.json b/src/Table/Definition/group.json index 6a3f9f10c..02ee90be8 100644 --- a/src/Table/Definition/group.json +++ b/src/Table/Definition/group.json @@ -13,7 +13,7 @@ { "field": "description", "title": "group.fields.description", - "class": "w-auto text-cell" + "class": "f-400 mw-100 text-cell" }, { "field": "margins", diff --git a/src/Table/Definition/product.json b/src/Table/Definition/product.json index f115ce36b..40b876326 100644 --- a/src/Table/Definition/product.json +++ b/src/Table/Definition/product.json @@ -7,7 +7,7 @@ "field": "description", "title": "product.fields.description", "default": true, - "class": "w-100 text-cell", + "class": "f-400 mw-100 text-cell", "cardClass": "font-weight-bold" }, { diff --git a/src/Table/Definition/task.json b/src/Table/Definition/task.json index b409b92bf..b787e4109 100644 --- a/src/Table/Definition/task.json +++ b/src/Table/Definition/task.json @@ -7,7 +7,7 @@ "field": "name", "title": "task.fields.name", "default": true, - "class": " w-100 text-cell", + "class": "f-400 mw-100 text-cell", "cardClass": "font-weight-bold" }, { diff --git a/src/Table/SearchTable.php b/src/Table/SearchTable.php index 2fbb74e0d..e4d45807a 100644 --- a/src/Table/SearchTable.php +++ b/src/Table/SearchTable.php @@ -57,7 +57,7 @@ class SearchTable extends AbstractTable public function __construct(private readonly SearchService $service, AuthorizationCheckerInterface $checker, TranslatorInterface $translator) { $this->setChecker($checker); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Table/UserTable.php b/src/Table/UserTable.php index 09a71d8c5..a997c61ce 100644 --- a/src/Table/UserTable.php +++ b/src/Table/UserTable.php @@ -36,7 +36,7 @@ class UserTable extends AbstractEntityTable public function __construct(UserRepository $repository, TranslatorInterface $translator, private readonly Environment $twig, private readonly DateTimeFormatter $formatter) { parent::__construct($repository); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Traits/CacheTrait.php b/src/Traits/CacheTrait.php index 6806a7a60..98d119fdd 100644 --- a/src/Traits/CacheTrait.php +++ b/src/Traits/CacheTrait.php @@ -50,7 +50,7 @@ public function cleanKey(string $key): string */ public function clearCache(): bool { - return null !== $this->adapter && $this->adapter->clear(); + return $this->adapter?->clear() ?? false; } /** @@ -58,7 +58,7 @@ public function clearCache(): bool */ public function commitDeferredValues(): bool { - return null !== $this->adapter && $this->adapter->commit(); + return $this->adapter?->commit() ?? false; } /** @@ -68,7 +68,7 @@ public function commitDeferredValues(): bool */ public function deleteCacheItem(string $key): bool { - return null !== $this->adapter && $this->adapter->deleteItem($this->cleanKey($key)); + return $this->adapter?->deleteItem($this->cleanKey($key)) ?? false; } /** @@ -80,13 +80,9 @@ public function deleteCacheItem(string $key): bool */ public function deleteCacheItems(array $keys): bool { - if (null !== $this->adapter) { - $keys = \array_map(fn (string $key): string => $this->cleanKey($key), $keys); + $keys = \array_map(fn (string $key): string => $this->cleanKey($key), $keys); - return $this->adapter->deleteItems($keys); - } - - return false; + return $this->adapter?->deleteItems($keys) ?? false; } /** @@ -112,9 +108,7 @@ public function getCacheItem(string $key): ?CacheItemInterface */ public function getCacheValue(string $key, mixed $default = null): mixed { - // clean key $key = $this->cleanKey($key); - if (($item = $this->getCacheItem($key)) && $item->isHit()) { return $item->get(); } diff --git a/src/Traits/SessionTrait.php b/src/Traits/SessionTrait.php index 27003899b..c9079601c 100644 --- a/src/Traits/SessionTrait.php +++ b/src/Traits/SessionTrait.php @@ -40,14 +40,6 @@ public function setRequestStack(RequestStack $requestStack): void $this->requestStack = $requestStack; } - /** - * Sets the session. - */ - public function setSession(SessionInterface $session): void - { - $this->session = $session; - } - /** * Gets the session. * diff --git a/src/Traits/TranslatorTrait.php b/src/Traits/TranslatorTrait.php index 058a367f9..31c255b05 100644 --- a/src/Traits/TranslatorTrait.php +++ b/src/Traits/TranslatorTrait.php @@ -23,7 +23,7 @@ trait TranslatorTrait /** * The translator instance. */ - protected ?TranslatorInterface $translator = null; + protected TranslatorInterface $translator; /** * Checks if a message has a translation (it does not take into account the fallback mechanism). @@ -45,14 +45,6 @@ public function isTransDefined(string $id, ?string $domain = null, ?string $loca return $id !== $this->trans($id, [], $domain, $locale); } - /** - * Sets the translator. - */ - public function setTranslator(TranslatorInterface $translator): void - { - $this->translator = $translator; - } - /** * Translates the given message. * @@ -65,6 +57,6 @@ public function setTranslator(TranslatorInterface $translator): void */ public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { - return $this->translator?->trans($id, $parameters, $domain, $locale) ?? $id; + return $this->translator->trans($id, $parameters, $domain, $locale); } } diff --git a/src/Twig/FormatExtension.php b/src/Twig/FormatExtension.php index 0f4e27de4..ac1ec77e9 100644 --- a/src/Twig/FormatExtension.php +++ b/src/Twig/FormatExtension.php @@ -32,7 +32,7 @@ final class FormatExtension extends AbstractExtension */ public function __construct(TranslatorInterface $translator) { - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Twig/FunctionExtension.php b/src/Twig/FunctionExtension.php index 8c7c89d21..d4155e0b7 100644 --- a/src/Twig/FunctionExtension.php +++ b/src/Twig/FunctionExtension.php @@ -60,7 +60,7 @@ final class FunctionExtension extends AbstractExtension */ public function __construct(KernelInterface $kernel, TranslatorInterface $translator, private readonly UrlGeneratorService $generator) { - $this->setTranslator($translator); + $this->translator = $translator; $projectDir = $kernel->getProjectDir(); $filename = FileUtils::buildPath($projectDir, 'composer.lock'); $this->webDir = (string) \realpath(FileUtils::buildPath($projectDir, 'public')); diff --git a/src/Validator/PasswordValidator.php b/src/Validator/PasswordValidator.php index 956a0ff20..a1670d475 100644 --- a/src/Validator/PasswordValidator.php +++ b/src/Validator/PasswordValidator.php @@ -34,7 +34,7 @@ class PasswordValidator extends AbstractConstraintValidator public function __construct(TranslatorInterface $translator) { parent::__construct(Password::class); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/src/Validator/StrengthValidator.php b/src/Validator/StrengthValidator.php index e8a42927e..dd916ec9d 100644 --- a/src/Validator/StrengthValidator.php +++ b/src/Validator/StrengthValidator.php @@ -37,7 +37,7 @@ class StrengthValidator extends AbstractConstraintValidator public function __construct(TranslatorInterface $translator, private ?PropertyAccessorInterface $propertyAccessor = null) { parent::__construct(Strength::class); - $this->setTranslator($translator); + $this->translator = $translator; } /** diff --git a/templates/index/panel_catalog.html.twig b/templates/index/panel_catalog.html.twig index 1b30ce3f2..abe51c9dd 100644 --- a/templates/index/panel_catalog.html.twig +++ b/templates/index/panel_catalog.html.twig @@ -10,7 +10,7 @@ {{- entity|trans -}} {%- endif -%} -
+
{{- count|integer -}}
diff --git a/templates/index/panel_month.html.twig b/templates/index/panel_month.html.twig index d2c513778..7e34bdbe0 100644 --- a/templates/index/panel_month.html.twig +++ b/templates/index/panel_month.html.twig @@ -16,7 +16,7 @@ {{ text }} {%- endif -%} -
+
{{- month.total|integer }} {{ macros.margin(month.margin, min_margin) -}}

diff --git a/templates/index/panel_state.html.twig b/templates/index/panel_state.html.twig index 692d939de..71d58c9b3 100644 --- a/templates/index/panel_state.html.twig +++ b/templates/index/panel_state.html.twig @@ -14,7 +14,7 @@ {{ state.code }} {%- endif -%}

-
+
{{- state.total|integer }} {{ macros.margin(state.margin, min_margin) -}}

diff --git a/vendor-bin/php-cs-fixer/composer.lock b/vendor-bin/php-cs-fixer/composer.lock index 3764ae2fa..938cd7e79 100644 --- a/vendor-bin/php-cs-fixer/composer.lock +++ b/vendor-bin/php-cs-fixer/composer.lock @@ -1236,16 +1236,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -1260,7 +1260,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1298,7 +1298,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -1314,20 +1314,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -1339,7 +1339,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1379,7 +1379,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -1395,20 +1395,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -1420,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1463,7 +1463,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -1479,20 +1479,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -1507,7 +1507,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1546,7 +1546,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -1562,20 +1562,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -1584,7 +1584,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1629,7 +1629,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -1645,20 +1645,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { @@ -1667,7 +1667,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1708,7 +1708,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" }, "funding": [ { @@ -1724,7 +1724,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:11+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/process", diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock index 1c9cb473b..28eeac367 100644 --- a/vendor-bin/phpstan/composer.lock +++ b/vendor-bin/phpstan/composer.lock @@ -109,16 +109,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.7.8", + "version": "1.7.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a" + "reference": "62fcadcde81b4037e42ad2489119d31c46f00191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/62fcadcde81b4037e42ad2489119d31c46f00191", + "reference": "62fcadcde81b4037e42ad2489119d31c46f00191", "shasum": "" }, "require": { @@ -144,7 +144,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.7.8" + "source": "https://github.com/phpstan/phpstan/tree/1.7.11" }, "funding": [ { @@ -164,7 +164,7 @@ "type": "tidelift" } ], - "time": "2022-06-01T13:43:17+00:00" + "time": "2022-06-07T08:47:03+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -218,16 +218,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.7", + "version": "1.3.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "85339d71b2dde4871d84bc369002fa1a3b460b07" + "reference": "e0281f8acec4ca743403b959885315508c9b3351" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/85339d71b2dde4871d84bc369002fa1a3b460b07", - "reference": "85339d71b2dde4871d84bc369002fa1a3b460b07", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/e0281f8acec4ca743403b959885315508c9b3351", + "reference": "e0281f8acec4ca743403b959885315508c9b3351", "shasum": "" }, "require": { @@ -280,9 +280,9 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.7" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.9" }, - "time": "2022-06-01T13:19:10+00:00" + "time": "2022-06-06T09:18:01+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -338,16 +338,16 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "30f12aeab960c7f324eee3b39645655cf8a84146" + "reference": "7c24540375a53538190190496f077f76b14c63fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/30f12aeab960c7f324eee3b39645655cf8a84146", - "reference": "30f12aeab960c7f324eee3b39645655cf8a84146", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/7c24540375a53538190190496f077f76b14c63fb", + "reference": "7c24540375a53538190190496f077f76b14c63fb", "shasum": "" }, "require": { @@ -403,9 +403,9 @@ "description": "Symfony Framework extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-symfony/issues", - "source": "https://github.com/phpstan/phpstan-symfony/tree/1.2.2" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.2.3" }, - "time": "2022-05-28T15:18:51+00:00" + "time": "2022-06-03T13:22:15+00:00" }, { "name": "slam/phpstan-extensions", diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock index 53884adcc..b79e682c8 100644 --- a/vendor-bin/phpunit/composer.lock +++ b/vendor-bin/phpunit/composer.lock @@ -1997,88 +1997,6 @@ ], "time": "2022-04-12T16:22:53+00:00" }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.25.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-10-20T20:35:02+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -2131,21 +2049,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -2183,9 +2101,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "packages-dev": [], diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock index 9dc13496d..7729db1f6 100644 --- a/vendor-bin/psalm/composer.lock +++ b/vendor-bin/psalm/composer.lock @@ -923,16 +923,16 @@ }, { "name": "psalm/plugin-symfony", - "version": "v3.1.5", + "version": "v3.1.6", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "62b37be93df3d1f35dbd8c8509616e567e2466f0" + "reference": "2691d270acb2a17d3b8ec0b2d1275bcc7cfdedd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/62b37be93df3d1f35dbd8c8509616e567e2466f0", - "reference": "62b37be93df3d1f35dbd8c8509616e567e2466f0", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/2691d270acb2a17d3b8ec0b2d1275bcc7cfdedd5", + "reference": "2691d270acb2a17d3b8ec0b2d1275bcc7cfdedd5", "shasum": "" }, "require": { @@ -982,9 +982,9 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v3.1.5" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v3.1.6" }, - "time": "2022-05-14T11:21:10+00:00" + "time": "2022-06-06T12:18:54+00:00" }, { "name": "psr/cache", @@ -2451,16 +2451,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -2475,7 +2475,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2513,7 +2513,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -2529,20 +2529,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -2554,7 +2554,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2594,7 +2594,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -2610,20 +2610,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -2635,7 +2635,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2678,7 +2678,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -2694,20 +2694,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -2722,7 +2722,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2761,7 +2761,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -2777,20 +2777,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -2799,7 +2799,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2844,7 +2844,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -2860,7 +2860,7 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/routing", @@ -3389,21 +3389,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -3441,9 +3441,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" }, { "name": "webmozart/path-util", diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock index e51fa6fff..0c480df9b 100644 --- a/vendor-bin/rector/composer.lock +++ b/vendor-bin/rector/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "phpstan/phpstan", - "version": "1.7.8", + "version": "1.7.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a" + "reference": "62fcadcde81b4037e42ad2489119d31c46f00191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", - "reference": "2bf3d43015d56abac4d002a4d2d6c3a7d6fa627a", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/62fcadcde81b4037e42ad2489119d31c46f00191", + "reference": "62fcadcde81b4037e42ad2489119d31c46f00191", "shasum": "" }, "require": { @@ -43,7 +43,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.7.8" + "source": "https://github.com/phpstan/phpstan/tree/1.7.11" }, "funding": [ { @@ -63,7 +63,7 @@ "type": "tidelift" } ], - "time": "2022-06-01T13:43:17+00:00" + "time": "2022-06-07T08:47:03+00:00" }, { "name": "rector/rector", diff --git a/vendor-bin/twigcs/composer.lock b/vendor-bin/twigcs/composer.lock index 8fe519fe1..3c079bd23 100644 --- a/vendor-bin/twigcs/composer.lock +++ b/vendor-bin/twigcs/composer.lock @@ -400,16 +400,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -424,7 +424,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -462,7 +462,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -478,20 +478,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -503,7 +503,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -543,7 +543,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -559,20 +559,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -584,7 +584,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -627,7 +627,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -643,20 +643,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -671,7 +671,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -710,7 +710,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -726,7 +726,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/service-contracts",