Add new DTO structure

Author: wazabii8

Dom/Document.php

@@ -124,7 +124,7 @@ public function createPrepend(string $element, ?string $value = null, ?string $b
     {
         $inst = new Element($element, $value);
         if (is_null($this->elements)) {
-            $this->elements = array();
+            $this->elements = [];
         }
         if (!is_null($bind)) {
             //$new[$bind] = $inst;
@@ -183,7 +183,7 @@ public function execute(?callable $call = null): string
         }
         return $this->html;
     }
-    
+
     /**
      * Build document
      * @param  array         $arr  elements

Dom/Element.php

@@ -16,7 +16,7 @@
 class Element extends Document implements ElementInterface
 {
     private $elem;
-    private $attr = array();
+    private $attr = [];
     private $snippet;
     private $value;
     private $hideEmptyTag = false;

Interfaces/DocumentInterface.php

@@ -40,12 +40,12 @@ public function bindTag(string $tag, string $key, bool $prepend = false): Elemen
      */
     public function create($element, $value = null, ?string $bind = null): ElementInterface;
 
-     /**
-     * Prepend element first
-     * @param  string $element HTML tag (without brackets)
-     * @param  string $value   add value to tag
-     * @return ElementInterface
-     */
+    /**
+    * Prepend element first
+    * @param  string $element HTML tag (without brackets)
+    * @param  string $value   add value to tag
+    * @return ElementInterface
+    */
     public function createPrepend(string $element, ?string $value = null, ?string $bind = null): ElementInterface;
 
     /**

SwiftRender.php

@@ -77,6 +77,16 @@ public function setContainer(ContainerInterface $container): void
         $this->container = $container;
     }
 
+    /**
+     * Set a PSR-6 cache instance for partial views, not required
+     * @param CacheInterface $cache
+     * @return void
+     */
+    public function setCache(CacheInterface $cache): void
+    {
+        $this->cache = $cache;
+    }
+
     /**
      * Get container instance
      * @return ContainerInterface
@@ -202,7 +212,7 @@ public function setBuffer(string $output): self
      * @return self
      * @throws Exception
      */
-    public function setView(string|callable $file, array $args = array()): self
+    public function setView(string|callable $file, array $args = []): self
     {
         if (is_null($this->file) && is_string($file)) {
             $this->setFile($file);
@@ -219,7 +229,7 @@ public function setView(string|callable $file, array $args = array()): self
      * @return self
      * @throws Exception
      */
-    public function withView(string $file, array $args = array()): self
+    public function withView(string $file, array $args = []): self
     {
         $inst = clone $this;
         $inst->setView($file, $args);
@@ -234,9 +244,8 @@ public function withView(string $file, array $args = array()): self
      * @return SwiftRender
      * @throws Exception
      */
-    public function setPartial(string $partial, array $args = array(), int|false $cacheTime = false): self
+    public function setPartial(string $partial, array $args = [], int|false $cacheTime = false): self
     {
-        $this->partialKey = $partial;
         $keys = $this->selectPartial($partial, $file);
         if (is_null($this->file)) {
             $this->setFile($file);
@@ -273,7 +282,7 @@ public function unsetPartial(string $key): void
      * @return self
      * @throws Exception
      */
-    public function bindToBody(string $key, array $bindArr, array $args = array()): self
+    public function bindToBody(string $key, array $bindArr, array $args = []): self
     {
         $this->setFile($key);
         $func = $this->build($this->file, $args);
@@ -413,11 +422,10 @@ private function buildView(): void
      */
     private function build(
         string|callable $file,
-        array $args = array(),
+        array $args = [],
         ?string $partialKey = null,
         int|false $cacheTime = false
-    ): callable
-    {
+    ): callable {
 
         if(is_null($this->cache) && $cacheTime !== false) {
             throw new Exception("Cache is not configured");
@@ -433,7 +441,7 @@ private function build(
                 } else {
 
                     $throwError = true;
-                    $missingFiles = array();
+                    $missingFiles = [];
                     $files = explode("|", $file);
 
                     foreach($files as $file) {
@@ -484,8 +492,7 @@ private function getOutput(
         ?string $partialKey = null,
         array $args = [],
         int|false $cacheTime = false
-    ): void
-    {
+    ): void {
         if($this->get == "partial" && !is_null($this->cache) && $cacheTime !== false) {
             $partialKey = str_replace(["!", "/"], ["", "_"], $partialKey);
             $updateTime = filemtime($filePath);
@@ -552,7 +559,7 @@ private function existAtGet(string $key): bool
      */
     private function inclRouterFileData(string $filePath, object $obj, array $args): void
     {
-        $extract = ($obj instanceof Traverse) ? $obj->toArray(function($row) {
+        $extract = ($obj instanceof Traverse) ? $obj->toArray(function ($row) {
             return Traverse::value($row);
         }) : $args;
         extract($extract);

composer.json

@@ -1,6 +1,7 @@
 {
     "name": "maplephp/swiftrender",
     "type": "library",
+    "version": "v1.1.0",
     "description": "PHP SwiftRender is a pure and highly portable PHP template library.",
     "keywords": ["output buffer", "template", "engine", "partials", "components", "views"],
     "homepage": "https://wazabii.se",
@@ -17,7 +18,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "maplephp/dto": "^1.0",
+        "maplephp/dto": "^2.0",
         "maplephp/container": "^1.0"
     },
     "autoload": {