Merge pull request #2 from preprocess/feature/update-plugin

Add a test

composer.json

@@ -14,10 +14,5 @@
         "psr-4": {
             "Pre\\Phpx\\Html\\": "source"
         }
-    },
-    "autoload-dev": {
-        "files": [
-            "tests/TestCase.php"
-        ]
     }
 }

source/Children.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Pre\Phpx\Html;
+
+use ArrayIterator;
+use IteratorAggregate;
+
+class Children implements IteratorAggregate
+{
+    public function __construct(array $children)
+    {
+        $this->children = $children;
+    }
+
+    public function getIterator()
+    {
+        return new ArrayIterator($this->children);
+    }
+
+    public function __toString()
+    {
+        $result = "";
+
+        foreach ($this->children as $child) {
+            if (is_callable($child) && !is_string($child)) {
+                $result .= $child();
+            } else {
+                $result .= $child;
+            }
+        }
+
+        return $result;
+    }
+}

source/Renderer.php

@@ -635,7 +635,7 @@ private function classNameFrom($className = null, $wrapped = true)
             return null;
         }
 
-        if (is_callable($className)) {
+        if (is_callable($className) && !is_string($className)) {
             $result = $this->classNameFrom($className(), false);
         }
 
@@ -696,7 +696,7 @@ private function styleFrom($style = null, $wrapped = true)
     private function childrenFrom($children = null)
     {
         if (is_array($children)) {
-            return join("", $children);
+            return new Children($children);
         }
 
         return $children;
@@ -727,6 +727,10 @@ private function attributesFrom($props)
                 $value = $value();
             }
 
+            if (is_array($value)) {
+                $value = join(" ", $value);
+            }
+
             $attributes[] = "{$key}=\"{$value}\"";
         }
 

tests/RendererTest.php

@@ -1,9 +1,39 @@
 <?php
 
-class RendererTest extends TestCase
+use PHPUnit\Framework\TestCase;
+
+use function Pre\Phpx\Html\render;
+
+class RenderTest extends TestCase
 {
     public function test_can_render_html()
     {
-        // TODO
+        $actual = render("a", [
+            "className" => [
+                "link",
+                function() {
+                    return "lazy-link";
+                },
+            ],
+            "style" => [
+                "border" => "solid 1px #efefef",
+                "font-weight" => function() {
+                    return "bold";
+                },
+            ],
+            "children" => [
+                "left",
+                " ",
+                function() {
+                    return "middle";
+                },
+                " ",
+                "right",
+            ],
+        ]);
+
+        $expected = "<a class=\"link lazy-link\" style=\"border: solid 1px #efefef; font-weight: bold;\">left middle right</a>";
+
+        $this->assertEquals($expected, $actual, $actual);
     }
 }