Fix handling CallbackBinding when key is contained in JSON fields

As previously the CallbackBindings where moved into a separate property in the ClassBindings class, they need to be called independently of the keys being present in the JSON fields, because the hasBindings method doesn't check the separate callbackBindings class property.
When iterating over the JSON fields check for registered CallbackBinding, so it doesn't execute handleRaw() unnecessarily before the CallbackBinding is handled below.

Author: otsch

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.2] - 2020-10-15
+### Fixed
+- Another issue where CallbackBinding wasn't handled.
+
 ## [4.0.1] - 2020-10-15
 ### Fixed
 - Still handle CallbackBinding when property name doesn't match a JSON fieldname.

src/ClassBindings.php

@@ -50,7 +50,7 @@ public function decode(array $data, $instance)
                 $binding  = $this->bindings[$fieldName];
                 $property = Property::create($instance, $this->bindings[$fieldName]->property());
                 $this->handleBinding($binding, $property, $data);
-            } else {
+            } elseif (!$this->hasCallbackBinding($fieldName)) { // callback bindings are handled below
                 if ($this->jsonDecoder->shouldAutoCase()) {
                     $property = $this->autoCase($fieldName, $instance);
 
@@ -67,10 +67,8 @@ public function decode(array $data, $instance)
         }
 
         foreach ($this->callbackBindings as $propertyName => $binding) {
-            if (!in_array($propertyName, $jsonFieldNames)) {
-                $property = Property::create($instance, $propertyName);
-                $this->handleBinding($binding, $property, $data);
-            }
+            $property = Property::create($instance, $propertyName);
+            $this->handleBinding($binding, $property, $data);
         }
 
         return $instance;
@@ -104,6 +102,11 @@ public function hasBinding($property)
         return array_key_exists($property, $this->bindings);
     }
 
+    public function hasCallbackBinding(string $propertyName): bool
+    {
+        return array_key_exists($propertyName, $this->callbackBindings);
+    }
+
     /**
      * validates and executes the found binding on the given property.
      *

tests/ClassBindingsTest.php

@@ -26,6 +26,20 @@ public function it_registers_a_binding()
         $this->assertTrue($classBindings->hasBinding('field'));
     }
 
+    /** @test */
+    public function it_registers_a_callback_binding()
+    {
+        $classBindings = new ClassBindings(new JsonDecoder());
+
+        $this->assertFalse($classBindings->hasBinding('field'));
+        $this->assertFalse($classBindings->hasCallbackBinding('field'));
+
+        $classBindings->register(new CallbackBinding('field', function () {}));
+
+        $this->assertFalse($classBindings->hasBinding('field'));
+        $this->assertTrue($classBindings->hasCallbackBinding('field'));
+    }
+
     /** @test */
     public function it_fails_to_register_a_not_compatible_binding_class()
     {
@@ -57,6 +71,19 @@ public function bind($jsonDecoder, $jsonData, $property)
         $classBindings->decode(['firstname' => 'John'], new Person());
     }
 
+    /** @test */
+    public function it_executes_callback_bindings_when_property_name_is_contained_in_json_fields()
+    {
+        $classBindings = new ClassBindings(new JsonDecoder());
+        $classBindings->register(new CallbackBinding('firstname', function ($data) {
+            return $data['firstname'] . ' Doe';
+        }));
+
+        $person = $classBindings->decode(['firstname' => 'John'], new Person());
+
+        $this->assertEquals('John Doe', $person->firstname());
+    }
+
     /** @test */
     public function it_executes_callback_bindings_when_property_name_is_not_contained_in_json_fields()
     {