Updated the view renderer.

jaxon-php · Apr 20, 2022 · 40fcacc · 40fcacc
1 parent 023bbd6
commit 40fcacc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 31 deletions.
diff --git a/src/App/AppInterface.php b/src/App/AppInterface.php
@@ -207,26 +207,27 @@ public function setSessionManager(Closure $xClosure);
     public function setContainer(ContainerInterface $xContainer);
 
     /**
-     * Add a view namespace, and set the corresponding renderer.
+     * Add a view renderer with an id
      *
-     * @param string $sNamespace    The namespace name
-     * @param string $sDirectory    The namespace directory
+     * @param string $sRenderer    The renderer name
      * @param string $sExtension    The extension to append to template names
-     * @param string $sRenderer    The corresponding renderer name
+     * @param Closure $xClosure    A closure to create the view instance
      *
      * @return void
      */
-    public function addViewNamespace(string $sNamespace, string $sDirectory, string $sExtension, string $sRenderer);
+    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
 
     /**
-     * Add a view renderer with an id
+     * Set the javascript asset
      *
-     * @param string $sId    The unique identifier of the view renderer
-     * @param Closure $xClosure    A closure to create the view instance
+     * @param bool $bExport    Whether to export the js code in a file
+     * @param bool $bMinify    Whether to minify the exported js file
+     * @param string $sUri    The URI to access the js file
+     * @param string $sDir    The directory where to create the js file
      *
-     * @return void
+     * @return AppInterface
      */
-    public function addViewRenderer(string $sId, Closure $xClosure);
+    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): AppInterface;
 
     /**
      * Read config options from a config file and set up the library

diff --git a/src/App/Traits/AjaxSendTrait.php b/src/App/Traits/AjaxSendTrait.php
@@ -52,7 +52,7 @@ public function sendResponse()
             header("Cache-Control: no-cache, must-revalidate");
             header("Pragma: no-cache");
         }
-        header('content-type: ' . $this->xResponseManager->getContentType());
+        header('Content-Type: ' . $this->xResponseManager->getContentType());
 
         print $sContent;
     }

diff --git a/src/App/Traits/AppTrait.php b/src/App/Traits/AppTrait.php
@@ -14,7 +14,6 @@
 
 namespace Jaxon\App\Traits;
 
-use Closure;
 use Jaxon\App\AppInterface;
 use Jaxon\App\Bootstrap;
 use Jaxon\App\Config\ConfigManager;
@@ -25,10 +24,12 @@
 use Jaxon\Response\Manager\ResponseManager;
 use Psr\Container\ContainerInterface;
 
+use Closure;
+
 trait AppTrait
 {
     use AjaxTrait {
-        getResponse as protected ajaxResponse;
+        AjaxTrait::getResponse as public ajaxResponse;
     }
 
     /**
@@ -120,32 +121,20 @@ public function setContainer(ContainerInterface $xContainer)
         $this->di()->setContainer($xContainer);
     }
 
-    /**
-     * Add a view namespace, and set the corresponding renderer.
-     *
-     * @param string $sNamespace    The namespace name
-     * @param string $sDirectory    The namespace directory
-     * @param string $sExtension    The extension to append to template names
-     * @param string $sRenderer    The corresponding renderer name
-     *
-     * @return void
-     */
-    public function addViewNamespace(string $sNamespace, string $sDirectory, string $sExtension, string $sRenderer)
-    {
-        $this->di()->getViewRenderer()->addNamespace($sNamespace, $sDirectory, $sExtension, $sRenderer);
-    }
-
     /**
      * Add a view renderer with an id
      *
-     * @param string $sId    The unique identifier of the view renderer
+     * @param string $sRenderer    The renderer name
+     * @param string $sExtension    The extension to append to template names
      * @param Closure $xClosure    A closure to create the view instance
      *
      * @return void
      */
-    public function addViewRenderer(string $sId, Closure $xClosure)
+    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure)
     {
-        $this->di()->getViewRenderer()->addRenderer($sId, $xClosure);
+        $xViewRenderer = $this->di->getViewRenderer();
+        $xViewRenderer->addNamespace('default', '', $sExtension, $sRenderer);
+        $xViewRenderer->addRenderer($sRenderer, $xClosure);
     }
 
     /**

diff --git a/src/Request/Factory/Psr/PsrFactory.php b/src/Request/Factory/Psr/PsrFactory.php
@@ -21,6 +21,8 @@
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
+use Closure;
+
 class PsrFactory
 {
     /**
@@ -66,6 +68,22 @@ public function container(ContainerInterface $xContainer): PsrFactory
         return $this;
     }
 
+    /**
+     * Add a view renderer with an id
+     *
+     * @param string $sRenderer    The renderer name
+     * @param string $sExtension    The extension to append to template names
+     * @param Closure $xClosure    A closure to create the view instance
+     *
+     * @return void
+     */
+    public function view(string $sRenderer, string $sExtension, Closure $xClosure)
+    {
+        $xViewRenderer = $this->di->getViewRenderer();
+        $xViewRenderer->addNamespace('default', '', $sExtension, $sRenderer);
+        $xViewRenderer->addRenderer($sRenderer, $xClosure);
+    }
+
     /**
      * Get the Jaxon ajax PSR request handler
      *