Remove model support from HtmlTemplate

docs/template.md

@@ -270,7 +270,6 @@ following commands:
 
 ```
 $template = HtmlTemplate::addTo($this);
-
 $template->loadFromString('Hello, {name}world{/}');
 ```
 
@@ -320,7 +319,6 @@ Example:
 
 ```
 $template = HtmlTemplate::addTo($this);
-
 $template->loadFromString('Hello, {name}world{/}');
 
 $template->set('name', 'John');

src/App.php

@@ -715,7 +715,6 @@ public function run(): void
     public function loadTemplate(string $filename)
     {
         $template = new $this->templateClass();
-        $template->setApp($this);
 
         if ((['.' => true, '/' => true, '\\' => true][substr($filename, 0, 1)] ?? false) || str_contains($filename, ':\\')) {
             return $template->loadFromFile($filename);

src/Form/Control/Lookup.php

@@ -180,7 +180,7 @@ public function outputApiResponse(): void
      *
      * @param int|bool $limit
      *
-     * @return array<int, array{value: string, title: mixed}>
+     * @return list<array{value: string, title: mixed}>
      */
     public function getData($limit = true): array
     {

src/Form/Control/ScopeBuilder.php

@@ -606,6 +606,8 @@ public function scopeToQuery(Scope\AbstractScope $scope, array $inputsMap = []):
 
     /**
      * Converts a Condition to VueQueryBuilder query array.
+     *
+     * @return array{rule: string, operator: string, value: string|null, option: array|null}
      */
     public function conditionToQuery(Condition $condition, array $inputsMap = []): array
     {

src/HtmlTemplate.php

@@ -4,9 +4,7 @@
 
 namespace Atk4\Ui;
 
-use Atk4\Core\AppScopeTrait;
 use Atk4\Core\WarnDynamicPropertyTrait;
-use Atk4\Data\Model;
 use Atk4\Ui\HtmlTemplate\TagTree;
 use Atk4\Ui\HtmlTemplate\Value as HtmlValue;
 
@@ -15,7 +13,6 @@
  */
 class HtmlTemplate
 {
-    use AppScopeTrait;
     use WarnDynamicPropertyTrait;
 
     public const TOP_TAG = '_top';
@@ -107,10 +104,6 @@ public function cloneRegion(string $tag): self
         // TODO prune unreachable nodes
         // $template->rebuildTagsIndex();
 
-        if ($this->issetApp()) {
-            $template->setApp($this->getApp());
-        }
-
         return $template;
     }
 
@@ -141,31 +134,13 @@ protected function emptyTagTree(TagTree $tagTree): void
      *
      * If tag contains another tag trees, these tag trees are emptied.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      */
     protected function _setOrAppend($tag, string $value = null, bool $encodeHtml = true, bool $append = false, bool $throwIfNotFound = true): void
     {
-        if ($tag instanceof Model && $value === null) {
-            if (!$encodeHtml) {
-                throw new Exception('HTML is not allowed to be dangerously set from Model');
-            }
-
-            // $tag passed as model
-            // in this case we don't throw exception if tags don't exist
-            $uiPersistence = $this->getApp()->uiPersistence;
-            foreach ($tag->getFields() as $k => $field) {
-                if ($this->_hasTag($k)) {
-                    $v = $uiPersistence->typecastSaveField($field, $tag->get($k));
-                    $this->_setOrAppend($k, $v, $encodeHtml, $append);
-                }
-            }
-
-            return;
-        }
-
         // $tag passed as associative array [tag => value]
-        if (is_array($tag) && $value === null) {
+        if (is_array($tag) && $value === null) { // @phpstan-ignore-line
             if ($throwIfNotFound) {
                 foreach ($tag as $k => $v) {
                     if (!$this->_hasTag($k)) {
@@ -182,7 +157,7 @@ protected function _setOrAppend($tag, string $value = null, bool $encodeHtml = t
         }
 
         if (!is_string($tag) || $tag === '') {
-            throw (new Exception('Tag must be non-empty string'))
+            throw (new Exception('Tag must be ' . (is_string($tag) ? 'non-empty ' : '') . 'string'))
                 ->addMoreInfo('tag', $tag)
                 ->addMoreInfo('value', $value);
         }
@@ -216,8 +191,8 @@ protected function _setOrAppend($tag, string $value = null, bool $encodeHtml = t
      * If tag is found inside template several times, all occurrences are
      * replaced.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -232,8 +207,8 @@ public function set($tag, string $value = null): self
      * Same as set(), but won't generate exception for non-existing
      * $tag.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -248,8 +223,8 @@ public function trySet($tag, string $value = null): self
      * Set value of a tag to a HTML content. The value is set without
      * encoding, so you must be sure to sanitize.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -264,8 +239,8 @@ public function dangerouslySetHtml($tag, string $value = null): self
      * See dangerouslySetHtml() but won't generate exception for non-existing
      * $tag.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -279,8 +254,8 @@ public function tryDangerouslySetHtml($tag, string $value = null): self
     /**
      * Add more content inside a tag.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -295,8 +270,8 @@ public function append($tag, ?string $value): self
      * Same as append(), but won't generate exception for non-existing
      * $tag.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -311,8 +286,8 @@ public function tryAppend($tag, ?string $value): self
      * Add more content inside a tag. The content is appended without
      * encoding, so you must be sure to sanitize.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */
@@ -327,8 +302,8 @@ public function dangerouslyAppendHtml($tag, ?string $value): self
      * Same as dangerouslyAppendHtml(), but won't generate exception for non-existing
      * $tag.
      *
-     * @param string|array<string, string>|Model          $tag
-     * @param ($tag is array|Model ? never : string|null) $value
+     * @param string|array<string, string>          $tag
+     * @param ($tag is array ? never : string|null) $value
      *
      * @return $this
      */

src/Lister.php

@@ -176,7 +176,7 @@ protected function renderView(): void
      */
     public function renderRow(): void
     {
-        $this->tRow->trySet($this->currentRow);
+        $this->tRow->trySet($this->getApp()->uiPersistence->typecastSaveRow($this->currentRow, $this->currentRow->get()));
 
         if ($this->tRow->hasTag('_title')) {
             $this->tRow->set('_title', $this->currentRow->getTitle());

src/Table.php

@@ -399,7 +399,6 @@ protected function renderView(): void
                 $this->tRowMaster->dangerouslySetHtml('cells', $this->getDataRowHtml());
                 $this->tRowMaster->set('dataId', '{$dataId}');
                 $this->tRow = new HtmlTemplate($this->tRowMaster->renderToHtml()); // TODO reparse should not be needed
-                $this->tRow->setApp($this->getApp());
 
                 if ($this->hook(self::HOOK_BEFORE_ROW) === false) {
                     continue;
@@ -444,7 +443,7 @@ protected function renderView(): void
     #[\Override]
     public function renderRow(): void
     {
-        $this->tRow->set($this->currentRow);
+        $this->tRow->trySet($this->getApp()->uiPersistence->typecastSaveRow($this->currentRow, $this->currentRow->get()));
 
         if ($this->useHtmlTags) {
             // prepare row-specific HTML tags

src/Table/Column/Link.php

@@ -104,7 +104,6 @@ protected function init(): void
 
         if (is_string($this->url)) {
             $this->url = new HtmlTemplate($this->url);
-            $this->url->setApp($this->getApp());
         }
         if (is_string($this->page)) {
             $this->page = [$this->page];
@@ -145,7 +144,9 @@ public function getDataCellTemplate(Field $field = null): string
     public function getHtmlTags(Model $row, ?Field $field): array
     {
         if ($this->url) {
-            return ['c_' . $this->shortName => $this->url->set($row)->renderToHtml()];
+            $this->url->trySet($this->getApp()->uiPersistence->typecastSaveRow($row, $row->get()));
+
+            return ['c_' . $this->shortName => $this->url->renderToHtml()];
         }
 
         $page = $this->page ?? [];

src/Table/Column/Multiformat.php

@@ -66,8 +66,7 @@ public function getHtmlTags(Model $row, ?Field $field): array
         }
 
         $template = new HtmlTemplate($cellHtml);
-        $template->setApp($this->getApp());
-        $template->set($row);
+        $template->trySet($this->getApp()->uiPersistence->typecastSaveRow($row, $row->get()));
         $template->dangerouslySetHtml($htmlTags);
 
         $val = $template->renderToHtml();

src/View.php

@@ -237,10 +237,6 @@ protected function init(): void
             }
         }
 
-        if ($this->template !== null && (!$this->template->issetApp() || $this->template->getApp() !== $app)) {
-            $this->template->setApp($app);
-        }
-
         foreach ($addLater as [$object, $region]) {
             $this->add($object, $region);
         }

tests/HtmlTemplateTest.php

@@ -5,7 +5,6 @@
 namespace Atk4\Ui\Tests;
 
 use Atk4\Core\Phpunit\TestCase;
-use Atk4\Data\Model;
 use Atk4\Ui\Exception;
 use Atk4\Ui\HtmlTemplate;
 
@@ -183,23 +182,6 @@ public function testParseDollarTags(): void
         self::assertSameTemplate('{foo}Hello{/} guys and {bar}welcome{/} here', $t);
     }
 
-    public function testSetFromEntity(): void
-    {
-        $model = new Model();
-        $model->addField('foo');
-        $model->addField('bar');
-        $model->addField('baz');
-        $entity = $model->createEntity();
-        $entity->set('foo', 'Hello');
-        $entity->set('bar', '<br>');
-        $entity->set('baz', 'not in template');
-
-        $t = new HtmlTemplate('{$foo} {$bar}');
-        $t->setApp($this->createApp());
-        $t->set($entity);
-        self::assertSameTemplate('{foo}Hello{/foo} {bar}&lt;br&gt;{/bar}', $t);
-    }
-
     public function testSetFromArray(): void
     {
         $t = new HtmlTemplate('{$foo} {$bar}');
@@ -231,15 +213,6 @@ public function testTagNotDefinedFromArrayException(): void
         }
     }
 
-    public function testSetHtmlFromEntityException(): void
-    {
-        $t = new HtmlTemplate();
-
-        $this->expectException(Exception::class);
-        $this->expectExceptionMessage('HTML is not allowed to be dangerously set from Model');
-        $t->dangerouslySetHtml(new Model());
-    }
-
     public function testSetEmptyTagException(): void
     {
         $t = new HtmlTemplate();