fix more normal HTML problems

LordSimal · LordSimal · commit c4cb1f88dcd4 · 2023-10-14T10:43:56.000+02:00
diff --git a/README.md b/README.md
@@ -163,6 +163,10 @@ $tagEngine = new \LordSimal\CustomHtmlElements\TagEngine([
 ]);
 ```
 
+## More examples?
+
+See the [TagEngineTest](https://github.com/LordSimal/custom-html-elements/blob/main/tests/TagEngineTest.php) for all kinds of different variants how to use the TagEngine
+
 ## Acknowledgements
 
 This library is inspired by the following packages
diff --git a/src/TagEngine.php b/src/TagEngine.php
@@ -62,7 +62,7 @@ public function setDefaults(): void
                     TagRegistry::register($class);
                 }
                 // Also catch all other HTML elements
-                $searchRegex .= '|\b.*>\b';
+                $searchRegex .= '|\b\w*[>\s]\b';
             }
             $this->searchReg = "<($searchRegex)";
         }
@@ -221,7 +221,7 @@ public function processTags(string $source): array
                 $closer = "</$tagName>";
                 $currentSource = substr($source, $eot); // HTML from Last occurrence till end or Last processed Tag
                 $nextDOM = strpos($currentSource, '<', 1); // Start of Next DOM Tag
-                $nextCloseTag = strpos($currentSource, '/' . '>'); // Close Bracket Loc
+                $nextCloseTag = strpos($currentSource, '/>'); // Close Bracket Loc
 
                 if ($nextCloseTag !== false && ($nextCloseTag < $nextDOM || ($nextCloseTag && $nextDOM === false))) {
                     // Closing DOM is before the next DOM element (indicates <tag /> format)
diff --git a/tests/TagEngineTest.php b/tests/TagEngineTest.php
@@ -10,7 +10,7 @@
 use RecursiveIteratorIterator;
 
 /**
- * @see TagEngine
+ * @see \LordSimal\CustomHtmlElements\TagEngine
  */
 class TagEngineTest extends TestCase
 {
@@ -294,7 +294,7 @@ public function testTagWithAttributeAndNormalHTML(): void
      */
     public function testTagWithAttributeSelfClosingAndNormalHTML(): void
     {
-        $element = '<c-youtube src="RLdsCL4RDf8" /><div>Test</div>';
+        $element = '<c-youtube src="RLdsCL4RDf8" /><div>Test</div><input type="text" />';
         $tagEngine = new TagEngine([
             'tag_directories' => [__DIR__ . DIRECTORY_SEPARATOR . 'Tags' . DIRECTORY_SEPARATOR],
         ]);
@@ -304,7 +304,7 @@ public function testTagWithAttributeSelfClosingAndNormalHTML(): void
 				src="https://www.youtube.com/embed/RLdsCL4RDf8" 
 				allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" 
 				allowfullscreen>
-			</iframe><div>Test</div>
+			</iframe><div>Test</div><input type="text" />
 HTML;
         $this->assertSame($expected, $result);
     }
@@ -340,4 +340,28 @@ public function testNoCustomTag(): void
         $expected = '<div>This is a Test</div>';
         $this->assertSame($expected, $result);
     }
+
+    /**
+     * Test output buffered
+     *
+     * @return void
+     */
+    public function testOutputBuffered(): void
+    {
+        $element = '<c-github></c-github>';
+        $tagEngine = new TagEngine([
+            'tag_directories' => [
+                __DIR__ . DIRECTORY_SEPARATOR . 'Tags' . DIRECTORY_SEPARATOR,
+                __DIR__ . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR,
+            ],
+        ]);
+        ob_start();
+        echo $element;
+        $result = $tagEngine->parse();
+        $expected = <<<HTML
+			This is a render from a plugin tag
+            
+HTML;
+        $this->assertSame($expected, $result);
+    }
 }
diff --git a/tests/TagRegistryTest.php b/tests/TagRegistryTest.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace LordSimal\CustomHtmlElements\Test;
+
+use LordSimal\CustomHtmlElements\Error\TagNotFoundException;
+use LordSimal\CustomHtmlElements\TagRegistry;
+use LordSimal\CustomHtmlElements\Test\Tags\Button;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @see \LordSimal\CustomHtmlElements\TagRegistry
+ */
+class TagRegistryTest extends TestCase
+{
+    public function testRegisterAndGet(): void
+    {
+        TagRegistry::register(Button::class);
+        $class = TagRegistry::getTag('c-button');
+        $this->assertSame($class, Button::class);
+    }
+
+    public function testRegisterAndGetAll(): void
+    {
+        TagRegistry::register(Button::class);
+        $tags = TagRegistry::getTags();
+        $this->assertSame($tags['c-button'], Button::class);
+    }
+
+    public function testGetUnknownTag(): void
+    {
+        $this->expectException(TagNotFoundException::class);
+        $this->expectExceptionMessage('Tag Unknown was not found.');
+        TagRegistry::getTag('Unknown');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function setDefaults(): void`
`62`	`62`	`TagRegistry::register($class);`
`63`	`63`	`}`
`64`	`64`	`// Also catch all other HTML elements`
`65`		`- $searchRegex .= '\|\b.*>\b';`
	`65`	`+ $searchRegex .= '\|\b\w*[>\s]\b';`
`66`	`66`	`}`
`67`	`67`	`$this->searchReg = "<($searchRegex)";`
`68`	`68`	`}`
`@@ -221,7 +221,7 @@ public function processTags(string $source): array`
`221`	`221`	`$closer = "</$tagName>";`
`222`	`222`	`$currentSource = substr($source, $eot); // HTML from Last occurrence till end or Last processed Tag`
`223`	`223`	`$nextDOM = strpos($currentSource, '<', 1); // Start of Next DOM Tag`
`224`		`- $nextCloseTag = strpos($currentSource, '/' . '>'); // Close Bracket Loc`
	`224`	`+ $nextCloseTag = strpos($currentSource, '/>'); // Close Bracket Loc`
`225`	`225`
`226`	`226`	`if ($nextCloseTag !== false && ($nextCloseTag < $nextDOM \|\| ($nextCloseTag && $nextDOM === false))) {`
`227`	`227`	`// Closing DOM is before the next DOM element (indicates <tag /> format)`