Fix issue in TwigLoader::load

rougin · Dec 9, 2023 · beddc7f · beddc7f
1 parent b5587a1
commit beddc7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/Template/TwigLoader.php b/src/Template/TwigLoader.php
@@ -22,7 +22,7 @@ public function exists()
 
     /**
      * @param  string|string[] $path
-     * @return \Rougin\Slytherin\Template\RendererInterface
+     * @return \Twig\Environment
      */
     public function load($path)
     {
@@ -45,11 +45,7 @@ public function load($path)
 
         $environment = new \ReflectionClass($environment);
 
-        /**
-         * @var \Twig\Environment
-         */
-        $environment = $environment->newInstance($loader);
-
-        return new TwigRenderer($environment);
+        /** @var \Twig\Environment */
+        return $environment->newInstance($loader);
     }
 }
diff --git a/tests/Template/Twig/RendererTest.php b/tests/Template/Twig/RendererTest.php
@@ -32,7 +32,7 @@ protected function doSetUp()
             $this->markTestSkipped('Twig is not installed.');
         }
 
-        $path = __DIR__ . '/../../Fixture/Templates';
+        $path = realpath(__DIR__ . '/../../Fixture/Templates');
 
         $this->twig = $twig->load((string) $path);
 
@@ -48,7 +48,7 @@ public function testRenderMethod()
     {
         $expected = 'This is a text from a template.';
 
-        $rendered = $this->renderer->render('test.php');
+        $rendered = $this->renderer->render('test', array(), 'php');
 
         $this->assertEquals($expected, $rendered);
     }
@@ -64,7 +64,7 @@ public function testRenderMethodWithData()
 
         $data = array('name' => 'template');
 
-        $rendered = $this->renderer->render('test-with-twig-data.php', $data);
+        $rendered = $this->renderer->render('test-with-twig-data', $data, 'php');
 
         $this->assertEquals($expected, $rendered);
     }
@@ -84,7 +84,7 @@ public function testRenderMethodWithGlobals()
 
         $renderer->addGlobal('test', 'wew');
 
-        $rendered = $renderer->render('test-with-twig-data.php');
+        $rendered = $renderer->render('test-with-twig-data', array(), 'php');
 
         $this->assertEquals($expected, $rendered);
     }