Removing unused connection parameter from Twig environment factory

Author: moufmouf

src/Mouf/Database/MagicQuery.php

@@ -244,7 +244,7 @@ private function getConnectionUniqueId() {
      */
     private function getTwigEnvironment() {
         if ($this->twigEnvironment === null) {
-            $this->twigEnvironment = SqlTwigEnvironmentFactory::getTwigEnvironment($this->connection);
+            $this->twigEnvironment = SqlTwigEnvironmentFactory::getTwigEnvironment();
         }
         return $this->twigEnvironment;
     }

src/Mouf/Database/MagicQuery/Twig/SqlTwigEnvironmentFactory.php

@@ -8,7 +8,13 @@
  */
 class SqlTwigEnvironmentFactory
 {
-    public static function getTwigEnvironment(Connection $connection = null) {
+    private static $twig;
+
+    public static function getTwigEnvironment() {
+        if (self::$twig) {
+            return self::$twig;
+        }
+
         $stringLoader = new StringLoader();
 
         $options = array(
@@ -21,13 +27,15 @@ public static function getTwigEnvironment(Connection $connection = null) {
 
         // Default escaper will throw an exception. This is because we want to use SQL parameters instead of Twig.
         // This ahs a number of advantages, especially in terms of caching.
-        $twig->getExtension('core')->setEscaper('sql', function(\Twig_Environment $env, $string, $charset) use ($connection) {
+        $twig->getExtension('core')->setEscaper('sql', function() {
             throw new ForbiddenTwigParameterInSqlException('You cannot use Twig expressions (like "{{ id }}"). Instead, you should use SQL parameters (like ":id"). Twig integration is limited to Twig statements (like "{% for .... %}"');
         });
 
         // Default autoescape mode: sql
         $twig->addExtension(new \Twig_Extension_Escaper('sql'));
 
+        self::$twig = $twig;
+
         return $twig;
     }
 

tests/Mouf/Database/MagicQuery/Twig/SqlTwigEnvironmentFactoryTest.php

@@ -9,38 +9,12 @@
 
 class SqlTwigEnvironmentFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    public function getTwigWithConnection()
-    {
-        global $db_url;
-        $config = new \Doctrine\DBAL\Configuration();
-        // TODO: put this in conf variable
-        $connectionParams = array(
-            'url' => $db_url,
-        );
-        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
-
-        $twigEnvironment = SqlTwigEnvironmentFactory::getTwigEnvironment($conn);
-        return $twigEnvironment;
-    }
-
-    /**
-     * We need to run this test in a separate process because Twig seems to be enable to register several escapers
-     * with the same name.
-     *
-     * @runInSeparateProcess
-     */
-    /*public function testWithoutConnection()
-    {
-        $twigEnvironment = SqlTwigEnvironmentFactory::getTwigEnvironment();
-        $this->doTestTwig($twigEnvironment);
-    }*/
-
     /**
      *
      */
     public function testIf() {
 
-        $twig = $this->getTwigWithConnection();
+        $twig = SqlTwigEnvironmentFactory::getTwigEnvironment();
         $sql = $twig->render("SELECT * FROM toto {% if id %}WHERE id = :id{% endif %}", ["id"=>12]);
         $this->assertEquals("SELECT * FROM toto WHERE id = :id", $sql);
     }
@@ -50,7 +24,7 @@ public function testIf() {
      */
     public function testException() {
 
-        $twig = $this->getTwigWithConnection();
+        $twig = SqlTwigEnvironmentFactory::getTwigEnvironment();
         $twig->render("SELECT * FROM toto WHERE id = {{ id }}", ["id"=>"hello"]);
     }
 }