general cleanup

Author: kbond

src/LiveComponent/src/ComponentValidator.php

@@ -12,7 +12,6 @@
 namespace Symfony\UX\LiveComponent;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
@@ -26,8 +25,7 @@
  */
 class ComponentValidator implements ComponentValidatorInterface, ServiceSubscriberInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {
@@ -88,16 +86,10 @@ private function getValidator(): ValidatorInterface
         return $this->container->get('validator');
     }
 
-    private function getPropertyAccessor(): PropertyAccessorInterface
-    {
-        return $this->container->get('property_accessor');
-    }
-
     public static function getSubscribedServices(): array
     {
         return [
             'validator' => ValidatorInterface::class,
-            'property_accessor' => PropertyAccessorInterface::class,
         ];
     }
 }

src/LiveComponent/src/ComponentWithFormTrait.php

@@ -30,41 +30,33 @@ trait ComponentWithFormTrait
 
     /**
      * Holds the name prefix the form uses.
-     *
-     * @LiveProp()
      */
+    #[LiveProp]
     public ?string $formName = null;
 
     /**
      * Holds the raw form values.
-     *
-     * @LiveProp(writable=true, fieldName="getFormName()")
      */
+    #[LiveProp(writable: true, fieldName: 'getFormName()')]
     public ?array $formValues = null;
 
     /**
      * Tracks whether this entire component has been validated.
      *
      * This is used to know if validation should be automatically applied
      * when rendering.
-     *
-     * @LiveProp(writable=true)
-     *
-     * @var bool
      */
-    public $isValidated = false;
+    #[LiveProp(writable: true)]
+    public bool $isValidated = false;
 
     /**
      * Tracks which specific fields have been validated.
      *
      * Instead of validating the entire object (isValidated),
      * the component can be validated, field-by-field.
-     *
-     * @LiveProp(writable=true)
-     *
-     * @var array
      */
-    public $validatedFields = [];
+    #[LiveProp(writable: true)]
+    public array $validatedFields = [];
 
     /**
      * Return the full, top-level, Form object that this component uses.
@@ -90,10 +82,9 @@ public function mount(?FormView $form = null)
      * This primarily applies to a re-render where $actionName is null.
      * But, in the event that there is an action and the form was
      * not submitted manually, it will be submitted here.
-     *
-     * @BeforeReRender()
      */
-    public function submitFormOnRender()
+    #[BeforeReRender]
+    public function submitFormOnRender(): void
     {
         if (!$this->getFormInstance()->isSubmitted()) {
             $this->submitForm(false);
@@ -119,7 +110,7 @@ public function getForm(): FormView
      * don't need to call this directly: the form will be set for
      * you from your instantiateForm() method.
      */
-    public function setForm(FormView $form)
+    public function setForm(FormView $form): void
     {
         $this->formView = $form;
     }
@@ -142,7 +133,7 @@ public function getFormValues(): array
         return $this->formValues;
     }
 
-    private function submitForm(bool $validateAll = true)
+    private function submitForm(bool $validateAll = true): void
     {
         $this->getFormInstance()->submit($this->formValues);
 
@@ -201,7 +192,7 @@ private function getFormInstance(): FormInterface
         return $this->formInstance;
     }
 
-    private function clearErrorsForNonValidatedFields(Form $form, $currentPath = '')
+    private function clearErrorsForNonValidatedFields(Form $form, $currentPath = ''): void
     {
         if (!$currentPath || !\in_array($currentPath, $this->validatedFields, true)) {
             $form->clearErrors();

src/LiveComponent/src/DependencyInjection/LiveComponentExtension.php

@@ -89,7 +89,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $container->register(ComponentValidator::class)
             ->addTag('container.service_subscriber', ['key' => 'validator', 'id' => 'validator'])
-            ->addTag('container.service_subscriber', ['key' => 'property_accessor', 'id' => 'property_accessor'])
         ;
 
         $container->setAlias(ComponentValidatorInterface::class, ComponentValidator::class);

src/LiveComponent/src/EventListener/LiveComponentSubscriber.php

@@ -65,9 +65,10 @@ public static function getSubscribedServices(): array
         ];
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
+
         if (!$this->isLiveComponentRequest($request)) {
             return;
         }
@@ -105,7 +106,7 @@ public function onKernelRequest(RequestEvent $event)
         $request->attributes->set('_controller', sprintf('%s::%s', $this->componentServiceMap[$componentName], $action));
     }
 
-    public function onKernelController(ControllerEvent $event)
+    public function onKernelController(ControllerEvent $event): void
     {
         $request = $event->getRequest();
 
@@ -144,7 +145,7 @@ public function onKernelController(ControllerEvent $event)
         $request->attributes->set('_component', $component);
     }
 
-    public function onKernelView(ViewEvent $event)
+    public function onKernelView(ViewEvent $event): void
     {
         $request = $event->getRequest();
         if (!$this->isLiveComponentRequest($request)) {
@@ -156,9 +157,10 @@ public function onKernelView(ViewEvent $event)
         $event->setResponse($response);
     }
 
-    public function onKernelException(ExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event): void
     {
         $request = $event->getRequest();
+
         if (!$this->isLiveComponentRequest($request)) {
             return;
         }
@@ -200,7 +202,7 @@ public function onKernelResponse(ResponseEvent $event): void
         ]));
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             RequestEvent::class => 'onKernelRequest',

src/LiveComponent/src/Hydrator/DoctrineEntityPropertyHydrator.php

@@ -24,7 +24,7 @@
 final class DoctrineEntityPropertyHydrator implements PropertyHydratorInterface
 {
     /** @var ManagerRegistry[] */
-    private $managerRegistries;
+    private iterable $managerRegistries;
 
     /**
      * @param ManagerRegistry[] $managerRegistries

src/LiveComponent/src/Hydrator/NormalizerBridgePropertyHydrator.php

@@ -24,8 +24,11 @@
 final class NormalizerBridgePropertyHydrator implements PropertyHydratorInterface
 {
     /** @var NormalizerInterface|DenormalizerInterface */
-    private $normalizer;
+    private NormalizerInterface $normalizer;
 
+    /**
+     * @param NormalizerInterface|DenormalizerInterface $normalizer
+     */
     public function __construct(NormalizerInterface $normalizer)
     {
         if (!$normalizer instanceof DenormalizerInterface) {

src/LiveComponent/src/Twig/LiveComponentRuntime.php

@@ -24,14 +24,9 @@
  */
 final class LiveComponentRuntime
 {
-    /** @var LiveComponentHydrator */
-    private $hydrator;
-
-    /** @var UrlGeneratorInterface */
-    private $urlGenerator;
-
-    /** @var CsrfTokenManagerInterface|null */
-    private $csrfTokenManager;
+    private LiveComponentHydrator $hydrator;
+    private UrlGeneratorInterface $urlGenerator;
+    private ?CsrfTokenManagerInterface $csrfTokenManager;
 
     public function __construct(LiveComponentHydrator $hydrator, UrlGeneratorInterface $urlGenerator, CsrfTokenManagerInterface $csrfTokenManager = null)
     {

src/LiveComponent/src/ValidatableComponentTrait.php

@@ -23,35 +23,26 @@
  */
 trait ValidatableComponentTrait
 {
-    /** @var ComponentValidatorInterface|null */
-    private $componentValidator;
-
-    /** @var array */
-    private $validationErrors = [];
+    private ?ComponentValidatorInterface $componentValidator = null;
+    private array $validationErrors = [];
 
     /**
      * Tracks whether this entire component has been validated.
      *
      * This is used to know if validation should be automatically applied
      * when rendering.
-     *
-     * @LiveProp(writable=true)
-     *
-     * @var bool
      */
-    public $isValidated = false;
+    #[LiveProp(writable: true)]
+    public bool $isValidated = false;
 
     /**
      * Tracks which specific fields have been validated.
      *
      * Instead of validating the entire object (isValidated),
      * the component can be validated, field-by-field.
-     *
-     * @LiveProp(writable=true)
-     *
-     * @var array
      */
-    public $validatedFields = [];
+    #[LiveProp(writable: true)]
+    public array $validatedFields = [];
 
     /**
      * Validate the entire component.
@@ -123,9 +114,7 @@ public function clearValidation(): void
         $this->validationErrors = [];
     }
 
-    /**
-     * @PostHydrate()
-     */
+    #[PostHydrate]
     public function validateAfterHydration()
     {
         if ($this->isValidated) {