Merge branch 'release/2.0.0'

GermaniaKG · Dec 22, 2016 · 52433d6 · 52433d6
2 parents 01095c3 + 4f2b5f8
commit 52433d6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 	},
 
 	"require": {
-		  "germania-kg/websites": "^1.0",
+		  "germania-kg/websites": "^2.0",
 			"psr/log": "^1.0",
 		  "slim/slim": "^3.5",
 		  "psr/http-message": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/WebsiteMiddleware.php b/src/WebsiteMiddleware.php
@@ -87,27 +87,37 @@ public function __invoke(Request $request, Response $response, $next)
 
 
         // ---------------------------------------
-        // 3. After that, render 'full page' template
+        // 3. Create template variables
         // ---------------------------------------
 
-        // Output global website template
-        $this->logger->debug("Render page template…");
-
-        $render    = $this->render;
-        $full_page_html = $render( $this->template, array_merge(
+        $vars = array_merge(
             $this->defaults, [
                 'title'    =>  $website->getTitle(),
                 'id'       =>  $website->getDomId(),
                 'base_url' =>  $request->getUri()->getBaseUrl(),
                 'content'  =>  (string) $content_response->getBody()
             ]
-        ));
+        );
+
+        $vars['javascripts'] = isset($vars['javascripts']) ? array_merge($vars['javascripts'], $website->getJavascripts()) : $website->getJavascripts();
+        $vars['stylesheets'] = isset($vars['stylesheets']) ? array_merge($vars['stylesheets'], $website->getStylesheets()) : $website->getStylesheets();
+
+
+        // ---------------------------------------
+        // 5. After that, render 'full page' template
+        // ---------------------------------------
+
+        // Output global website template
+        $this->logger->debug("Render page template…");
+
+        $render    = $this->render;
+        $full_page_html = $render( $this->template, $vars);
 
         $this->logger->debug("Finish page template render; write response");
 
 
         // ---------------------------------------
-        // 4. Write response
+        // 6. Write response
         // ---------------------------------------
 
         $full_html_response_body = new ResponseBody(fopen('php://temp', 'r+'));

diff --git a/tests/default/WebsiteMiddlewareTest.php b/tests/default/WebsiteMiddlewareTest.php
@@ -22,6 +22,8 @@ public function testInstantiation( $template, $defaults, $logger )
         $website_mock = $this->prophesize( WebsiteInterface::class );
         $website_mock->getTitle()->willReturn( "TheTitle" );
         $website_mock->getDomId()->willReturn( "dom-id" );
+        $website_mock->getJavascripts()->willReturn( array("javascript") );
+        $website_mock->getStylesheets()->willReturn( array("stylesheet") );
         $website = $website_mock->reveal();
 
 
@@ -50,6 +52,8 @@ public function testInvokation( $template, $defaults, $logger )
         $website_mock = $this->prophesize( WebsiteInterface::class );
         $website_mock->getTitle()->willReturn( "TheTitle" );
         $website_mock->getDomId()->willReturn( "dom-id" );
+        $website_mock->getJavascripts()->willReturn( array("javascript") );
+        $website_mock->getStylesheets()->willReturn( array("stylesheet") );
         $website = $website_mock->reveal();
 
         $container_mock = $this->prophesize( ContainerInterface::class );