Allow access to the feature from the event

bestit · Dec 9, 2020 · d5cf6be · d5cf6be
1 parent 197e86b
commit d5cf6be
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 13 deletions.
diff --git a/src/Event/ContextResolveEvent.php b/src/Event/ContextResolveEvent.php
@@ -13,18 +13,31 @@
  */
 class ContextResolveEvent extends Event
 {
+    /**
+     * The feature
+     *
+     * @var string
+     */
+    private $feature;
+
     /**
      * The context
      *
      * @var Context
      */
     private $context;
 
-    public function __construct(Context $context = null)
+    public function __construct(string $feature, Context $context = null)
     {
+        $this->feature = $feature;
         $this->context = $context ?? new Context();
     }
 
+    public function getFeature(): string
+    {
+        return $this->feature;
+    }
+
     public function getContext(): Context
     {
         return $this->context;

diff --git a/src/Listener/AnnotationSubscriber.php b/src/Listener/AnnotationSubscriber.php
@@ -87,15 +87,17 @@ public function onKernelController(ControllerEvent $event)
             return;
         }
 
-        $context = null;
-        if (null !== $this->eventDispatcher) {
-            $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent());
-            $context = $contextEvent->getContext();
-        }
+
 
         $object = new ReflectionClass($controller[0]);
         foreach ($this->reader->getClassAnnotations($object) as $annotation) {
             if ($annotation instanceof Feature) {
+                $context = null;
+                if (null !== $this->eventDispatcher) {
+                    $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent($annotation->name));
+                    $context = $contextEvent->getContext();
+                }
+
                 if (!$this->manager->isActive($annotation->name, $context)) {
                     throw new NotFoundHttpException('Feature for this class is not active.');
                 }
@@ -104,6 +106,11 @@ public function onKernelController(ControllerEvent $event)
 
         $method = $object->getMethod($controller[1]);
         foreach ($this->reader->getMethodAnnotations($method) as $annotation) {
+            $context = null;
+            if (null !== $this->eventDispatcher) {
+                $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent($annotation->name));
+                $context = $contextEvent->getContext();
+            }
             if ($annotation instanceof Feature) {
                 if (!$this->manager->isActive($annotation->name, $context)) {
                     throw new NotFoundHttpException('Feature for this method is not active.');

diff --git a/src/Listener/RoutingMetadataSubscriber.php b/src/Listener/RoutingMetadataSubscriber.php
@@ -65,14 +65,13 @@ public function onKernelController(ControllerEvent $event)
             return;
         }
 
-        $context = null;
-        if (null !== $this->eventDispatcher) {
-            $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent());
-            $context = $contextEvent->getContext();
-        }
-
         $featureNames = (array) $event->getRequest()->attributes->get(static::FEATURE_KEY);
         foreach ($featureNames as $featureName) {
+            $context = null;
+            if (null !== $this->eventDispatcher) {
+                $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent($featureName));
+                $context = $contextEvent->getContext();
+            }
             if (!$this->manager->isActive($featureName, $context)) {
                 throw new NotFoundHttpException('Feature for this class is not active.');
             }

diff --git a/src/Twig/ToggleExtension.php b/src/Twig/ToggleExtension.php
@@ -60,7 +60,7 @@ public function isActive($name, array $contextValues = [])
         }
 
         if (null !== $this->eventDispatcher) {
-            $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent($context));
+            $contextEvent = $this->eventDispatcher->dispatch(new ContextResolveEvent($name, $context));
             $context = $contextEvent->getContext();
         }
 

diff --git a/tests/Listener/AnnotationSubscriberTest.php b/tests/Listener/AnnotationSubscriberTest.php
@@ -168,6 +168,7 @@ public function testEventIsDispatchedWhenEventDispatcherExists()
         $manager->method('isActive')->with('feature_abc', $context)->willReturn(true);
 
         $listener = function (ContextResolveEvent $event) use ($context) {
+            $this->assertSame('feature_abc', $event->getFeature());
             $this->assertNotSame($event->getContext(), $context);
             $event->setContext($context);
             $this->assertSame($event->getContext(), $context);

diff --git a/tests/Listener/RoutingMetadataSubscriberTest.php b/tests/Listener/RoutingMetadataSubscriberTest.php
@@ -208,6 +208,7 @@ public function testEventIsDispatchedWhenEventDispatcherExists()
             ->willReturn(true);
 
         $listener = function (ContextResolveEvent $event) use ($context) {
+            $this->assertSame('feature_abc', $event->getFeature());
             $this->assertNotSame($event->getContext(), $context);
             $event->setContext($context);
             $this->assertSame($event->getContext(), $context);

diff --git a/tests/Twig/ToggleExtensionTest.php b/tests/Twig/ToggleExtensionTest.php
@@ -88,6 +88,7 @@ public function testEventIsDispatchedWhenEventDispatcherExists()
         $context = new Context();
 
         $listener = function (ContextResolveEvent $event) use ($context) {
+            $this->assertSame('feature_foo', $event->getFeature());
             $this->assertNotSame($event->getContext(), $context);
             $event->setContext($context);
             $this->assertSame($event->getContext(), $context);