From: James Valleroy Date: Tue, 24 Aug 2021 13:59:05 -0400 Subject: Remove twig support Forwarded: not-needed --- src/Extractors/Twig.php | 45 ------------- tests/AbstractTest.php | 1 - tests/AssetsTest.php | 40 ------------ tests/assets/twig/Csv.csv | 19 ------ tests/assets/twig/CsvDictionary.csv | 10 --- tests/assets/twig/Jed.json | 39 ------------ tests/assets/twig/Json.json | 41 ------------ tests/assets/twig/JsonDictionary.json | 12 ---- tests/assets/twig/Mo.mo | Bin 225 -> 0 bytes tests/assets/twig/PhpArray.php | 62 ------------------ tests/assets/twig/Po.po | 52 --------------- tests/assets/twig/Xliff.xlf | 116 ---------------------------------- tests/assets/twig/Yaml.yml | 16 ----- tests/assets/twig/YamlDictionary.yml | 10 --- tests/assets/twig/input.php | 26 -------- 15 files changed, 489 deletions(-) delete mode 100644 src/Extractors/Twig.php delete mode 100644 tests/assets/twig/Csv.csv delete mode 100644 tests/assets/twig/CsvDictionary.csv delete mode 100644 tests/assets/twig/Jed.json delete mode 100644 tests/assets/twig/Json.json delete mode 100644 tests/assets/twig/JsonDictionary.json delete mode 100644 tests/assets/twig/Mo.mo delete mode 100644 tests/assets/twig/PhpArray.php delete mode 100644 tests/assets/twig/Po.po delete mode 100644 tests/assets/twig/Xliff.xlf delete mode 100644 tests/assets/twig/Yaml.yml delete mode 100644 tests/assets/twig/YamlDictionary.yml delete mode 100644 tests/assets/twig/input.php diff --git a/src/Extractors/Twig.php b/src/Extractors/Twig.php deleted file mode 100644 index 2060d08..0000000 --- a/src/Extractors/Twig.php +++ /dev/null @@ -1,45 +0,0 @@ - 'notes:', - 'twig' => null, - ]; - - /** - * {@inheritdoc} - */ - public static function fromString($string, Translations $translations, array $options = []) - { - $options += static::$options; - - $twig = $options['twig'] ?: static::createTwig(); - - PhpCode::fromString($twig->compileSource(new Twig_Source($string, '')), $translations, $options); - } - - /** - * Returns a Twig instance. - * - * @return Twig_Environment - */ - protected static function createTwig() - { - $twig = new Twig_Environment(new Twig_Loader_Array(['' => ''])); - $twig->addExtension(new Twig_Extensions_Extension_I18n()); - - return static::$options['twig'] = $twig; - } -} diff --git a/tests/AbstractTest.php b/tests/AbstractTest.php index 49ad4d9..0134a83 100644 --- a/tests/AbstractTest.php +++ b/tests/AbstractTest.php @@ -19,7 +19,6 @@ abstract class AbstractTest extends TestCase 'PhpArray' => 'php', 'PhpCode' => 'php', 'Po' => 'po', - 'Twig' => 'php', 'Xliff' => 'xlf', 'Yaml' => 'yml', 'YamlDictionary' => 'yml', diff --git a/tests/AssetsTest.php b/tests/AssetsTest.php index af797a8..c836051 100644 --- a/tests/AssetsTest.php +++ b/tests/AssetsTest.php @@ -343,46 +343,6 @@ class AssetsTest extends AbstractTest $this->runTestFormat('phpcode3/YamlDictionary', $countTranslations, $countTranslated); } - public function testTwig() - { - $translations = static::get('twig/input', 'Twig'); - $countTranslations = 10; - $countTranslated = 0; - $countHeaders = 8; - - $this->assertCount($countTranslations, $translations); - $this->assertCount($countHeaders, $translations->getHeaders()); - $this->assertEquals(0, $translations->countTranslated()); - - //Ignored in php5 because the line numbers doesn't match due different version of twig - if (PHP_MAJOR_VERSION >= 7) { - $this->assertContent($translations, 'twig/Po'); - $this->assertContent($translations, 'twig/Xliff'); - } - - $this->assertContent($translations, 'twig/Mo'); - $this->assertContent($translations, 'twig/PhpArray'); - $this->assertContent($translations, 'twig/Jed'); - $this->assertContent($translations, 'twig/Json'); - $this->assertContent($translations, 'twig/JsonDictionary'); - $this->assertContent($translations, 'twig/Csv'); - $this->assertContent($translations, 'twig/CsvDictionary'); - $this->assertContent($translations, 'twig/Yaml'); - $this->assertContent($translations, 'twig/YamlDictionary'); - - $this->runTestFormat('twig/Po', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/Mo', 0, $countTranslated, $countHeaders); - $this->runTestFormat('twig/PhpArray', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/Jed', $countTranslations, $countTranslated, 10); - $this->runTestFormat('twig/Xliff', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/Json', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/JsonDictionary', $countTranslations, $countTranslated); - $this->runTestFormat('twig/Csv', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/CsvDictionary', $countTranslations, $countTranslated); - $this->runTestFormat('twig/Yaml', $countTranslations, $countTranslated, $countHeaders); - $this->runTestFormat('twig/YamlDictionary', $countTranslations, $countTranslated); - } - public function testVueJs() { $translations = static::get('vuejs/input', 'VueJs'); diff --git a/tests/assets/twig/Csv.csv b/tests/assets/twig/Csv.csv deleted file mode 100644 index 2221284..0000000 --- a/tests/assets/twig/Csv.csv +++ /dev/null @@ -1,19 +0,0 @@ -,,"Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 -Language: -Language-Team: -Last-Translator: -MIME-Version: 1.0 -Project-Id-Version: -Report-Msgid-Bugs-To: -" -,"text 1", -,"text 2", -,"text 3 (with parenthesis)", -,"text 4 ""with double quotes""", -,"text 5 'with escaped single quotes'", -,"text 6", -,"text 7 (with parenthesis)", -,"text 8 ""with escaped double quotes""", -,"text 9 'with single quotes'", -,"text 10 with plural", diff --git a/tests/assets/twig/CsvDictionary.csv b/tests/assets/twig/CsvDictionary.csv deleted file mode 100644 index 38bfa1b..0000000 --- a/tests/assets/twig/CsvDictionary.csv +++ /dev/null @@ -1,10 +0,0 @@ -"text 1", -"text 2", -"text 3 (with parenthesis)", -"text 4 ""with double quotes""", -"text 5 'with escaped single quotes'", -"text 6", -"text 7 (with parenthesis)", -"text 8 ""with escaped double quotes""", -"text 9 'with single quotes'", -"text 10 with plural", diff --git a/tests/assets/twig/Jed.json b/tests/assets/twig/Jed.json deleted file mode 100644 index dd53bba..0000000 --- a/tests/assets/twig/Jed.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "messages": { - "": { - "domain": "messages", - "lang": "en", - "plural-forms": "nplurals=2; plural=(n != 1);" - }, - "text 1": [ - "" - ], - "text 2": [ - "" - ], - "text 3 (with parenthesis)": [ - "" - ], - "text 4 \"with double quotes\"": [ - "" - ], - "text 5 'with escaped single quotes'": [ - "" - ], - "text 6": [ - "" - ], - "text 7 (with parenthesis)": [ - "" - ], - "text 8 \"with escaped double quotes\"": [ - "" - ], - "text 9 'with single quotes'": [ - "" - ], - "text 10 with plural": [ - "" - ] - } -} \ No newline at end of file diff --git a/tests/assets/twig/Json.json b/tests/assets/twig/Json.json deleted file mode 100644 index e1d17a3..0000000 --- a/tests/assets/twig/Json.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "domain": null, - "plural-forms": null, - "messages": { - "": { - "": [ - "Content-Transfer-Encoding: 8bit\nContent-Type: text\/plain; charset=UTF-8\nLanguage: \nLanguage-Team: \nLast-Translator: \nMIME-Version: 1.0\nProject-Id-Version: \nReport-Msgid-Bugs-To: \n" - ], - "text 1": [ - "" - ], - "text 2": [ - "" - ], - "text 3 (with parenthesis)": [ - "" - ], - "text 4 \"with double quotes\"": [ - "" - ], - "text 5 'with escaped single quotes'": [ - "" - ], - "text 6": [ - "" - ], - "text 7 (with parenthesis)": [ - "" - ], - "text 8 \"with escaped double quotes\"": [ - "" - ], - "text 9 'with single quotes'": [ - "" - ], - "text 10 with plural": [ - "" - ] - } - } -} \ No newline at end of file diff --git a/tests/assets/twig/JsonDictionary.json b/tests/assets/twig/JsonDictionary.json deleted file mode 100644 index dcd808a..0000000 --- a/tests/assets/twig/JsonDictionary.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "text 1": "", - "text 2": "", - "text 3 (with parenthesis)": "", - "text 4 \"with double quotes\"": "", - "text 5 'with escaped single quotes'": "", - "text 6": "", - "text 7 (with parenthesis)": "", - "text 8 \"with escaped double quotes\"": "", - "text 9 'with single quotes'": "", - "text 10 with plural": "" -} \ No newline at end of file diff --git a/tests/assets/twig/Mo.mo b/tests/assets/twig/Mo.mo deleted file mode 100644 index 4451a98..0000000 --- a/tests/assets/twig/Mo.mo +++ /dev/null @@ -1,9 +0,0 @@ -Þ•$,,³-Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 -Language: -Language-Team: -Last-Translator: -MIME-Version: 1.0 -Project-Id-Version: -Report-Msgid-Bugs-To: - \ No newline at end of file diff --git a/tests/assets/twig/PhpArray.php b/tests/assets/twig/PhpArray.php deleted file mode 100644 index 3e6d2ba..0000000 --- a/tests/assets/twig/PhpArray.php +++ /dev/null @@ -1,62 +0,0 @@ - NULL, - 'plural-forms' => NULL, - 'messages' => - array ( - '' => - array ( - '' => - array ( - 0 => 'Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 -Language: -Language-Team: -Last-Translator: -MIME-Version: 1.0 -Project-Id-Version: -Report-Msgid-Bugs-To: -', - ), - 'text 1' => - array ( - 0 => '', - ), - 'text 2' => - array ( - 0 => '', - ), - 'text 3 (with parenthesis)' => - array ( - 0 => '', - ), - 'text 4 "with double quotes"' => - array ( - 0 => '', - ), - 'text 5 \'with escaped single quotes\'' => - array ( - 0 => '', - ), - 'text 6' => - array ( - 0 => '', - ), - 'text 7 (with parenthesis)' => - array ( - 0 => '', - ), - 'text 8 "with escaped double quotes"' => - array ( - 0 => '', - ), - 'text 9 \'with single quotes\'' => - array ( - 0 => '', - ), - 'text 10 with plural' => - array ( - 0 => '', - ), - ), - ), -); \ No newline at end of file diff --git a/tests/assets/twig/Po.po b/tests/assets/twig/Po.po deleted file mode 100644 index 2412307..0000000 --- a/tests/assets/twig/Po.po +++ /dev/null @@ -1,52 +0,0 @@ -msgid "" -msgstr "" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Language: \n" -"Language-Team: \n" -"Last-Translator: \n" -"MIME-Version: 1.0\n" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" - -#: ./tests/assets/twig/input.php:40 -msgid "text 1" -msgstr "" - -#: ./tests/assets/twig/input.php:47 -msgid "text 2" -msgstr "" - -#: ./tests/assets/twig/input.php:51 -msgid "text 3 (with parenthesis)" -msgstr "" - -#: ./tests/assets/twig/input.php:55 -msgid "text 4 \"with double quotes\"" -msgstr "" - -#: ./tests/assets/twig/input.php:59 -msgid "text 5 'with escaped single quotes'" -msgstr "" - -#: ./tests/assets/twig/input.php:66 -msgid "text 6" -msgstr "" - -#: ./tests/assets/twig/input.php:70 -msgid "text 7 (with parenthesis)" -msgstr "" - -#: ./tests/assets/twig/input.php:74 -msgid "text 8 \"with escaped double quotes\"" -msgstr "" - -#: ./tests/assets/twig/input.php:78 -msgid "text 9 'with single quotes'" -msgstr "" - -#. notes: This is an actual note for translators. -#: ./tests/assets/twig/input.php:84 -msgid "text 10 with plural" -msgid_plural "The plural form" -msgstr[0] "" diff --git a/tests/assets/twig/Xliff.xlf b/tests/assets/twig/Xliff.xlf deleted file mode 100644 index f6f03d2..0000000 --- a/tests/assets/twig/Xliff.xlf +++ /dev/null @@ -1,116 +0,0 @@ - - - - - 8bit - text/plain; charset=UTF-8 - - - - 1.0 - - - - - - - ./tests/assets/twig/input.php:40 - - - text 1 - - - - - - - ./tests/assets/twig/input.php:47 - - - text 2 - - - - - - - ./tests/assets/twig/input.php:51 - - - text 3 (with parenthesis) - - - - - - - ./tests/assets/twig/input.php:55 - - - text 4 "with double quotes" - - - - - - - ./tests/assets/twig/input.php:59 - - - text 5 'with escaped single quotes' - - - - - - - ./tests/assets/twig/input.php:66 - - - text 6 - - - - - - - ./tests/assets/twig/input.php:70 - - - text 7 (with parenthesis) - - - - - - - ./tests/assets/twig/input.php:74 - - - text 8 "with escaped double quotes" - - - - - - - ./tests/assets/twig/input.php:78 - - - text 9 'with single quotes' - - - - - - - notes: This is an actual note for translators. - ./tests/assets/twig/input.php:84 - - - text 10 with plural - - - - - diff --git a/tests/assets/twig/Yaml.yml b/tests/assets/twig/Yaml.yml deleted file mode 100644 index 2a6a9bc..0000000 --- a/tests/assets/twig/Yaml.yml +++ /dev/null @@ -1,16 +0,0 @@ -domain: null -plural-forms: null -messages: - '': - '': - - "Content-Transfer-Encoding: 8bit\nContent-Type: text/plain; charset=UTF-8\nLanguage: \nLanguage-Team: \nLast-Translator: \nMIME-Version: 1.0\nProject-Id-Version: \nReport-Msgid-Bugs-To: \n" - 'text 1': '' - 'text 2': '' - 'text 3 (with parenthesis)': '' - 'text 4 "with double quotes"': '' - 'text 5 ''with escaped single quotes''': '' - 'text 6': '' - 'text 7 (with parenthesis)': '' - 'text 8 "with escaped double quotes"': '' - 'text 9 ''with single quotes''': '' - 'text 10 with plural': '' diff --git a/tests/assets/twig/YamlDictionary.yml b/tests/assets/twig/YamlDictionary.yml deleted file mode 100644 index 09fbf2e..0000000 --- a/tests/assets/twig/YamlDictionary.yml +++ /dev/null @@ -1,10 +0,0 @@ -'text 1': '' -'text 2': '' -'text 3 (with parenthesis)': '' -'text 4 "with double quotes"': '' -'text 5 ''with escaped single quotes''': '' -'text 6': '' -'text 7 (with parenthesis)': '' -'text 8 "with escaped double quotes"': '' -'text 9 ''with single quotes''': '' -'text 10 with plural': '' diff --git a/tests/assets/twig/input.php b/tests/assets/twig/input.php deleted file mode 100644 index ac215b0..0000000 --- a/tests/assets/twig/input.php +++ /dev/null @@ -1,26 +0,0 @@ -
-

{% trans 'text 1' %}

-
- -
-

{% trans 'text 2' %}

-

{% trans 'text 3 (with parenthesis)' %}

-

{% trans 'text 4 "with double quotes"' %}

-

{% trans 'text 5 \'with escaped single quotes\'' %}

-
- -
-

{% trans "text 6" %}

-

{% trans "text 7 (with parenthesis)" %}

-

{% trans "text 8 \"with escaped double quotes\"" %}

-

{% trans "text 9 'with single quotes'" %}

-

- {% trans %} - text 10 with plural - {% plural 5 %} - The plural form - {% notes %} - This is an actual note for translators. - {% endtrans %} -

-