Merge pull request dutchiexl#132 from fabianderijk/issue-131

Updated twig, added microtime parameter

Author: PurHur

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "twig/twig":"~1.5|~2.0",
+        "twig/twig":"~3.0",
         "behat/behat": "~3.0",
         "behat/gherkin": "~4.2"
     },

features/bootstrap/FeatureContext.php

@@ -74,7 +74,7 @@ public function copyResultingTemplateToProjectRoot()
     public function prepareTestFolders()
     {
         $dir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'behat' . DIRECTORY_SEPARATOR .
-            md5(microtime() * rand(0, 10000));
+            md5(microtime(TRUE) * rand(0, 10000));
 
         mkdir($dir . '/features/bootstrap/i18n', 0777, true);
         mkdir($dir . '/junit');

src/Renderer/TwigRenderer.php

@@ -3,8 +3,8 @@
 namespace emuse\BehatHTMLFormatter\Renderer;
 
 use emuse\BehatHTMLFormatter\Formatter\BehatHTMLFormatter;
-use Twig_Environment;
-use Twig_Loader_Filesystem;
+use Twig\Environment;
+use \Twig\Loader\FilesystemLoader;
 
 /**
  * Twig renderer for Behat report.
@@ -35,8 +35,8 @@ public function renderBeforeExercise(BehatHTMLFormatter $obj)
     public function renderAfterExercise(BehatHTMLFormatter $obj)
     {
         $templatePath = dirname(__FILE__).'/../../templates';
-        $loader = new Twig_Loader_Filesystem($templatePath);
-        $twig = new Twig_Environment($loader, array());
+        $loader = new FilesystemLoader($templatePath);
+        $twig = new Environment($loader, array());
         $print = $twig->render('index.html.twig',
             array(
                 'suites' => $obj->getSuites(),