Improve config loaders

Author: SerafimArts

src/Mapping/Reader/ArrayReader.php

@@ -9,7 +9,7 @@
 /**
  * @phpstan-import-type ClassConfigType from SchemaValidator
  */
-final class ArrayReader extends ConfigReader
+class ArrayReader extends ConfigReader
 {
     public function __construct(
         /**

src/Mapping/Reader/AttributeReader.php

@@ -17,7 +17,7 @@
 /**
  * @template-extends MetadataReader<ClassAttributeLoaderInterface, PropertyAttributeLoaderInterface>
  */
-final class AttributeReader extends MetadataReader
+class AttributeReader extends MetadataReader
 {
     /**
      * @return list<ClassAttributeLoaderInterface>

src/Mapping/Reader/AttributeReader/AliasPropertyAttributeLoader.php

@@ -9,7 +9,7 @@
 
 final class AliasPropertyAttributeLoader extends PropertyAttributeLoader
 {
-    public function load(\ReflectionProperty $property, PropertyInfo $info): void
+    public function load(PropertyInfo $info, \ReflectionProperty $property): void
     {
         $attribute = $this->findPropertyAttribute($property, MapName::class);
 

src/Mapping/Reader/AttributeReader/DiscriminatorMapClassAttributeLoader.php

@@ -11,7 +11,7 @@
 
 final class DiscriminatorMapClassAttributeLoader extends ClassAttributeLoader
 {
-    public function load(\ReflectionClass $class, ClassInfo $info): void
+    public function load(ClassInfo $info, \ReflectionClass $class): void
     {
         $attribute = $this->findClassAttribute($class, DiscriminatorMap::class);
 

src/Mapping/Reader/AttributeReader/ErrorMessageClassAttributeLoader.php

@@ -9,7 +9,7 @@
 
 final class ErrorMessageClassAttributeLoader extends ClassAttributeLoader
 {
-    public function load(\ReflectionClass $class, ClassInfo $info): void
+    public function load(ClassInfo $info, \ReflectionClass $class): void
     {
         $error = $this->findClassAttribute($class, OnTypeError::class);
 

src/Mapping/Reader/AttributeReader/ErrorMessagePropertyAttributeLoader.php

@@ -10,7 +10,7 @@
 
 final class ErrorMessagePropertyAttributeLoader extends PropertyAttributeLoader
 {
-    public function load(\ReflectionProperty $property, PropertyInfo $info): void
+    public function load(PropertyInfo $info, \ReflectionProperty $property): void
     {
         $this->loadTypeErrorMessage($property, $info);
         $this->loadUndefinedErrorMessage($property, $info);

src/Mapping/Reader/AttributeReader/NormalizeAsArrayClassAttributeLoader.php

@@ -9,7 +9,7 @@
 
 final class NormalizeAsArrayClassAttributeLoader extends ClassAttributeLoader
 {
-    public function load(\ReflectionClass $class, ClassInfo $info): void
+    public function load(ClassInfo $info, \ReflectionClass $class): void
     {
         $attribute = $this->findClassAttribute($class, NormalizeAsArray::class);
 

src/Mapping/Reader/AttributeReader/SkipConditionsPropertyAttributeLoader.php

@@ -14,7 +14,7 @@
 
 final class SkipConditionsPropertyAttributeLoader extends PropertyAttributeLoader
 {
-    public function load(\ReflectionProperty $property, PropertyInfo $info): void
+    public function load(PropertyInfo $info, \ReflectionProperty $property): void
     {
         $this->loadUserConditions($property, $info);
         $this->loadNullCondition($property, $info);

src/Mapping/Reader/AttributeReader/TypePropertyAttributeLoader.php

@@ -11,7 +11,7 @@
 
 final class TypePropertyAttributeLoader extends PropertyAttributeLoader
 {
-    public function load(\ReflectionProperty $property, PropertyInfo $info): void
+    public function load(PropertyInfo $info, \ReflectionProperty $property): void
     {
         $this->loadPropertyType($property, $info);
 

src/Mapping/Reader/ConfigReader.php

@@ -94,25 +94,20 @@ public function read(\ReflectionClass $class): ClassInfo
         $config = $this->loadAndValidate($class);
 
         if ($config !== null) {
-            $this->readFromConfig($class, $info, $config);
+            $this->readFromConfig($info, $config);
         }
 
         return $info;
     }
 
     /**
-     * @template TArg of object
-     *
-     * @param \ReflectionClass<TArg> $class
-     * @param ClassInfo<TArg> $classInfo
+     * @param ClassInfo<object> $classInfo
      * @param ClassConfigType $classConfig
-     *
-     * @throws \ReflectionException
      */
-    private function readFromConfig(\ReflectionClass $class, ClassInfo $classInfo, array $classConfig): void
+    private function readFromConfig(ClassInfo $classInfo, array $classConfig): void
     {
         foreach ($this->classLoaders as $classLoader) {
-            $classLoader->load($class, $classInfo, $classConfig);
+            $classLoader->load($classInfo, $classConfig);
         }
 
         $classConfig['properties'] ??= [];
@@ -129,11 +124,10 @@ private function readFromConfig(\ReflectionClass $class, ClassInfo $classInfo, a
             // @phpstan-ignore-next-line : Additional DbC invariant
             assert(\is_array($propertyConfig));
 
-            $property = $class->getProperty($propertyName);
             $propertyInfo = $classInfo->getPropertyOrCreate($propertyName);
 
             foreach ($this->propertyLoaders as $propertyLoader) {
-                $propertyLoader->load($property, $propertyInfo, $propertyConfig);
+                $propertyLoader->load($propertyInfo, $propertyConfig);
             }
         }
     }