Better type safety for typeOf return value

Author: theseer

src/viewmodel/ViewModelRenderer.php

@@ -386,6 +386,12 @@ private function conditionalApply(DOMElement $context, object|iterable $model):
             }
 
             $typeOf = $current->typeOf();
+            if (!is_string($typeOf)) {
+                throw new ViewModelRendererException(
+                    sprintf('Value returned by typeOf() must be string (%s)', $this->getModelPath($context)),
+                    ViewModelRendererException::WrongTypeForTypeOf
+                );
+            }
 
             $matches = $this->xp->query(
                 sprintf(
@@ -402,7 +408,7 @@ private function conditionalApply(DOMElement $context, object|iterable $model):
                         $context,
                         $current,
                         'typeOf',
-                        sprintf('No matching types for "%s" found', $typeOf)
+                        sprintf('No matching types for "%s" found', (string)$typeOf)
                     ),
                     ViewModelRendererException::NoMatch
                 );
@@ -555,6 +561,7 @@ private function objectApply(DOMElement $context, object $model): void {
                 continue;
             }
 
+            /** @psalm-suppress MixedAssignment */
             $result = match (true) {
                 // method variants
                 method_exists($model, $name)         => $model->{$name}($attribute->nodeValue),

tests/viewmodel/ViewModelRendererTest.php

@@ -731,7 +731,7 @@ public function typeOf() {
         $renderer = new ViewModelRenderer();
 
         $this->expectException(ViewModelRendererException::class);
-        $this->expectExceptionCode(ViewModelRendererException::NoMatch);
+        $this->expectExceptionCode(ViewModelRendererException::WrongTypeForTypeOf);
         $renderer->render($dom->documentElement, $class);
     }