From 7a5db59ac21f148596b39ebf384156593230ac35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 22 Jul 2023 23:05:34 +0200 Subject: [PATCH] remove deprecated templating component --- composer.json | 1 - .../CustomFields/CustomFieldChoice.php | 8 ++---- .../CustomFields/CustomFieldDate.php | 7 +++-- .../CustomFields/CustomFieldNumber.php | 7 +++-- .../CustomFields/CustomFieldText.php | 7 ++--- .../CustomFields/CustomFieldTitle.php | 4 +-- .../config/services.yaml | 28 +++++++------------ .../DataFixtures/ORM/LoadCustomFields.php | 4 +-- .../config/services/fixtures.yaml | 5 ++-- tests/app/config/packages/framework.yaml | 3 -- 10 files changed, 29 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index e3983cf06..7356ec371 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,6 @@ "symfony/monolog-bundle": "^3.5", "symfony/security-bundle": "^4.4", "symfony/serializer": "^5.3", - "symfony/templating": "^4.4", "symfony/translation": "^4.4", "symfony/twig-bundle": "^4.4", "symfony/validator": "^4.4", diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php index f5a7b0f03..3fab5cd9b 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php @@ -24,6 +24,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; +use Twig\Environment; use function array_key_exists; use function count; use function in_array; @@ -42,20 +43,16 @@ class CustomFieldChoice extends AbstractCustomField final public const OTHER_VALUE_LABEL = 'otherValueLabel'; - private $defaultLocales; - /** * CustomFieldChoice constructor. */ public function __construct( - TranslatorInterface $translator, - private readonly TwigEngine $templating, + private readonly Environment $templating, /** * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation */ private readonly TranslatableStringHelper $translatableStringHelper ) { - $this->defaultLocales = $translator->getFallbackLocales(); } public function allowOtherChoice(CustomField $cf) @@ -307,7 +304,6 @@ class CustomFieldChoice extends AbstractCustomField 'selected' => $selected, 'multiple' => $customField->getOptions()[self::MULTIPLE], 'expanded' => $customField->getOptions()[self::EXPANDED], - 'locales' => $this->defaultLocales, ] ); } diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php index ccdbcb199..2c3550e52 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php @@ -23,6 +23,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\Callback; use Symfony\Component\Validator\Context\ExecutionContextInterface; +use Twig\Environment; /** * Create a custom date number. @@ -44,8 +45,10 @@ class CustomFieldDate extends AbstractCustomField */ final public const MIN = 'min'; - public function __construct(private readonly TwigEngine $templating, private readonly TranslatableStringHelper $translatableStringHelper) - { + public function __construct( + private readonly Environment $templating, + private readonly TranslatableStringHelper $translatableStringHelper + ) { } public function buildForm(FormBuilderInterface $builder, CustomField $customField) diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php index 69b856db1..cd9750851 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php @@ -20,6 +20,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\GreaterThanOrEqual; use Symfony\Component\Validator\Constraints\LessThanOrEqual; +use Twig\Environment; /** * Create a custom field number. @@ -39,8 +40,10 @@ class CustomFieldNumber extends AbstractCustomField final public const SCALE = 'scale'; - public function __construct(private readonly TwigEngine $templating, private readonly TranslatableStringHelper $translatableStringHelper) - { + public function __construct( + private readonly Environment $templating, + private readonly TranslatableStringHelper $translatableStringHelper + ) { } public function buildForm(FormBuilderInterface $builder, CustomField $customField) diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php index 3be0886f6..1dff8a863 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php @@ -21,6 +21,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\RequestStack; +use Twig\Environment; use function array_key_exists; class CustomFieldText extends AbstractCustomField @@ -30,11 +31,7 @@ class CustomFieldText extends AbstractCustomField final public const MULTIPLE_CF_INLINE = 'multipleCFInline'; public function __construct( - private readonly RequestStack $requestStack, - private readonly TwigEngine $templating, - /** - * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation - */ + private readonly Environment $templating, private readonly TranslatableStringHelper $translatableStringHelper ) { } diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php index 4fbfe51d9..3f69f4c37 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php @@ -18,6 +18,7 @@ use Symfony\Bundle\TwigBundle\TwigEngine; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\RequestStack; +use Twig\Environment; class CustomFieldTitle extends AbstractCustomField { @@ -28,8 +29,7 @@ class CustomFieldTitle extends AbstractCustomField final public const TYPE_TITLE = 'title'; public function __construct( - private readonly RequestStack $requestStack, - private readonly TwigEngine $templating, + private readonly Environment $templating, /** * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation */ diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml index b415d7448..80cc0325b 100644 --- a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml +++ b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml @@ -37,18 +37,15 @@ services: chill.custom_field.text: class: Chill\CustomFieldsBundle\CustomFields\CustomFieldText - arguments: - - "@request_stack" - - "@templating" - - "@chill.main.helper.translatable_string" + autowire: true + autoconfigure: true tags: - { name: 'chill.custom_field', type: 'text' } chill.custom_field.number: class: Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber - arguments: - - "@templating" - - "@chill.main.helper.translatable_string" + autowire: true + autoconfigure: true tags: - { name: 'chill.custom_field', type: 'number' } @@ -64,10 +61,8 @@ services: chill.custom_field.choice: class: Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice - arguments: - - "@translator.default" - - "@templating" - - "@chill.main.helper.translatable_string" + autowire: true + autoconfigure: true tags: - { name: 'chill.custom_field', type: 'choice' } @@ -85,18 +80,15 @@ services: chill.custom_field.title: class: Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle - arguments: - - "@request_stack" - - "@templating" - - "@chill.main.helper.translatable_string" + autowire: true + autoconfigure: true tags: - { name: 'chill.custom_field', type: 'title' } chill.custom_field.date: class: Chill\CustomFieldsBundle\CustomFields\CustomFieldDate - arguments: - - "@templating" - - "@chill.main.helper.translatable_string" + autoconfigure: true + autowire: true tags: - { name: 'chill.custom_field', type: 'date' } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php index e200bc1f8..78d8f886b 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php @@ -49,7 +49,7 @@ class LoadCustomFields extends AbstractFixture implements /** * LoadCustomFields constructor. */ - public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly TranslatorInterface $translator) + public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) { } @@ -78,7 +78,6 @@ class LoadCustomFields extends AbstractFixture implements private function createCustomFieldChoice() { return new CustomFieldChoice( - $this->translator, $this->container->get('templating'), $this->translatableStringHelper ); @@ -87,7 +86,6 @@ class LoadCustomFields extends AbstractFixture implements private function createCustomFieldText() { return new CustomFieldText( - $this->container->get('request_stack'), $this->container->get('templating'), $this->translatableStringHelper ); diff --git a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml index d4cdcd957..8047e7eeb 100644 --- a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml @@ -6,7 +6,6 @@ services: tags: [ 'doctrine.fixture.orm' ] Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields: - arguments: - $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper' - $translator: '@Symfony\Contracts\Translation\TranslatorInterface' + autowire: true + autoconfigure: true tags: [ 'doctrine.fixture.orm' ] diff --git a/tests/app/config/packages/framework.yaml b/tests/app/config/packages/framework.yaml index 1ce5cb7ac..01c554356 100644 --- a/tests/app/config/packages/framework.yaml +++ b/tests/app/config/packages/framework.yaml @@ -25,6 +25,3 @@ framework: ## sf4 check: ou à déplacer dans un chill.yaml assets: json_manifest_path: '%kernel.project_dir%/public/build/manifest.json' - - templating: - engines: ['twig']