Merge pull request #6 from makasim/hook-class-take-priority-over-argu…

…ment-class

Hook class should take priority over argument one.

composer.json

@@ -28,7 +28,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev"
+      "dev-master": "0.3-dev"
     }
   }
 }

src/functions/values.php

@@ -147,11 +147,9 @@ function get_object_changed_values($object)
  */
 function build_object_ref($classOrClosure = null, array &$values, $context = null, $contextKey = null)
 {
-    if (false == $classOrClosure) {
-        foreach (get_registered_hooks('build_object', 'get_object_class') as $callback) {
-            if ($classOrClosure = call_user_func($callback, $values, $context, $contextKey)) {
-                break;
-            }
+    foreach (get_registered_hooks('build_object', 'get_object_class') as $callback) {
+        if ($dynamicClassOrClosure = call_user_func($callback, $values, $context, $contextKey)) {
+            $classOrClosure = $dynamicClassOrClosure;
         }
     }
 

tests/Model/OtherSubObject.php

@@ -0,0 +1,6 @@
+<?php
+namespace Makasim\Values\Tests\Model;
+
+class OtherSubObject extends Object
+{
+}

tests/ObjectsTraitTest.php

@@ -11,6 +11,7 @@
 use function Makasim\Values\register_object_hooks;
 use function Makasim\Values\set_values;
 use Makasim\Values\Tests\Model\Object;
+use Makasim\Values\Tests\Model\OtherSubObject;
 use Makasim\Values\Tests\Model\SubObject;
 use PHPUnit\Framework\TestCase;
 
@@ -667,4 +668,27 @@ public function testShouldBuildObjectFromClassProvidedByHook()
 
         $this->assertInstanceOf(SubObject::class, $subObj);
     }
+
+    public function testClassProvidedByHookShouldTakePriorityOverClassAsArgument()
+    {
+        $values = [
+            'aKey' => [
+                'aSubName' => ['aSubKey' => 'aFooVal'],
+            ],
+        ];
+
+        $argumentClass = SubObject::class;
+        $hookClass = OtherSubObject::class;
+
+        $obj = new Object();
+        set_values($obj, $values);
+
+        register_hook('build_object', 'get_object_class', function($object, $key, $values) use ($hookClass) {
+            return $hookClass;
+        });
+
+        $subObj = get_object($obj, 'aKey', $argumentClass);
+
+        $this->assertInstanceOf($hookClass, $subObj);
+    }
 }