fix(service-alias): Service alias doesn't work with :: (#3)

Author: Melfo01

src/EventListener/ReadRateLimitAnnotationListener.php

@@ -49,17 +49,16 @@ public function onKernelController(ControllerEvent $event): void
         if (null === $controllerAttribute || !is_string($controllerAttribute)) {
             return;
         }
-        $controllerAttributeParts = explode('::', $controllerAttribute);
+        // services alias can be used with 'service.alias:functionName' or 'service.alias::functionName'
+        $controllerAttributeParts = explode(':', str_replace('::', ':', $controllerAttribute));
         $controllerName = $controllerAttributeParts[0] ?? '';
         $methodName = $controllerAttributeParts[1] ?? null;
 
         if (!class_exists($controllerName)) {
             // If controller attribute is an alias instead of a class name
-            $serviceIdAttributeParts = explode(':', $controllerName);
-            if (null === ($controllerName = $this->container->get($serviceIdAttributeParts[0]))) {
+            if (null === ($controllerName = $this->container->get($controllerAttributeParts[0]))) {
                 throw new \InvalidArgumentException('Parameter _controller from request : "'.$controllerAttribute.'" do not contains a valid class name');
             }
-            $methodName = $serviceIdAttributeParts[1] ?? null;
         }
         $reflection = new \ReflectionClass($controllerName);
         $annotation = $this->annotationReader->getMethodAnnotation($reflection->getMethod((string) ($methodName ?? '__invoke')), RateLimitAnnotation::class);

tests/EventListener/ReadRateLimitAnnotationListenerTest.php

@@ -61,15 +61,18 @@ public function testItDoesNotSetRateLimitIfNoAnnotationProvided(): void
         $this->assertFalse($event->getRequest()->attributes->has('_rate_limit'));
     }
 
-    public function testItSetRateLimitIfNoAnnotationProvidedAndServiceAliasIsUsed(): void
+    /**
+     * @dataProvider servicesAliasDataProvider
+     */
+    public function testItSetRateLimitIfNoAnnotationProvidedAndServiceAliasIsUsed(string $serviceAlias): void
     {
         $this->createReadRateLimitAnnotationListerner();
 
         $this->container->expects($this->once())
             ->method('get')
             ->willReturn(new FakeInvokableClassWithDefaultRateLimit());
 
-        $event = $this->createEvent(null, true);
+        $event = $this->createEvent(null, $serviceAlias);
 
         $this->annotationReader->expects($this->once())->method('getMethodAnnotation')->willReturn(null);
 
@@ -80,6 +83,19 @@ public function testItSetRateLimitIfNoAnnotationProvidedAndServiceAliasIsUsed():
         $this->assertFalse($event->getRequest()->attributes->has('_rate_limit'));
     }
 
+    /**
+     * @return \Generator<array<string>>
+     */
+    public function servicesAliasDataProvider(): \Generator
+    {
+        yield 'service alias with :' => [
+            'fake.invokable.class:__invoke',
+        ];
+        yield 'service alias with ::' => [
+            'fake.invokable.class::__invoke',
+        ];
+    }
+
     public function testItSetsRateLimitIfAnnotationProvidedWithDefaultValue(): void
     {
         $this->createReadRateLimitAnnotationListerner();
@@ -159,15 +175,15 @@ public function rateLimitConfigurationDataProvider(): \Generator
         ];
     }
 
-    protected function createEvent(Request $request = null, bool $useAlias = false): ControllerEvent
+    protected function createEvent(Request $request = null, string $serviceId = null): ControllerEvent
     {
         $request = $request ?? new Request();
-        $request->attributes->set('_controller', $useAlias ? 'fake.invokable.class:__invoke' : FakeInvokableClassWithDefaultRateLimit::class);
+        $request->attributes->set('_controller', $serviceId ?? FakeInvokableClassWithDefaultRateLimit::class);
 
         return new ControllerEvent(
             $this->createMock(HttpKernelInterface::class),
             new FakeInvokableClassWithDefaultRateLimit(),
-            $request ?? new Request(),
+            $request,
             HttpKernelInterface::MASTER_REQUEST
         );
     }