diff --git a/core/lib/Drupal/Core/Template/TwigNodeVisitor.php b/core/lib/Drupal/Core/Template/TwigNodeVisitor.php index 585013f..deef952 100644 --- a/core/lib/Drupal/Core/Template/TwigNodeVisitor.php +++ b/core/lib/Drupal/Core/Template/TwigNodeVisitor.php @@ -65,14 +65,16 @@ function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env) { // Use our own escape filter that is SafeMarkup aware. $node->getNode('filter')->setAttribute('value', 'drupal_escape_placeholder'); - // Store that we have a filter active already that knows how to deal with render arrays. + // Store that we have a filter active already that knows how to deal + // with render arrays. $this->skipRenderVarFunction = TRUE; } if ('escape' == $name || 'e' == $name) { // Use our own escape filter that is SafeMarkup aware. $node->getNode('filter')->setAttribute('value', 'drupal_escape'); - // Store that we have a filter active already that knows how to deal with render arrays. + // Store that we have a filter active already that knows how to deal + // with render arrays. $this->skipRenderVarFunction = TRUE; } } diff --git a/core/modules/system/src/Tests/Theme/TwigTransTest.php b/core/modules/system/src/Tests/Theme/TwigTransTest.php index b70d887..7b4adb2 100644 --- a/core/modules/system/src/Tests/Theme/TwigTransTest.php +++ b/core/modules/system/src/Tests/Theme/TwigTransTest.php @@ -10,7 +10,6 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Url; -use Drupal\language\Entity\ConfigurableLanguage; use Drupal\simpletest\WebTestBase; /** @@ -82,7 +81,7 @@ protected function setUp() { /** * Test Twig "trans" tags. */ - public function ptestTwigTransTags() { + public function testTwigTransTags() { $this->drupalGet('twig-theme-test/trans', array('language' => \Drupal::languageManager()->getLanguage('xx'))); $this->assertText( @@ -162,7 +161,7 @@ public function ptestTwigTransTags() { /** * Test Twig "trans" debug markup. */ - public function ptestTwigTransDebug() { + public function testTwigTransDebug() { // Enable debug, rebuild the service container, and clear all caches. $parameters = $this->container->getParameter('twig.config'); $parameters['debug'] = TRUE;