Register CallbackBindings separately

As CallbackBindings aren't bound to a JSON fieldname for flexibility, store them in a separate property on registration instead of filtering them from the main bindings array.

Author: otsch

src/ClassBindings.php

@@ -17,6 +17,11 @@ class ClassBindings
      */
     private $bindings = [];
 
+    /**
+     * @var array
+     */
+    private $callbackBindings = [];
+
     /**
      * @var JsonDecoder
      */
@@ -61,9 +66,9 @@ public function decode(array $data, $instance)
             }
         }
 
-        foreach ($this->callbackBindings() as $binding) {
-            if (!in_array($binding->property(), $jsonFieldNames)) {
-                $property = Property::create($instance, $binding->property());
+        foreach ($this->callbackBindings as $propertyName => $binding) {
+            if (!in_array($propertyName, $jsonFieldNames)) {
+                $property = Property::create($instance, $propertyName);
                 $this->handleBinding($binding, $property, $data);
             }
         }
@@ -80,9 +85,11 @@ public function register($binding)
     {
         if (!$binding instanceof Binding) {
             throw new InvalidBindingException();
+        } elseif ($binding instanceof CallbackBinding) {
+            $this->callbackBindings[$binding->property()] = $binding;
+        } else {
+            $this->bindings[$binding->jsonField()] = $binding;
         }
-
-        $this->bindings[$binding->jsonField()] = $binding;
     }
 
     /**
@@ -190,14 +197,4 @@ private function kebapToCamelCase(string $input)
 
         return $output;
     }
-
-    /**
-     * @return CallbackBinding[]
-     */
-    private function callbackBindings(): array
-    {
-        return array_filter($this->bindings, function ($binding) {
-            return $binding instanceof CallbackBinding;
-        });
-    }
 }