code improved

Author: fenric

src/Attribute/Route.php

@@ -286,8 +286,8 @@ private function assertValidMethods() : void
             throw new InvalidDescriptorArgumentException('#[Route.methods] must contain at least one element.');
         }
 
-        foreach ($this->methods as $method) {
-            if ('' === $method || !is_string($method)) {
+        foreach ($this->methods as $value) {
+            if ('' === $value || !is_string($value)) {
                 throw new InvalidDescriptorArgumentException('#[Route.methods] must contain non-empty strings.');
             }
         }
@@ -306,13 +306,11 @@ private function assertValidMiddlewares() : void
             return;
         }
 
-        foreach ($this->middlewares as $middleware) {
-            if ('' === $middleware || !is_string($middleware)) {
-                throw new InvalidDescriptorArgumentException('#[Route.middlewares] must contain non-empty strings.');
-            }
-
-            if (!is_subclass_of($middleware, MiddlewareInterface::class)) {
-                throw new InvalidDescriptorArgumentException('#[Route.middlewares] must contain existing middlewares.');
+        foreach ($this->middlewares as $value) {
+            if ('' === $value || !is_string($value) || !is_subclass_of($value, MiddlewareInterface::class)) {
+                throw new InvalidDescriptorArgumentException(
+                    '#[Route.middlewares] must contain the class names of existing middlewares.'
+                );
             }
         }
     }
@@ -330,8 +328,8 @@ private function assertValidTags() : void
             return;
         }
 
-        foreach ($this->tags as $tag) {
-            if ('' === $tag || !is_string($tag)) {
+        foreach ($this->tags as $value) {
+            if ('' === $value || !is_string($value)) {
                 throw new InvalidDescriptorArgumentException('#[Route.tags] must contain non-empty strings.');
             }
         }

tests/Attribute/RouteTest.php

@@ -162,7 +162,7 @@ public function testConstructorWithInvalidMethod($invalidMethod) : void
     public function testConstructorWithInvalidMiddleware($invalidMiddleware) : void
     {
         $this->expectException(InvalidDescriptorArgumentException::class);
-        $this->expectExceptionMessage('#[Route.middlewares] must contain non-empty strings.');
+        $this->expectExceptionMessage('#[Route.middlewares] must contain the class names of existing middlewares.');
 
         new Route('foo', null, '/foo', ['GET'], [$invalidMiddleware]);
     }
@@ -186,7 +186,7 @@ public function testConstructorWithInvalidTag($invalidTag) : void
     public function testConstructorWithNonexistentMiddleware() : void
     {
         $this->expectException(InvalidDescriptorArgumentException::class);
-        $this->expectExceptionMessage('#[Route.middlewares] must contain existing middlewares.');
+        $this->expectExceptionMessage('#[Route.middlewares] must contain the class names of existing middlewares.');
 
         new Route('foo', null, '/foo', ['GET'], ['nonexistentClass']);
     }
@@ -197,7 +197,7 @@ public function testConstructorWithNonexistentMiddleware() : void
     public function testConstructorWithNonMiddlewareMiddleware() : void
     {
         $this->expectException(InvalidDescriptorArgumentException::class);
-        $this->expectExceptionMessage('#[Route.middlewares] must contain existing middlewares.');
+        $this->expectExceptionMessage('#[Route.middlewares] must contain the class names of existing middlewares.');
 
         new Route('foo', null, '/foo', ['GET'], [stdClass::class]);
     }