Merge pull request #64 from Crell/au-closure

Use updated AttributeUtils

CHANGELOG.md

@@ -8,6 +8,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ### Added
 - Null values may now be excluded when serializing. See the `omitNullFields` and `omitIfNull` flags in the README.
+- We now require AttributeUtils 1.2, which lets us use closures rather than method name strings for subAttribute callbacks. (Internal improvement.)
 
 ### Deprecated
 - Nothing

composer.json

@@ -18,14 +18,14 @@
     ],
     "require": {
         "php": "~8.1",
-        "crell/attributeutils": "~1.0",
+        "crell/attributeutils": "~1.2",
         "crell/fp": "~1.0"
     },
     "require-dev": {
-        "phpbench/phpbench": "^1.1.2",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "~10.3",
-        "symfony/yaml": "^5.3"
+        "phpbench/phpbench": "^1.3.0",
+        "phpstan/phpstan": "^1.11",
+        "phpunit/phpunit": "~10.5",
+        "symfony/yaml": "^5.4"
     },
     "suggest": {
         "symfony/yaml": "Enables serializing to/from YAML files."

src/Attributes/Field.php

@@ -17,7 +17,6 @@
 use Crell\Serde\PropValue;
 use Crell\Serde\Renaming\LiteralName;
 use Crell\Serde\Renaming\RenamingStrategy;
-use Crell\Serde\DeformatterResult;
 use Crell\Serde\TypeCategory;
 use Crell\Serde\TypeField;
 use Crell\Serde\TypeMap;
@@ -277,19 +276,12 @@ protected function enumType(string $phpType): TypeCategory
     public function subAttributes(): array
     {
         return [
-            TypeMap::class => 'fromTypeMap',
-            TypeField::class => 'fromTypeField',
+            TypeMap::class => fn(?TypeMap $map) => $this->typeMap = $map,
+            TypeField::class => $this->fromTypeField(...),
         ];
     }
 
-    public function fromTypeMap(?TypeMap $map): void
-    {
-        // This may assign to null, which is OK as that will
-        // evaluate to false when we need it to.
-        $this->typeMap = $map;
-    }
-
-    public function fromTypeField(?TypeField $typeField): void
+    protected function fromTypeField(?TypeField $typeField): void
     {
         if ($typeField && !$typeField->acceptsType($this->phpType)) {
             throw FieldTypeIncompatible::create($typeField::class, $this->phpType);