Merge pull request #3 from librarianphp/update-librarian-core

Updating librarian core, now injecting contentType in views

Author: erikaheidi

Command/Web/ContentController.php

@@ -2,6 +2,7 @@
 
 namespace librarianphp\Web;
 
+use Librarian\ContentType;
 use Librarian\Provider\TwigServiceProvider;
 use Librarian\Response;
 use Librarian\Provider\ContentServiceProvider;
@@ -14,7 +15,7 @@
  */
 class ContentController extends WebController
 {
-    public function handle(): int
+    public function handle(): void
     {
         /** @var TwigServiceProvider $twig */
         $twig = $this->getApp()->twig;
@@ -37,17 +38,17 @@ public function handle(): int
                 }
 
                 $start = ($page * $limit) - $limit;
-
-                $content_list = $content_provider->fetchFrom($request->getRoute(), $start, $limit);
+                $contentType = $content_provider->getContentType($request->getRoute());
+                $content_list = $content_provider->fetchFrom($contentType, $start, $limit);
                 $response = new Response($twig->render('content/listing.html.twig', [
                     'content_list' => $content_list,
                     'total_pages' => $content_provider->fetchTotalPages($limit),
                     'current_page' => $page,
-                    'base_url' => $request->getRoute()
+                    'base_url' => $request->getRoute(),
+                    'content_type' => $contentType
                 ]));
 
                 $response->output();
-                return 0;
             }
         } catch (\Exception $e) {
             Response::redirect('/notfound');
@@ -60,6 +61,5 @@ public function handle(): int
 
         $response = new Response($output);
         $response->output();
-        return 0;
     }
 }

Command/Web/ErrorController.php

@@ -8,7 +8,7 @@
 
 class ErrorController extends WebController
 {
-    public function handle()
+    public function handle(): void
     {
         /** @var Environment $twig */
         $twig = $this->getApp()->twig;

Command/Web/FeedController.php

@@ -11,7 +11,7 @@
 
 class FeedController extends WebController
 {
-    public function handle()
+    public function handle(): void
     {
         $feed = new Feed();
         $channel = new Channel();

Command/Web/IndexController.php

@@ -10,7 +10,7 @@
 
 class IndexController extends WebController
 {
-    public function handle()
+    public function handle(): void
     {
         /** @var TwigServiceProvider $twig */
         $twig = $this->getApp()->twig;
@@ -27,7 +27,6 @@ public function handle()
                 ]));
 
                 $response->output();
-                return 0;
             }
         }
 
@@ -52,6 +51,5 @@ public function handle()
         $response = new Response($output);
 
         $response->output();
-        return 0;
     }
 }

Command/Web/NotFoundController.php

@@ -8,7 +8,7 @@
 
 class NotFoundController extends WebController
 {
-    public function handle()
+    public function handle(): void
     {
         /** @var Environment $twig */
         $twig = $this->getApp()->twig;

Command/Web/TagController.php

@@ -12,7 +12,7 @@ class TagController extends WebController
     /**
      * @throws \Exception
      */
-    public function handle()
+    public function handle(): void
     {
         /** @var TwigServiceProvider $twig */
         $twig = $this->getApp()->twig;