Update Source Code

app/src/Core/Service/View.php

-<<<<<<< HEAD
-<?php
-
-namespace App\Core\Service;
-
-use App\Core\DIService;
-use Slim\Views\Twig;
-use Slim\Views\TwigExtension;
-use Slim\Http\Uri;
-use Slim\Http\Environment;
-
-class View extends DIService {
-
-    /**
-     *
-     * @var array
-     */
-    protected $config = [];
-
-    /**
-     *
-     * @var string
-     */
-    protected $base_path = VIEW_PATH;
-
-    public function inject() {
-
-        $views = $this->path ? $this->path : $this->container->get('settings')['views'];
-        $config = $this->config;
-        $base_path = $this->base_path;
-
-        $this->container[self::class] = function ($container) use ($views, $config, $base_path) {
-
-            $viewObj = new Twig($base_path, $config);
-
-            foreach ($views as $namespace => $view_path) {
-                $viewObj->getLoader()->addPath(
-                        preg_replace('/\/{2,}/', '/', "{$base_path}/{$view_path}"), $namespace
-                );
-            }
-
-            // Instantiate and add Slim specific extension
-            $router = $container->get('router');
-            $uri = Uri::createFromEnvironment(new Environment($_SERVER));
-            $viewObj->addExtension(new TwigExtension($router, $uri));
-            $viewObj->getEnvironment()->setCache(FALSE);
-
-            return $viewObj;
-        };
-    }
-
-}
-=======
 <?php
 
 namespace App\Core\Service;
@@ -63,23 +10,42 @@ use Slim\Http\Environment;
 
 class View extends DIService {
 
+    /**
+     *
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     *
+     * @var string
+     */
+    protected $base_path = VIEW_PATH;
+
     public function inject() {
 
-        $view_config = $this->container->get('settings')['view'];
+        $views = $this->path ? $this->path : $this->container->get('settings')['views'];
+        $config = $this->config;
+        $base_path = $this->base_path;
+
+        $this->container[self::class] = function ($container) use ($views, $config, $base_path) {
 
-        $this->container['view'] = function ($container) use ($view_config) {
+            $viewObj = new Twig($base_path, $config);
 
-          $view = new Twig($view_config['path'], []);
+            foreach ($views as $namespace => $view_path) {
+                $viewObj->getLoader()->addPath(
+                        preg_replace('/\/{2,}/', '/', "{$base_path}/{$view_path}"), $namespace
+                );
+            }
 
             // Instantiate and add Slim specific extension
-          $router = $container->get('router');
-          $uri = Uri::createFromEnvironment(new Environment($_SERVER));
-          $view->addExtension(new TwigExtension($router, $uri)); 
-          $view->getEnvironment()->setCache(FALSE);
+            $router = $container->get('router');
+            $uri = Uri::createFromEnvironment(new Environment($_SERVER));
+            $viewObj->addExtension(new TwigExtension($router, $uri));
+            $viewObj->getEnvironment()->setCache(FALSE);
 
-          return $view;
-      };
-  }
+            return $viewObj;
+        };
+    }
 
 }
->>>>>>> 0729a81cb7c7996fb0edc154bf9e52b58c42847c