simplified Twig extractor

Author: oscarotero

src/Extractors/Twig.php

@@ -5,6 +5,7 @@
 use Gettext\Translations;
 use Twig_Loader_String;
 use Twig_Environment;
+use Twig_Extensions_Extension_I18n;
 
 /**
  * Class to get gettext strings from twig files returning arrays.
@@ -16,55 +17,31 @@ class Twig extends Extractor implements ExtractorInterface
      *
      * @var Twig_Environment
      */
-    protected static $twig;
+    private static $twig;
 
     /**
      * {@inheritdoc}
      */
     public static function fromString($string, Translations $translations, array $options = [])
     {
-        self::addExtension('Twig_Extensions_Extension_I18n');
-
-        $string = self::$twig->compileSource($string);
+        $string = self::getTwig()->compileSource($string);
 
         PhpCode::fromString($string, $translations, $options);
     }
 
     /**
-     * Initialise Twig if it isn't already, and add a given Twig extension.
-     * This must be called before calling fromString().
-     *
-     * @param mixed $extension Already initialised extension to add
-     */
-    public static function addExtension($extension)
-    {
-        // initialise twig
-        if (!isset(self::$twig)) {
-            $twigCompiler = new Twig_Loader_String();
-
-            self::$twig = new Twig_Environment($twigCompiler);
-        }
-
-        if (!self::checkHasExtensionByClassName($extension)) {
-            self::$twig->addExtension(new $extension());
-        }
-    }
-
-    /**
-     * Checks if a given Twig extension is already registered or not.
-     *
-     * @param  string   Name of Twig extension to check
+     * Returns a Twig instance.
      *
-     * @return bool Whether it has been registered already or not
+     * @return Twig_Environment
      */
-    protected static function checkHasExtensionByClassName($className)
+    private static function getTwig()
     {
-        foreach (self::$twig->getExtensions() as $extension) {
-            if ($className == get_class($extension)) {
-                return true;
-            }
+        //Initialise twig
+        if (self::$twig === null) {
+            self::$twig = new Twig_Environment(new Twig_Loader_String());
+            self::$twig->addExtension(new Twig_Extensions_Extension_I18n());
         }
 
-        return false;
+        return self::$twig;
     }
 }