no need to postfix the variable with specification

auraphp · Aug 21, 2024 · a9ca138 · a9ca138
1 parent 69fe40c
commit a9ca138
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 30 deletions.
diff --git a/src/ClassScanner/AnnotatedInjectAttributeConfig.php b/src/ClassScanner/AnnotatedInjectAttributeConfig.php
@@ -15,16 +15,12 @@
 
 final class AnnotatedInjectAttributeConfig implements AttributeConfigInterface
 {
-    public static function define(
-        Container $di,
-        AttributeSpecification $attributeSpecification,
-        ClassSpecification $classSpecification
-    ): void
+    public static function define(Container $di, AttributeSpecification $attribute, ClassSpecification $class): void
     {
-        if ($attributeSpecification->isConstructorParameterAttribute()) {
-            /** @var AnnotatedInjectInterface $attribute */
-            $attribute = $attributeSpecification->getAttributeInstance();
-            $di->params[$attributeSpecification->getClassName()][$attributeSpecification->getTargetParameter()] = $attribute->inject();
+        if ($attribute->isConstructorParameterAttribute()) {
+            /** @var AnnotatedInjectInterface $annotatedInject */
+            $annotatedInject = $attribute->getAttributeInstance();
+            $di->params[$attribute->getClassName()][$attribute->getTargetParameter()] = $annotatedInject->inject();
         }
     }
 }
diff --git a/src/ClassScanner/AttributeConfigInterface.php b/src/ClassScanner/AttributeConfigInterface.php
@@ -14,9 +14,5 @@
 
 interface AttributeConfigInterface
 {
-    public static function define(
-        Container $di,
-        AttributeSpecification $attributeSpecification,
-        ClassSpecification $classSpecification
-    ): void;
+    public static function define(Container $di, AttributeSpecification $attribute, ClassSpecification $class): void;
 }
diff --git a/src/ClassScanner/BlueprintAttributeConfig.php b/src/ClassScanner/BlueprintAttributeConfig.php
@@ -14,12 +14,8 @@
 
 final class BlueprintAttributeConfig implements AttributeConfigInterface
 {
-    public static function define(
-        Container $di,
-        AttributeSpecification $attributeSpecification,
-        ClassSpecification $classSpecification
-    ): void
+    public static function define(Container $di, AttributeSpecification $attribute, ClassSpecification $class): void
     {
-        $di->params[$attributeSpecification->getClassName()] = $di->params[$attributeSpecification->getClassName()] ?? [];
+        $di->params[$attribute->getClassName()] = $di->params[$attribute->getClassName()] ?? [];
     }
 }
diff --git a/tests/Fake/FakeWorkerAttribute.php b/tests/Fake/FakeWorkerAttribute.php
@@ -20,19 +20,15 @@ public function __construct(int $someSetting = 1)
         $this->someSetting = $someSetting;
     }
 
-    public static function define(
-        Container $di,
-        AttributeSpecification $attributeSpecification,
-        ClassSpecification $classSpecification
-    ): void
+    public static function define(Container $di, AttributeSpecification $attribute, ClassSpecification $class): void
     {
-        /** @var self $attribute */
-        $attribute = $attributeSpecification->getAttributeInstance();
-        if ($attributeSpecification->getAttributeTarget() === \Attribute::TARGET_CLASS) {
+        /** @var self $instance */
+        $instance = $attribute->getAttributeInstance();
+        if ($attribute->getAttributeTarget() === \Attribute::TARGET_CLASS) {
             $di->values['worker'] = $di->values['worker'] ?? [];
             $di->values['worker'][] = [
-                'someSetting' => $attribute->someSetting,
-                'className' => $attributeSpecification->getClassName(),
+                'someSetting' => $instance->someSetting,
+                'className' => $attribute->getClassName(),
             ];
         }
     }