Extractor: Merged twig-gettext-extractor bin to fix filter support

Author: roydejong

twig-gettext-extractor

@@ -12,32 +12,74 @@
 
 use Twig\Gettext\Util\DebugLogger;
 
+
+// Init composer
 if (file_exists($a = __DIR__.'/../../autoload.php')) {
     require_once $a;
 } else {
     require_once __DIR__.'/vendor/autoload.php';
 }
 
-try {
-    $twig = new Twig_Environment(new Twig\Gettext\Loader\Filesystem(DIRECTORY_SEPARATOR), array(
-        'cache' => implode(DIRECTORY_SEPARATOR, array(sys_get_temp_dir(), 'cache', uniqid())),
-        'auto_reload' => true
-    ));
+// Init twig + core extensions
+$twig = new Twig_Environment(new Twig\Gettext\Loader\Filesystem(DIRECTORY_SEPARATOR), array(
+    'cache'       => implode(DIRECTORY_SEPARATOR, array(sys_get_temp_dir(), 'cache', uniqid()) ),
+    'auto_reload' => true
+));
+
+$twig->addExtension(new Twig_Extensions_Extension_I18n());
 
-    $twig->addExtension(new Twig_Extensions_Extension_I18n());
+// Read argv for config
+array_shift($_SERVER['argv']);
 
-    array_shift($_SERVER['argv']);
-    $addTemplate = false;
+$argvReadingTemplates = false;
+$argvReadingFilters = false;
 
+$resetArgv = function () use (&$argvReadingFilters, &$argvReadingTemplates) {
+    $argvReadingFilters = false;
+    $argvReadingTemplates = false;
+};
+
+try {
     $extractor = new Twig\Gettext\Extractor($twig);
 
-    foreach ($_SERVER['argv'] as $arg) {
-        if ('--files' == $arg) {
-            $addTemplate = true;
-        } else if ($addTemplate) {
-            $extractor->addTemplate(getcwd() . DIRECTORY_SEPARATOR . $arg);
+    /**
+     * Syntax for argv:
+     *
+     * twig-gettext-extractor <xgettext arguments> <extractor arguments>
+     *
+     * xgettext arguments can be "--sort-output", "--force-po", etc and are processed directly.
+     * extractor arguments are specific to the twig extractor
+     *
+     * --files          Add a template file to the list of files that need to be extracted.
+     * --filters        Add a dummy filter that is custom to the project to prevent the extractor breaking.
+     */
+
+    foreach ($_SERVER['argv'] as $argument) {
+        // Command starters ------------------------------------------------------------------------------------------------
+        if ($argument === '--filters') {
+            $resetArgv();
+            $argvReadingFilters = true;
+            continue;
+        }
+
+        if ($argument === '--files') {
+            $resetArgv();
+            $argvReadingTemplates = true;
+            continue;
+        }
+
+        // Command parameters ----------------------------------------------------------------------------------------------
+        if ($argvReadingFilters) {
+            // We are in a --filters statement
+            $twig->addFilter(new Twig_SimpleFilter($argument, function ($input) {
+                return $input;
+            }));
+        } else if ($argvReadingTemplates) {
+            // We are in a --files statement
+            $extractor->addTemplate(getcwd() . DIRECTORY_SEPARATOR . $argument);
         } else {
-            $extractor->addGettextParameter($arg);
+            // We are not in a statement, process as gettext parameter
+            $extractor->addGettextParameter($argument);
         }
     }