Tests updated for {% embed %} tag processing.

an `{% embed %}` block has been added to the input.html.twig with an additional gettext call, this is now picked up when the file is scanned, and tests have been updated accordingly.

The embed.html.twig file represents the embed template, it contains a gettext call, but it is not scanned automatically, instead it should be fed into gettext with all the other template files.

This design choice was made in order to keep the scanner simple as it only operates on the tokens rather than a full graph of dependencies. In fact I think the parse function doesn't even check for it's existence when parsing the tokens.

Author: tehbeard

tests/TimberFunctionsScannerTest.php

@@ -62,7 +62,7 @@ public function testTwigFunctionsExtractor()
         $file = __DIR__ . '/assets/input.html.twig';
         $code = file_get_contents($file);
         $functions = $scanner->scan($code, $file);
-        $this->assertCount(11, $functions);
+        $this->assertCount(12, $functions);
 
         // text 1
         $function = array_shift($functions);

tests/TimberScannerTest.php

@@ -36,10 +36,12 @@ public function testTwigCodeScanner()
         $scanner = new TimberScanner(Translations::create());
         list('' => $translations) = $this->initAndGetTranslations($scanner);
 
-        $this->assertCount(8, $translations);
+        $this->assertCount(9, $translations);
         $this->assertCount(0, $translations->getHeaders());
 
         $file = __DIR__ . '/assets/default-domain.po';
+        // Note: This test can fail due to `git config core.autocrlf` converting line endings to CRLF
+        // Double check any test error output for `#Warning: Strings contain different line endings!`
         $this->assertSame(
             file_get_contents($file),
             (new PoGenerator())->generateString($translations),
@@ -59,6 +61,8 @@ public function testTwigCodeScannerOtherDomains()
         $this->assertCount(1, $tr1);
         $this->assertCount(1, $tr1->getHeaders());
         $file1 = __DIR__ . '/assets/text-domain1.po';
+        // Note: This test can fail due to `git config core.autocrlf` converting line endings to CRLF
+        // Double check any test error output for `#Warning: Strings contain different line endings!`
         $this->assertSame(
             file_get_contents($file1),
             (new PoGenerator())->generateString($tr1),
@@ -68,6 +72,8 @@ public function testTwigCodeScannerOtherDomains()
         $this->assertCount(2, $tr2);
         $this->assertCount(1, $tr2->getHeaders());
         $file2 = __DIR__ . '/assets/text-domain2.po';
+        // Note: This test can fail due to `git config core.autocrlf` converting line endings to CRLF
+        // Double check any test error output for `#Warning: Strings contain different line endings!`
         $this->assertSame(
             file_get_contents($file2),
             (new PoGenerator())->generateString($tr2),

tests/assets/default-domain.po

@@ -36,3 +36,7 @@ msgstr ""
 msgid "text 11 with plural"
 msgid_plural "The plural form"
 msgstr[0] ""
+
+#: ./tests/assets/input.html.twig:26
+msgid "text 12 content inside a block in a embed template"
+msgstr ""

tests/assets/embed.html.twig

@@ -0,0 +1,5 @@
+<div class="embedded-content">
+        <h2>{{ __("text 13 header in the embed template, this should be scanned only if the file containing it is.") }}</h2>
+        {% block main %}
+        {% endblock %}
+</div>

tests/assets/input.html.twig

@@ -21,3 +21,8 @@
     </p>
     <p>
 </div>
+{% embed 'embed.html.twig' %}
+    {% block main %}
+        <p>{{ __("text 12 content inside a block in a embed template") }}</p>
+    {% endblock %}
+{% endembed %}