Change: Twig::createTwig() creates only one Twig_Environment instance now

Author: kenjis

libraries/Twig.php

@@ -35,8 +35,20 @@ public function __construct($params = [])
 		$this->config = array_merge($this->config, $params);
 	}
 
+	public function resetTwig()
+	{
+		$this->twig = null;
+		$this->createTwig();
+	}
+
 	public function createTwig()
 	{
+		// $this->twig is singleton
+		if ($this->twig !== null)
+		{
+			return;
+		}
+
 		if (ENVIRONMENT === 'production')
 		{
 			$debug = FALSE;

tests/libraries/TwigHelperTest.php

@@ -19,7 +19,7 @@ public function setUp()
             'site_url' => '{{ site_url(\'"><s>abc</s><a name="test\') }}',
         ]);
         $CI->twig->setLoader($loader);
-        $CI->twig->createTwig();
+        $CI->twig->resetTwig();
 
         $this->obj = $CI->twig;
         $this->twig = $CI->twig->getTwig();