From 96f9cb455a59823176268499ba55c6217518f60d Mon Sep 17 00:00:00 2001 From: "charly.terrier" Date: Thu, 2 Jun 2022 12:23:46 +0200 Subject: [PATCH] Symfony 6.1 --- .php-version | 1 + .../Transformer/AbstractTransformer.php | 95 ++++--------------- .../Liform/Transformer/ArrayTransformer.php | 2 +- .../Liform/Transformer/BooleanTransformer.php | 2 +- .../Liform/Transformer/ChoiceTransformer.php | 2 +- .../Transformer/CompoundTransformer.php | 2 +- .../Liform/Transformer/IntegerTransformer.php | 2 +- .../Liform/Transformer/NumberTransformer.php | 2 +- .../Liform/Transformer/StringTransformer.php | 2 +- .../Transformer/TransformerInterface.php | 6 +- 10 files changed, 31 insertions(+), 85 deletions(-) create mode 100644 .php-version diff --git a/.php-version b/.php-version new file mode 100644 index 0000000..b8eb026 --- /dev/null +++ b/.php-version @@ -0,0 +1 @@ +8.1 diff --git a/src/Limenius/Liform/Transformer/AbstractTransformer.php b/src/Limenius/Liform/Transformer/AbstractTransformer.php index 041ba5e..405e7d1 100644 --- a/src/Limenius/Liform/Transformer/AbstractTransformer.php +++ b/src/Limenius/Liform/Transformer/AbstractTransformer.php @@ -20,44 +20,23 @@ */ abstract class AbstractTransformer implements TransformerInterface { - /** - * @var TranslatorInterface - */ - protected $translator; - - /** - * @var FormTypeGuesserInterface|null - */ - protected $validatorGuesser; - - /** - * @param TranslatorInterface $translator - * @param FormTypeGuesserInterface|null $validatorGuesser - */ + protected TranslatorInterface $translator; + + protected ?FormTypeGuesserInterface $validatorGuesser = null; + public function __construct(TranslatorInterface $translator, FormTypeGuesserInterface $validatorGuesser = null) { $this->translator = $translator; $this->validatorGuesser = $validatorGuesser; } - /** - * @param FormInterface $form - * - * @return boolean - */ - public function isRequired(FormInterface $form) + public function isRequired(FormInterface $form): bool { return $form->getConfig()->getOption('required'); } - /** - * @param ExtensionInterface[] $extensions - * @param FormInterface $form - * @param array $schema - * - * @return array - */ - protected function applyExtensions(array $extensions, FormInterface $form, array $schema) + /** @param ExtensionInterface[] $extensions */ + protected function applyExtensions(array $extensions, FormInterface $form, array $schema): array { $newSchema = $schema; foreach ($extensions as $extension) { @@ -67,16 +46,13 @@ protected function applyExtensions(array $extensions, FormInterface $form, array return $newSchema; } - /** - * @param FormInterface $form - * @param array $schema - * @param ExtensionInterface[] $extensions - * @param string $widget - * - * @return array - */ - protected function addCommonSpecs(FormInterface $form, array $schema, $extensions = [], $widget = null) - { + /** @param ExtensionInterface[] $extensions */ + protected function addCommonSpecs( + FormInterface $form, + array $schema, + array $extensions = [], + ?string $widget = null + ): array { $schema = $this->addLabel($form, $schema); $schema = $this->addAttr($form, $schema); $schema = $this->addPattern($form, $schema); @@ -87,14 +63,7 @@ protected function addCommonSpecs(FormInterface $form, array $schema, $extension return $schema; } - - /** - * @param FormInterface $form - * @param array $schema - * - * @return array - */ - protected function addPattern(FormInterface $form, array $schema) + protected function addPattern(FormInterface $form, array $schema): array { if ($attr = $form->getConfig()->getOption('attr')) { if (isset($attr['pattern'])) { @@ -105,13 +74,7 @@ protected function addPattern(FormInterface $form, array $schema) return $schema; } - /** - * @param FormInterface $form - * @param array $schema - * - * @return array - */ - protected function addLabel(FormInterface $form, array $schema) + protected function addLabel(FormInterface $form, array $schema): array { $translationDomain = $form->getConfig()->getOption('translation_domain'); if ($label = $form->getConfig()->getOption('label')) { @@ -123,13 +86,7 @@ protected function addLabel(FormInterface $form, array $schema) return $schema; } - /** - * @param FormInterface $form - * @param array $schema - * - * @return array - */ - protected function addAttr(FormInterface $form, array $schema) + protected function addAttr(FormInterface $form, array $schema): array { if ($attr = $form->getConfig()->getOption('attr')) { $schema['attr'] = $attr; @@ -138,13 +95,7 @@ protected function addAttr(FormInterface $form, array $schema) return $schema; } - /** - * @param FormInterface $form - * @param array $schema - * - * @return array - */ - protected function addDescription(FormInterface $form, array $schema) + protected function addDescription(FormInterface $form, array $schema): array { $formConfig = $form->getConfig(); if ($help = $formConfig->getOption('help', '')) { @@ -160,14 +111,8 @@ protected function addDescription(FormInterface $form, array $schema) return $schema; } - /** - * @param FormInterface $form - * @param array $schema - * @param mixed $configWidget - * - * @return array - */ - protected function addWidget(FormInterface $form, array $schema, $configWidget) + /** @param mixed $configWidget */ + protected function addWidget(FormInterface $form, array $schema, $configWidget): array { if ($liform = $form->getConfig()->getOption('liform')) { if (isset($liform['widget']) && $widget = $liform['widget']) { diff --git a/src/Limenius/Liform/Transformer/ArrayTransformer.php b/src/Limenius/Liform/Transformer/ArrayTransformer.php index ad6a526..fa19742 100644 --- a/src/Limenius/Liform/Transformer/ArrayTransformer.php +++ b/src/Limenius/Liform/Transformer/ArrayTransformer.php @@ -41,7 +41,7 @@ public function __construct(TranslatorInterface $translator, FormTypeGuesserInte /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $children = []; diff --git a/src/Limenius/Liform/Transformer/BooleanTransformer.php b/src/Limenius/Liform/Transformer/BooleanTransformer.php index 7517c24..3d4a547 100644 --- a/src/Limenius/Liform/Transformer/BooleanTransformer.php +++ b/src/Limenius/Liform/Transformer/BooleanTransformer.php @@ -21,7 +21,7 @@ class BooleanTransformer extends AbstractTransformer /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $schema = ['type' => 'boolean']; $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget); diff --git a/src/Limenius/Liform/Transformer/ChoiceTransformer.php b/src/Limenius/Liform/Transformer/ChoiceTransformer.php index 0549f7e..83fa95b 100644 --- a/src/Limenius/Liform/Transformer/ChoiceTransformer.php +++ b/src/Limenius/Liform/Transformer/ChoiceTransformer.php @@ -22,7 +22,7 @@ class ChoiceTransformer extends AbstractTransformer /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $formView = $form->createView(); diff --git a/src/Limenius/Liform/Transformer/CompoundTransformer.php b/src/Limenius/Liform/Transformer/CompoundTransformer.php index d8865d5..8167b9b 100644 --- a/src/Limenius/Liform/Transformer/CompoundTransformer.php +++ b/src/Limenius/Liform/Transformer/CompoundTransformer.php @@ -40,7 +40,7 @@ public function __construct(TranslatorInterface $translator, FormTypeGuesserInte /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $data = []; $order = 1; diff --git a/src/Limenius/Liform/Transformer/IntegerTransformer.php b/src/Limenius/Liform/Transformer/IntegerTransformer.php index 78bf752..9a486f1 100644 --- a/src/Limenius/Liform/Transformer/IntegerTransformer.php +++ b/src/Limenius/Liform/Transformer/IntegerTransformer.php @@ -21,7 +21,7 @@ class IntegerTransformer extends AbstractTransformer /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $schema = ['type' => 'integer']; $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget); diff --git a/src/Limenius/Liform/Transformer/NumberTransformer.php b/src/Limenius/Liform/Transformer/NumberTransformer.php index 3282a49..39368e0 100644 --- a/src/Limenius/Liform/Transformer/NumberTransformer.php +++ b/src/Limenius/Liform/Transformer/NumberTransformer.php @@ -21,7 +21,7 @@ class NumberTransformer extends AbstractTransformer /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $schema = ['type' => 'number']; $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget); diff --git a/src/Limenius/Liform/Transformer/StringTransformer.php b/src/Limenius/Liform/Transformer/StringTransformer.php index e7baa28..da9756d 100644 --- a/src/Limenius/Liform/Transformer/StringTransformer.php +++ b/src/Limenius/Liform/Transformer/StringTransformer.php @@ -22,7 +22,7 @@ class StringTransformer extends AbstractTransformer /** * {@inheritdoc} */ - public function transform(FormInterface $form, array $extensions = [], $widget = null) + public function transform(FormInterface $form, array $extensions = [], $widget = null): array { $schema = ['type' => 'string']; $schema = $this->addCommonSpecs($form, $schema, $extensions, $widget); diff --git a/src/Limenius/Liform/Transformer/TransformerInterface.php b/src/Limenius/Liform/Transformer/TransformerInterface.php index 95ab965..39a4879 100644 --- a/src/Limenius/Liform/Transformer/TransformerInterface.php +++ b/src/Limenius/Liform/Transformer/TransformerInterface.php @@ -19,11 +19,11 @@ interface TransformerInterface { /** - * @param FormInterface $form + * @param FormInterface $form * @param ExtensionInterface[] $extensions - * @param string|null $widget + * @param string|null $widget * * @return array */ - public function transform(FormInterface $form, array $extensions = [], $widget = null); + public function transform(FormInterface $form, array $extensions = [], ?string $widget = null): array; }