remove annotations

Author: kbond

src/LiveComponent/composer.json

@@ -40,7 +40,8 @@
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/orm": "^2.7",
         "zenstruck/foundry": "^1.10",
-        "zenstruck/browser": "^0.5.0"
+        "zenstruck/browser": "^0.5.0",
+        "doctrine/annotations": "^1.0"
     },
     "extra": {
         "branch-alias": {

src/LiveComponent/src/Attribute/AsLiveComponent.php

@@ -21,4 +21,103 @@
 #[\Attribute(\Attribute::TARGET_CLASS)]
 final class AsLiveComponent extends AsTwigComponent
 {
+    /**
+     * @internal
+     *
+     * @param string|object $classOrObject
+     *
+     * @return LivePropContext[]
+     */
+    public static function liveProps($classOrObject): \Traversable
+    {
+        foreach (self::propertiesFor($classOrObject) as $property) {
+            if ($attribute = $property->getAttributes(LiveProp::class)[0] ?? null) {
+                yield new LivePropContext($attribute->newInstance(), $property);
+            }
+        }
+    }
+
+    /**
+     * @internal
+     *
+     * @param string|object $classOrObject
+     */
+    public static function isActionAllowed($classOrObject, string $action): bool
+    {
+        foreach (self::attributeMethodsFor(LiveAction::class, $classOrObject) as $method) {
+            if ($action === $method->getName()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @internal
+     *
+     * @param string|object $classOrObject
+     *
+     * @return \ReflectionMethod[]
+     */
+    public static function beforeReRenderMethods($classOrObject): \Traversable
+    {
+        yield from self::attributeMethodsFor(BeforeReRender::class, $classOrObject);
+    }
+
+    /**
+     * @internal
+     *
+     * @param string|object $classOrObject
+     *
+     * @return \ReflectionMethod[]
+     */
+    public static function postHydrateMethods($classOrObject): \Traversable
+    {
+        yield from self::attributeMethodsFor(PostHydrate::class, $classOrObject);
+    }
+
+    /**
+     * @internal
+     *
+     * @param string|object $classOrObject
+     *
+     * @return \ReflectionMethod[]
+     */
+    public static function preDehydrateMethods($classOrObject): \Traversable
+    {
+        yield from self::attributeMethodsFor(PreDehydrate::class, $classOrObject);
+    }
+
+    /**
+     * @param string|object $classOrObject
+     *
+     * @return \ReflectionMethod[]
+     */
+    private static function attributeMethodsFor(string $attribute, $classOrObject): \Traversable
+    {
+        foreach ((new \ReflectionClass($classOrObject))->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+            if ($method->getAttributes($attribute)[0] ?? null) {
+                yield $method;
+            }
+        }
+    }
+
+    /**
+     * @param string|object $classOrObject
+     *
+     * @return \ReflectionProperty[]
+     */
+    private static function propertiesFor($classOrObject): \Traversable
+    {
+        $class = $classOrObject instanceof \ReflectionClass ? $classOrObject : new \ReflectionClass($classOrObject);
+
+        foreach ($class->getProperties() as $property) {
+            yield $property;
+        }
+
+        if ($parent = $class->getParentClass()) {
+            yield from self::propertiesFor($parent);
+        }
+    }
 }

src/LiveComponent/src/Attribute/BeforeReRender.php

@@ -17,11 +17,9 @@
  * This hook ONLY happens when rendering via HTTP: it does
  * not happen during the initial render of a component.
  *
- * @Annotation
- * @Target("METHOD")
- *
  * @experimental
  */
+#[\Attribute(\Attribute::TARGET_METHOD)]
 final class BeforeReRender
 {
 }

src/LiveComponent/src/Attribute/LiveAction.php

@@ -12,11 +12,9 @@
 namespace Symfony\UX\LiveComponent\Attribute;
 
 /**
- * @Annotation
- * @Target("METHOD")
- *
  * @experimental
  */
+#[\Attribute(\Attribute::TARGET_METHOD)]
 final class LiveAction
 {
 }

src/LiveComponent/src/Attribute/LiveProp.php

@@ -12,24 +12,19 @@
 namespace Symfony\UX\LiveComponent\Attribute;
 
 /**
- * @Annotation
- * @Target("PROPERTY")
- *
  * @experimental
  */
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
 final class LiveProp
 {
-    /** @var bool */
-    private $writable = false;
+    private bool $writable;
 
     /** @var string[] */
-    private $exposed = [];
+    private array $exposed;
 
-    /** @var string|null */
-    private $hydrateWith = null;
+    private ?string $hydrateWith;
 
-    /** @var string|null */
-    private $dehydrateWith = null;
+    private ?string $dehydrateWith;
 
     /**
      *The "frontend" field name that should be used for this property.
@@ -39,22 +34,21 @@ final class LiveProp
      *
      * If you pass a string that ends in () - like "getFieldName()" - that
      * method on the component will be called to determine this.
-     *
-     * @var string|null
      */
-    private $fieldName = null;
-
-    public function __construct(array $values)
-    {
-        $validOptions = ['writable', 'exposed', 'hydrateWith', 'dehydrateWith', 'fieldName'];
-
-        foreach ($values as $name => $value) {
-            if (!\in_array($name, $validOptions)) {
-                throw new \InvalidArgumentException(sprintf('Unknown option "%s" passed to LiveProp. Valid options are: %s.', $name, implode(', ', $validOptions)));
-            }
-
-            $this->$name = $value;
-        }
+    private ?string $fieldName;
+
+    public function __construct(
+        bool $writable = false,
+        array $exposed = [],
+        ?string $hydrateWith = null,
+        ?string $dehydrateWith = null,
+        ?string $fieldName = null
+    ) {
+        $this->writable = $writable;
+        $this->exposed = $exposed;
+        $this->hydrateWith = $hydrateWith;
+        $this->dehydrateWith = $dehydrateWith;
+        $this->fieldName = $fieldName;
     }
 
     public function isReadonly(): bool

src/LiveComponent/src/Attribute/LivePropContext.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\UX\LiveComponent\Attribute;
+
+/**
+ * @author Kevin Bond <[email protected]>
+ *
+ * @experimental
+ *
+ * @internal
+ */
+final class LivePropContext
+{
+    private LiveProp $liveProp;
+    private \ReflectionProperty $reflectionProperty;
+
+    public function __construct(LiveProp $liveProp, \ReflectionProperty $reflectionProperty)
+    {
+        $this->liveProp = $liveProp;
+        $this->reflectionProperty = $reflectionProperty;
+    }
+
+    public function liveProp(): LiveProp
+    {
+        return $this->liveProp;
+    }
+
+    public function reflectionProperty(): \ReflectionProperty
+    {
+        return $this->reflectionProperty;
+    }
+}

src/LiveComponent/src/Attribute/PostHydrate.php

@@ -12,11 +12,9 @@
 namespace Symfony\UX\LiveComponent\Attribute;
 
 /**
- * @Annotation
- * @Target("METHOD")
- *
  * @experimental
  */
+#[\Attribute(\Attribute::TARGET_METHOD)]
 final class PostHydrate
 {
 }

src/LiveComponent/src/Attribute/PreDehydrate.php

@@ -12,11 +12,9 @@
 namespace Symfony\UX\LiveComponent\Attribute;
 
 /**
- * @Annotation
- * @Target("METHOD")
- *
  * @experimental
  */
+#[\Attribute(\Attribute::TARGET_METHOD)]
 final class PreDehydrate
 {
 }

src/LiveComponent/src/DependencyInjection/LiveComponentExtension.php

@@ -65,7 +65,6 @@ public function load(array $configs, ContainerBuilder $container): void
             ->setArguments([
                 new TaggedIteratorArgument('twig.component.property_hydrator'),
                 new Reference('property_accessor'),
-                new Reference('annotation_reader'),
                 '%kernel.secret%',
             ])
         ;

src/LiveComponent/src/EventListener/LiveComponentSubscriber.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\UX\LiveComponent\EventListener;
 
-use Doctrine\Common\Annotations\Reader;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -29,7 +28,7 @@
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
-use Symfony\UX\LiveComponent\Attribute\BeforeReRender;
+use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\DefaultComponentController;
 use Symfony\UX\LiveComponent\LiveComponentHydrator;
 use Symfony\UX\TwigComponent\ComponentFactory;
@@ -61,7 +60,6 @@ public static function getSubscribedServices(): array
             ComponentFactory::class,
             ComponentRenderer::class,
             LiveComponentHydrator::class,
-            Reader::class,
             '?'.CsrfTokenManagerInterface::class,
         ];
     }
@@ -99,7 +97,7 @@ public function onKernelRequest(RequestEvent $event)
             throw new BadRequestHttpException('Invalid CSRF token.');
         }
 
-        if (!array_key_exists($componentName, $this->componentServiceMap)) {
+        if (!\array_key_exists($componentName, $this->componentServiceMap)) {
             throw new NotFoundHttpException(sprintf('Component "%s" not found.', $componentName));
         }
 
@@ -132,8 +130,8 @@ public function onKernelController(ControllerEvent $event)
             $component = $component->getComponent();
         }
 
-        if (null !== $action && !$this->container->get(LiveComponentHydrator::class)->isActionAllowed($component, $action)) {
-            throw new NotFoundHttpException(sprintf('The action "%s" either doesn\'t exist or is not allowed in "%s". Make sure it exist and has the LiveProp attribute/annotation above it.', $action, \get_class($component)));
+        if (null !== $action && !AsLiveComponent::isActionAllowed($component, $action)) {
+            throw new NotFoundHttpException(sprintf('The action "%s" either doesn\'t exist or is not allowed in "%s". Make sure it exist and has the LiveAction attribute above it.', $action, \get_class($component)));
         }
 
         $this->container->get(LiveComponentHydrator::class)->hydrate($component, $data);
@@ -214,7 +212,7 @@ public static function getSubscribedEvents()
 
     private function createResponse(object $component, Request $request): Response
     {
-        foreach ($this->beforeReRenderMethods($component) as $method) {
+        foreach (AsLiveComponent::beforeReRenderMethods($component) as $method) {
             $component->{$method->name}();
         }
 
@@ -243,16 +241,4 @@ private function isLiveComponentJsonRequest(Request $request): bool
     {
         return \in_array($request->getPreferredFormat(), [self::JSON_FORMAT, 'json'], true);
     }
-
-    /**
-     * @return \ReflectionMethod[]
-     */
-    private function beforeReRenderMethods(object $component): iterable
-    {
-        foreach ((new \ReflectionClass($component))->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-            if ($this->container->get(Reader::class)->getMethodAnnotation($method, BeforeReRender::class)) {
-                yield $method;
-            }
-        }
-    }
 }