7

Author: hikki

src/Assembly/Abs/Component.php

@@ -6,5 +6,5 @@
 
 interface Component
 {
-    public function __invoke();
+    public function __toString();
 }

src/Assembly/Abs/Input.php

@@ -141,5 +141,5 @@ public function annotate()
         $this->annotation = "{$attribute} {$enumerate} style=\"{$style}\"";
     }
 
-    abstract public function __invoke();
+    abstract public function __toString();
 }

src/Assembly/Abs/Layout.php

@@ -10,5 +10,5 @@ interface Layout
      * @param Component|Layout $document
      */
     public function append($document);
-    public function __invoke();
+    public function __toString();
 }

src/Assembly/Abs/Widget.php

@@ -70,5 +70,5 @@ public function annotate()
         $this->annotation = "{$attribute} {$enumerate} style=\"{$style}\"";
     }
 
-    abstract public function __invoke();
+    abstract public function __toString();
 }

src/Assembly/Layout/Section.php

@@ -27,11 +27,11 @@ public function append($document)
         if ($document instanceof Component || $document instanceof Layout) $this->documents[] = $document;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         $html = "";
         foreach ($this->documents as $document) {
-            $html .= $document();
+            $html .= $document;
         }
         $cols = str_repeat(" 1fr ", $this->cols);
         return sprintf("<div class='dlp-section' style='grid-template-columns:{$cols};{$this->style}'>%s</div>", $html);

src/Assembly/Layout/Swing.php

@@ -25,11 +25,11 @@ public function append($document)
         if ($document instanceof Component || $document instanceof Layout) $this->documents[] = $document;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         $html = "";
         foreach ($this->documents as $document) {
-            $html .= $document();
+            $html .= $document;
         }
 
         return sprintf("<div id='dlp-swing-{$this->column}' class='dlp-swing'>%s</div>", $html);

src/Assembly/Unit/Button.php

@@ -31,14 +31,13 @@ public function label($title)
         return $this;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         if(!$this->label) return $this->content;
 
         return <<<EOF
 <div class="dlp dlp-form-row">
-    <label class="dlp-text" for="{$this->column}">{$this->label}</label>
-    {$this->content}
+    <label class="dlp-text" for="{$this->column}">{$this->label}</label>{$this->content}
 </div>
 EOF;
     }

src/Assembly/Unit/CascadeDot.php

@@ -61,7 +61,7 @@ public function withoutHiddenInput()
         return $this;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         $this->selected = json_encode($this->selected);
         $this->annotate();

src/Assembly/Unit/CascadeLine.php

@@ -28,7 +28,7 @@ public function url($url)
         return $this;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         $this->annotate();
         $content = <<<EOF

src/Assembly/Unit/Datetime.php

@@ -39,7 +39,7 @@ public function locale($lan = 'zh-CN')
         return $this;
     }
 
-    public function __invoke()
+    public function __toString()
     {
         $pickerSettings = json_encode(array_merge(['format' => 'YYYY-MM-DD HH:mm:ss', 'locale' => 'zh-CN'], $this->pickerSettings));
         $this->annotate();