Make classes final if possible

matthiasnoback · matthiasnoback · commit 181771d301da · 2020-05-08T09:52:08.000+02:00
Also, redefine the hierarchy a bit to allow for the rule:
Either a class is final, or it is abstract.
diff --git a/src/Bridge/FormFactory/ConsoleFormWithDefaultValuesAndOptionsFactory.php b/src/Bridge/FormFactory/ConsoleFormWithDefaultValuesAndOptionsFactory.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Form\FormRegistryInterface;
 use Symfony\Component\Form\Test\FormBuilderInterface;
 
-class ConsoleFormWithDefaultValuesAndOptionsFactory implements ConsoleFormFactory
+final class ConsoleFormWithDefaultValuesAndOptionsFactory implements ConsoleFormFactory
 {
     /**
      * @var FormFactoryInterface
diff --git a/src/Bridge/Interaction/CollectionInteractor.php b/src/Bridge/Interaction/CollectionInteractor.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormInterface;
 
-class CollectionInteractor implements FormInteractor
+final class CollectionInteractor implements FormInteractor
 {
     /**
      * @var FormInteractor
diff --git a/src/Bridge/Interaction/CompoundInteractor.php b/src/Bridge/Interaction/CompoundInteractor.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Form\FormInterface;
 
-class CompoundInteractor implements FormInteractor
+final class CompoundInteractor implements FormInteractor
 {
     /**
      * @var FormInteractor
diff --git a/src/Bridge/Interaction/DelegatingInteractor.php b/src/Bridge/Interaction/DelegatingInteractor.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Form\FormInterface;
 
-class DelegatingInteractor implements FormInteractor
+final class DelegatingInteractor implements FormInteractor
 {
     /**
      * @var FormInteractor[]
diff --git a/src/Bridge/Interaction/Exception/CanNotInteractWithForm.php b/src/Bridge/Interaction/Exception/CanNotInteractWithForm.php
@@ -4,6 +4,6 @@
 
 use LogicException;
 
-class CanNotInteractWithForm extends LogicException
+final class CanNotInteractWithForm extends LogicException
 {
 }
diff --git a/src/Bridge/Interaction/Exception/FormNotReadyForInteraction.php b/src/Bridge/Interaction/Exception/FormNotReadyForInteraction.php
@@ -4,6 +4,6 @@
 
 use LogicException;
 
-class FormNotReadyForInteraction extends LogicException
+final class FormNotReadyForInteraction extends LogicException
 {
 }
diff --git a/src/Bridge/Interaction/Exception/NoNeedToInteractWithForm.php b/src/Bridge/Interaction/Exception/NoNeedToInteractWithForm.php
@@ -4,6 +4,6 @@
 
 use LogicException;
 
-class NoNeedToInteractWithForm extends LogicException
+final class NoNeedToInteractWithForm extends LogicException
 {
 }
diff --git a/src/Bridge/Interaction/FieldInteractor.php b/src/Bridge/Interaction/FieldInteractor.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Form\FormInterface;
 
-class FieldInteractor implements FormInteractor
+final class FieldInteractor implements FormInteractor
 {
     /**
      * @var TransformerResolver
diff --git a/src/Bridge/Interaction/FieldWithNoInteractionInteractor.php b/src/Bridge/Interaction/FieldWithNoInteractionInteractor.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\FormInterface;
 
-class FieldWithNoInteractionInteractor implements FormInteractor
+final class FieldWithNoInteractionInteractor implements FormInteractor
 {
     /**
      * @throws NoNeedToInteractWithForm
diff --git a/src/Bridge/Interaction/NonInteractiveRootInteractor.php b/src/Bridge/Interaction/NonInteractiveRootInteractor.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormInterface;
 
-class NonInteractiveRootInteractor implements FormInteractor
+final class NonInteractiveRootInteractor implements FormInteractor
 {
     /**
      * @throws CanNotInteractWithForm If isn't a root form or is the input is interactive
diff --git a/src/Bridge/Transformer/AbstractTextInputBasedTransformer.php b/src/Bridge/Transformer/AbstractTextInputBasedTransformer.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Matthias\SymfonyConsoleForm\Bridge\Transformer;
+
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Form\FormInterface;
+
+abstract class AbstractTextInputBasedTransformer extends AbstractTransformer
+{
+    public function transform(FormInterface $form): Question
+    {
+        return new Question($this->questionFrom($form), $this->defaultValueFrom($form));
+    }
+}
diff --git a/src/Bridge/Transformer/CheckboxTransformer.php b/src/Bridge/Transformer/CheckboxTransformer.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Form\FormInterface;
 
-class CheckboxTransformer extends AbstractTransformer
+final class CheckboxTransformer extends AbstractTransformer
 {
     public function transform(FormInterface $form): Question
     {
diff --git a/src/Bridge/Transformer/ChoiceTransformer.php b/src/Bridge/Transformer/ChoiceTransformer.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Form\FormInterface;
 
-class ChoiceTransformer extends AbstractTransformer
+final class ChoiceTransformer extends AbstractTransformer
 {
     public function transform(FormInterface $form): Question
     {
diff --git a/src/Bridge/Transformer/DateTimeTransformer.php b/src/Bridge/Transformer/DateTimeTransformer.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Form\FormInterface;
 
-class DateTimeTransformer extends TextTransformer
+final class DateTimeTransformer extends AbstractTextInputBasedTransformer
 {
     protected function defaultValueFrom(FormInterface $form)
     {
diff --git a/src/Bridge/Transformer/NumberTransformer.php b/src/Bridge/Transformer/NumberTransformer.php
@@ -3,6 +3,6 @@
 
 namespace Matthias\SymfonyConsoleForm\Bridge\Transformer;
 
-final class NumberTransformer extends TextTransformer
+final class NumberTransformer extends AbstractTextInputBasedTransformer
 {
 }
diff --git a/src/Bridge/Transformer/PasswordTransformer.php b/src/Bridge/Transformer/PasswordTransformer.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Form\FormInterface;
 
-class PasswordTransformer extends TextTransformer
+final class PasswordTransformer extends AbstractTextInputBasedTransformer
 {
     public function transform(FormInterface $form): Question
     {
diff --git a/src/Bridge/Transformer/TextTransformer.php b/src/Bridge/Transformer/TextTransformer.php
@@ -2,13 +2,6 @@
 
 namespace Matthias\SymfonyConsoleForm\Bridge\Transformer;
 
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Form\FormInterface;
-
-class TextTransformer extends AbstractTransformer
+final class TextTransformer extends AbstractTextInputBasedTransformer
 {
-    public function transform(FormInterface $form): Question
-    {
-        return new Question($this->questionFrom($form), $this->defaultValueFrom($form));
-    }
 }
diff --git a/src/Bridge/Transformer/TypeAncestryBasedTransformerResolver.php b/src/Bridge/Transformer/TypeAncestryBasedTransformerResolver.php
@@ -6,7 +6,7 @@
 use Matthias\SymfonyConsoleForm\Form\FormUtil;
 use Symfony\Component\Form\FormInterface;
 
-class TypeAncestryBasedTransformerResolver implements TransformerResolver
+final class TypeAncestryBasedTransformerResolver implements TransformerResolver
 {
     /**
      * @var FormToQuestionTransformer[]
diff --git a/src/Bundle/RegisterHelpersPass.php b/src/Bundle/RegisterHelpersPass.php
@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class RegisterHelpersPass implements CompilerPassInterface
+final class RegisterHelpersPass implements CompilerPassInterface
 {
     /**
      * @var string
diff --git a/src/Bundle/RegisterOutputFormatterStylesPass.php b/src/Bundle/RegisterOutputFormatterStylesPass.php
@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class RegisterOutputFormatterStylesPass implements CompilerPassInterface
+final class RegisterOutputFormatterStylesPass implements CompilerPassInterface
 {
     /**
      * @var string
diff --git a/src/Bundle/RegisterTransformersPass.php b/src/Bundle/RegisterTransformersPass.php
@@ -6,7 +6,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class RegisterTransformersPass implements CompilerPassInterface
+final class RegisterTransformersPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
diff --git a/src/Bundle/SymfonyConsoleFormBundle.php b/src/Bundle/SymfonyConsoleFormBundle.php
@@ -5,7 +5,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class SymfonyConsoleFormBundle extends Bundle
+final class SymfonyConsoleFormBundle extends Bundle
 {
     public function getContainerExtension()
     {
diff --git a/src/Bundle/SymfonyConsoleFormExtension.php b/src/Bundle/SymfonyConsoleFormExtension.php
@@ -7,7 +7,7 @@
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class SymfonyConsoleFormExtension extends Extension
+final class SymfonyConsoleFormExtension extends Extension
 {
     public function load(array $config, ContainerBuilder $container): void
     {
diff --git a/src/Console/EventListener/HandleFormBasedCommandEventListener.php b/src/Console/EventListener/HandleFormBasedCommandEventListener.php
@@ -6,7 +6,7 @@
 use Matthias\SymfonyConsoleForm\Console\Helper\FormHelper;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
-class HandleFormBasedCommandEventListener
+final class HandleFormBasedCommandEventListener
 {
     /**
      * @var FormHelper
diff --git a/src/Console/EventListener/RegisterHelpersEventListener.php b/src/Console/EventListener/RegisterHelpersEventListener.php
@@ -6,7 +6,7 @@
 use RuntimeException;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
-class RegisterHelpersEventListener
+final class RegisterHelpersEventListener
 {
     /**
      * @var HelperCollection
diff --git a/src/Console/EventListener/RegisterOutputFormatterStylesEventListener.php b/src/Console/EventListener/RegisterOutputFormatterStylesEventListener.php
@@ -5,7 +5,7 @@
 use Matthias\SymfonyConsoleForm\Console\Formatter\StylesCollection;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
-class RegisterOutputFormatterStylesEventListener
+final class RegisterOutputFormatterStylesEventListener
 {
     /**
      * @var StylesCollection
diff --git a/src/Console/EventListener/SetInputDefinitionOfFormBasedCommandEventListener.php b/src/Console/EventListener/SetInputDefinitionOfFormBasedCommandEventListener.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 
-class SetInputDefinitionOfFormBasedCommandEventListener
+final class SetInputDefinitionOfFormBasedCommandEventListener
 {
     /**
      * @var InputDefinitionFactory
diff --git a/src/Console/Formatter/Format.php b/src/Console/Formatter/Format.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Format
+final class Format
 {
     /**
      * @param mixed $defaultValue
diff --git a/src/Console/Formatter/StylesCollection.php b/src/Console/Formatter/StylesCollection.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface;
 
-class StylesCollection
+final class StylesCollection
 {
     /**
      * @var OutputFormatterStyleInterface[]
diff --git a/src/Console/Helper/FormHelper.php b/src/Console/Helper/FormHelper.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 
-class FormHelper extends Helper
+final class FormHelper extends Helper
 {
     private $formFactory;
     private $formInteractor;
diff --git a/src/Console/Helper/HelperCollection.php b/src/Console/Helper/HelperCollection.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Helper\HelperInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 
-class HelperCollection
+final class HelperCollection
 {
     /**
      * @var array & HelperInterface[]
diff --git a/src/Console/Helper/Question/AlwaysReturnKeyOfChoiceQuestion.php b/src/Console/Helper/Question/AlwaysReturnKeyOfChoiceQuestion.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 
-class AlwaysReturnKeyOfChoiceQuestion extends ChoiceQuestion
+final class AlwaysReturnKeyOfChoiceQuestion extends ChoiceQuestion
 {
     /**
      * @var ChoiceView[]

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Symfony\Component\Form\FormRegistryInterface;`
`11`	`11`	`use Symfony\Component\Form\Test\FormBuilderInterface;`
`12`	`12`
`13`		`-class ConsoleFormWithDefaultValuesAndOptionsFactory implements ConsoleFormFactory`
	`13`	`+final class ConsoleFormWithDefaultValuesAndOptionsFactory implements ConsoleFormFactory`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`	`16`	`* @var FormFactoryInterface`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\Form\Extension\Core\Type\CollectionType;`
`16`	`16`	`use Symfony\Component\Form\FormInterface;`
`17`	`17`
`18`		`-class CollectionInteractor implements FormInteractor`
	`18`	`+final class CollectionInteractor implements FormInteractor`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @var FormInteractor`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Symfony\Component\Console\Output\OutputInterface;`
`9`	`9`	`use Symfony\Component\Form\FormInterface;`
`10`	`10`
`11`		`-class DelegatingInteractor implements FormInteractor`
	`11`	`+final class DelegatingInteractor implements FormInteractor`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @var FormInteractor[]`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`use LogicException;`
`6`	`6`
`7`		`-class CanNotInteractWithForm extends LogicException`
	`7`	`+final class CanNotInteractWithForm extends LogicException`
`8`	`8`	`{`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`use LogicException;`
`6`	`6`
`7`		`-class FormNotReadyForInteraction extends LogicException`
	`7`	`+final class FormNotReadyForInteraction extends LogicException`
`8`	`8`	`{`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`use LogicException;`
`6`	`6`
`7`		`-class NoNeedToInteractWithForm extends LogicException`
	`7`	`+final class NoNeedToInteractWithForm extends LogicException`
`8`	`8`	`{`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Symfony\Component\Console\Output\OutputInterface;`
`12`	`12`	`use Symfony\Component\Form\FormInterface;`
`13`	`13`
`14`		`-class FieldInteractor implements FormInteractor`
	`14`	`+final class FieldInteractor implements FormInteractor`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @var TransformerResolver`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Symfony\Component\Form\Extension\Core\Type\RepeatedType;`
`10`	`10`	`use Symfony\Component\Form\FormInterface;`
`11`	`11`
`12`		`-class NonInteractiveRootInteractor implements FormInteractor`
	`12`	`+final class NonInteractiveRootInteractor implements FormInteractor`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`	`15`	`* @throws CanNotInteractWithForm If isn't a root form or is the input is interactive`