Drop Persistence\Post class (#1974)

atk4 · Jan 22, 2023 · af72a2b · af72a2b
1 parent 9aa0cc5
commit af72a2b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 87 deletions.
diff --git a/src/HtmlTemplate.php b/src/HtmlTemplate.php
@@ -114,7 +114,11 @@ public function cloneRegion(string $tag): self
     protected function _unsetFromTagTree(TagTree $tagTree, int $k): void
     {
         \Closure::bind(function () use ($tagTree, $k) {
-            unset($tagTree->children[$k]);
+            if ($k === array_key_last($tagTree->children)) {
+                array_pop($tagTree->children);
+            } else {
+                unset($tagTree->children[$k]);
+            }
         }, null, TagTree::class)();
     }
 

diff --git a/src/Persistence/Post.php b/src/Persistence/Post.php
diff --git a/tests/HtmlTemplateTest.php b/tests/HtmlTemplateTest.php
@@ -78,11 +78,21 @@ public function testHasTag(): void
         static::assertFalse($t->hasTag(['foo', 'bar', 'non_existent_tag']));
     }
 
-    public function testSetBadTypeException(): void
+    public function testSetInvalidUtf8Exception(): void
     {
         $t = new HtmlTemplate('{foo}hello{/} guys');
 
         $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Value is not valid UTF-8');
+        $t->set('foo', "\xc2");
+    }
+
+    public function testSetNonScalarException(): void
+    {
+        $t = new HtmlTemplate('{foo}hello{/} guys');
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Value must be scalar');
         $t->set('foo', new \stdClass()); // @phpstan-ignore-line
     }
 
@@ -125,6 +135,28 @@ public function testSetAppendDel(): void
         static::assertSameTemplate('{foo}Hi and <b>welcome</b> my dear and <b>smart</b>{/} guys', $t);
     }
 
+    public function testValueEncoded(): void
+    {
+        $t = new HtmlTemplate('{foo}hello{/} guys');
+        $tagTreeFoo = $t->getTagTree('foo');
+
+        static::assertTrue($tagTreeFoo->getChildren()[0]->isEncoded());
+        static::assertSame('hello', $tagTreeFoo->getChildren()[0]->getHtml());
+
+        $t->set('foo', '<br>');
+        static::assertFalse($tagTreeFoo->getChildren()[0]->isEncoded());
+        static::assertSame('&lt;br&gt;', $tagTreeFoo->getChildren()[0]->getHtml());
+        static::assertSame('<br>', $tagTreeFoo->getChildren()[0]->getUnencoded());
+
+        $t->dangerouslyAppendHtml('foo', '<br>');
+        static::assertTrue($tagTreeFoo->getChildren()[1]->isEncoded());
+        static::assertSame('<br>', $tagTreeFoo->getChildren()[1]->getHtml());
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Unencoded value is not available');
+        $tagTreeFoo->getChildren()[1]->getUnencoded();
+    }
+
     public function testClone(): void
     {
         $t = new HtmlTemplate('{foo}{inner}hello{/}{/} guys');

diff --git a/tests/PersistencePostTest.php b/tests/PersistencePostTest.php