Fix mapping linter issues

Author: SerafimArts

phpstan.neon

@@ -8,7 +8,7 @@ parameters:
   fileExtensions:
     - php
   paths:
-    - src
+    - src/Mapping
   tmpDir: vendor/.cache.phpstan
   reportUnmatchedIgnoredErrors: false
   ignoreErrors:

src/Mapping/Metadata/ClassMetadata.php

@@ -76,13 +76,7 @@ public function getTypeStatement(Context $context, bool $read): TypeStatement
         $fields = [];
 
         foreach ($this->properties as $property) {
-            $field = $property->getFieldNode($context, $read);
-
-            if ($field === null) {
-                continue;
-            }
-
-            $fields[] = $field;
+            $fields[] = $property->getFieldNode($context, $read);
         }
 
         if ($fields === []) {

src/Mapping/Metadata/Condition/ExpressionConditionMetadata.php

@@ -9,14 +9,19 @@
 
 final class ExpressionConditionMetadata extends ConditionMetadata
 {
+    /**
+     * @var non-empty-string
+     */
+    public const DEFAULT_CONTEXT_VARIABLE_NAME = ExpressionConditionInfo::DEFAULT_CONTEXT_VARIABLE_NAME;
+
     public function __construct(
         public readonly ParsedExpression $expression,
         /**
          * Gets expression variable name.
          *
          * @var non-empty-string
          */
-        public readonly string $variable,
+        public readonly string $variable = self::DEFAULT_CONTEXT_VARIABLE_NAME,
         ?int $createdAt = null,
     ) {
         parent::__construct($createdAt);

src/Mapping/Provider/MetadataReaderProvider.php

@@ -54,8 +54,6 @@ public function getClassMetadata(
     ): ClassMetadata {
         $info = $this->reader->read($class);
 
-        dd($info);
-
         return $this->toClassMetadata($info, $types, $parser);
     }
 

src/Mapping/Reader/AttributeReader/ClassAttributeLoader.php

@@ -7,12 +7,12 @@
 abstract class ClassAttributeLoader implements ClassAttributeLoaderInterface
 {
     /**
-     * @template TAttribute of object
+     * @template TArgAttribute of object
      *
      * @param \ReflectionClass<object> $class
-     * @param class-string<TAttribute> $name
+     * @param class-string<TArgAttribute> $name
      *
-     * @return TAttribute|null
+     * @return TArgAttribute|null
      */
     protected function findClassAttribute(\ReflectionClass $class, string $name): ?object
     {
@@ -24,11 +24,12 @@ protected function findClassAttribute(\ReflectionClass $class, string $name): ?o
     }
 
     /**
-     * @template TAttribute of object
+     * @template TArgAttribute of object
      *
-     * @param class-string<TAttribute> $name
+     * @param \ReflectionClass<object> $class
+     * @param class-string<TArgAttribute> $name
      *
-     * @return iterable<array-key, TAttribute>
+     * @return iterable<array-key, TArgAttribute>
      */
     protected function getAllClassAttributes(\ReflectionClass $class, string $name): iterable
     {

src/Mapping/Reader/AttributeReader/PropertyAttributeLoader.php

@@ -10,11 +10,11 @@
 abstract class PropertyAttributeLoader implements PropertyAttributeLoaderInterface
 {
     /**
-     * @template TAttribute of object
+     * @template TArgAttribute of object
      *
-     * @param class-string<TAttribute> $name
+     * @param class-string<TArgAttribute> $name
      *
-     * @return TAttribute|null
+     * @return TArgAttribute|null
      */
     protected function findPropertyAttribute(RefProperty|RefHook $property, string $name): ?object
     {
@@ -26,11 +26,11 @@ protected function findPropertyAttribute(RefProperty|RefHook $property, string $
     }
 
     /**
-     * @template TAttribute of object
+     * @template TArgAttribute of object
      *
-     * @param class-string<TAttribute> $name
+     * @param class-string<TArgAttribute> $name
      *
-     * @return iterable<array-key, TAttribute>
+     * @return iterable<array-key, TArgAttribute>
      */
     protected function getAllPropertyAttributes(RefProperty|RefHook $property, string $name): iterable
     {

src/Mapping/Reader/ConfigReader/DiscriminatorMapClassConfigLoader.php

@@ -24,10 +24,16 @@ public function load(\ReflectionClass $class, ClassInfo $info, array $config): v
             $map[$value] = new TypeInfo($type);
         }
 
+        $default = null;
+
+        if (isset($discriminatorConfig['otherwise'])) {
+            $default = new TypeInfo($discriminatorConfig['otherwise']);
+        }
+
         $info->discriminator = new DiscriminatorInfo(
             field: $discriminatorConfig['field'],
             map: $map,
-            default: $discriminatorConfig['default'] ?? null,
+            default: $default,
         );
     }
 }

src/Mapping/Reader/ConfigReader/SchemaValidator.php

@@ -20,6 +20,7 @@
  * @phpstan-type PropertyConfigType array{
  *     name?: non-empty-string,
  *     type?: non-empty-string,
+ *     write?: non-empty-string,
  *     skip?: 'null'|'empty'|non-empty-string|list<'null'|'empty'|non-empty-string>,
  *     type_error_message?: non-empty-string,
  *     undefined_error_message?: non-empty-string,

src/Mapping/SkipWhen.php

@@ -5,7 +5,7 @@
 namespace TypeLang\Mapper\Mapping;
 
 use JetBrains\PhpStorm\Language;
-use TypeLang\Mapper\Mapping\Metadata\ExpressionConditionMetadata;
+use TypeLang\Mapper\Mapping\Metadata\Condition\ExpressionConditionMetadata;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
 class SkipWhen