Merge pull request spatie#512 from spatie/feature/use-php-attribute-reader

Use spatie/php-attribute-reader

Author: freekmurze

composer.json

@@ -22,12 +22,13 @@
     "require": {
         "php": "^8.4",
         "illuminate/cache": "^12.0|^13.0",
-        "illuminate/container": "^12.0|^13.0",
         "illuminate/console": "^12.0|^13.0",
+        "illuminate/container": "^12.0|^13.0",
         "illuminate/http": "^12.0|^13.0",
         "illuminate/support": "^12.0|^13.0",
         "nesbot/carbon": "^3.0",
-        "spatie/laravel-package-tools": "^1.9"
+        "spatie/laravel-package-tools": "^1.9",
+        "spatie/php-attribute-reader": "^1.0"
     },
     "require-dev": {
         "larastan/larastan": "^3.9",

src/Support/AttributeReader.php

@@ -2,8 +2,7 @@
 
 namespace Spatie\ResponseCache\Support;
 
-use ReflectionClass;
-use ReflectionMethod;
+use Spatie\Attributes\Attributes;
 
 class AttributeReader
 {
@@ -26,21 +25,25 @@ public static function getFirstAttribute(string $action, array $attributeClasses
             return null;
         }
 
-        try {
-            $reflectionClass = new ReflectionClass($controller);
-            $reflectionMethod = $reflectionClass->getMethod($method);
+        // Check method-level attributes first (they take precedence)
+        foreach ($attributeClasses as $attributeClass) {
+            $attribute = Attributes::onMethod($controller, $method, $attributeClass);
 
-            // Check method-level attributes first (they take precedence)
-            $attribute = static::findAttributeInReflection($reflectionMethod, $attributeClasses);
             if ($attribute) {
                 return $attribute;
             }
+        }
 
-            // Then check class-level attributes
-            return static::findAttributeInReflection($reflectionClass, $attributeClasses);
-        } catch (\ReflectionException) {
-            return null;
+        // Then check class-level attributes
+        foreach ($attributeClasses as $attributeClass) {
+            $attribute = Attributes::get($controller, $attributeClass);
+
+            if ($attribute) {
+                return $attribute;
+            }
         }
+
+        return null;
     }
 
     protected static function parseAction(string $action): array
@@ -51,19 +54,4 @@ protected static function parseAction(string $action): array
 
         return explode('@', $action);
     }
-
-    protected static function findAttributeInReflection(
-        ReflectionClass|ReflectionMethod $reflection,
-        array $attributeClasses
-    ): ?object {
-        foreach ($attributeClasses as $attributeClass) {
-            $attributes = $reflection->getAttributes($attributeClass);
-
-            if (! empty($attributes)) {
-                return $attributes[0]->newInstance();
-            }
-        }
-
-        return null;
-    }
 }