Allow all callables for properties

Author: l-x

src/Scn/Hydrator/Hydrator.php

@@ -10,32 +10,28 @@
 final class Hydrator implements HydratorInterface
 {
 
+    private function invoke(callable $callback, object $entity, ...$args)
+    {
+        if ($callback instanceof \Closure) {
+            $callback = $callback->bindTo($entity, $entity);
+        }
+
+        return $callback(...$args);
+    }
+
     public function hydrate(HydratorConfigInterface $config, object $entity, array $data): void
     {
         foreach ($config->getHydratorProperties() as $propertyName => $set) {
-            if ($set instanceof \Closure) {
-                $set = $set->bindTo($entity, $entity);
-            }
-
-            $set($data[$propertyName] ?? null, $propertyName);
+            $this->invoke($set, $entity, $data[$propertyName] ?? null, $propertyName);
         }
     }
 
     public function extract(ExtractorConfigInterface $config, object $entity): array
     {
         $data = [];
 
-        /**
-         * @var string $propertyName
-         * @var \Closure $get
-         */
         foreach ($config->getExtractorProperties() as $propertyName => $get) {
-            if (!$get instanceof \Closure) {
-                throw new \RuntimeException('Must be closure');
-            }
-
-            $get = $get->bindTo($entity, $entity);
-            $data[$propertyName] = $get($propertyName);
+            $data[$propertyName] = $this->invoke($get, $entity, $propertyName);
         }
 
         return $data;