Signals should get processed before typeof requirements

Author: theseer

src/viewmodel/ViewModelRenderer.php

@@ -351,6 +351,16 @@ private function processProperty(DOMElement $context, object $model): object {
             );
         }
 
+        if ($result instanceof Remove || $result === false) {
+            $context->remove();
+
+            return $model;
+        }
+
+        if ($result instanceof Ignore || $result === true || $result === null) {
+            return $model;
+        }
+
         if ($context->hasAttribute('typeof')) {
             if (!is_iterable($result) && !is_object($result)) {
                 throw new ViewModelRendererException(
@@ -382,16 +392,6 @@ private function processProperty(DOMElement $context, object $model): object {
             return $model;
         }
 
-        if ($result instanceof Remove || $result === false) {
-            $context->remove();
-
-            return $model;
-        }
-
-        if ($result instanceof Ignore || $result === true || $result === null) {
-            return $model;
-        }
-
         if (is_object($result)) {
             $this->objectApply($context, $result);
 

tests/viewmodel/ViewModelRendererTest.php

@@ -1471,7 +1471,55 @@ public function asString(): Document {
         $exp->loadXML('<root property="test"><div> sub document </div></root>');
 
         $this->assertResultMatches($exp->documentElement, $dom->documentElement);
+    }
+
+    public function testRemoveSignalIsProcessedBeforeTypeOfAttribute(): void {
+        $dom = new DOMDocument();
+        $dom->loadXML('<root><node property="test" typeof="foo" /></root>');
+
+        $model = new class() {
+            public function test(): Signal {
+                return Signal::remove();
+            }
+        };
+
+        $renderer = new ViewModelRenderer();
+        $renderer->render($dom->documentElement, $model);
 
+        $renderer = new ViewModelRenderer();
+        $renderer->render($dom->documentElement, $model);
+
+        $exp = new DOMDocument();
+        $exp->loadXML('<root />');
+
+        $this->assertResultMatches($exp->documentElement, $dom->documentElement);
+    }
+
+    public function testIgnoreSignalIsProcessedBeforeTypeOfAttribute(): void {
+        $dom = new DOMDocument();
+        $dom->loadXML('<root><node property="test" typeof="foo"><child property="text" /></node></root>');
+
+        $model = new class() {
+            public function test(): Signal {
+                return Signal::ignore();
+            }
+
+            public function text():string {
+                return 'works';
+            }
+
+        };
+
+        $renderer = new ViewModelRenderer();
+        $renderer->render($dom->documentElement, $model);
+
+        $renderer = new ViewModelRenderer();
+        $renderer->render($dom->documentElement, $model);
+
+        $exp = new DOMDocument();
+        $exp->loadXML('<root><node property="test" typeof="foo"><child property="text">works</child></node></root>');
+
+        $this->assertResultMatches($exp->documentElement, $dom->documentElement);
     }
 
 }