Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove useless twig class aliases

Browse Source 
[MAILPOET-2692]
This commit is contained in:
Rostislav Wolny
2020-05-27 14:17:36 +02:00
committed by Veljko V
parent bac418e2b5
commit 5ce08d045e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
prefixer/fix-twig.php
View File

@@ -243,7 +243,10 @@ foreach ($replacements as $singleFile) {
file_put_contents($singleFile['file'], $data); file_put_contents($singleFile['file'], $data);
} }
// Remove unwanted class aliases // Remove unwanted class aliases in lib/Twig subdirectories
// We need to keep first level files in lib/Twig since most of them are still needed
exec("find ../vendor-prefixed/twig/twig/lib/Twig -maxdepth 1 -mindepth 1 -type d -exec rm -rf '{}' \;");
// Fix rest of the files in lib
// Files in twig/lib directory contain class aliases which makes namespaced classes global // Files in twig/lib directory contain class aliases which makes namespaced classes global
// e.g. \class_alias('MailPoetVendor\\Twig_CompilerInterface', 'Twig_CompilerInterface', \false); // e.g. \class_alias('MailPoetVendor\\Twig_CompilerInterface', 'Twig_CompilerInterface', \false);
$iterator = new RecursiveDirectoryIterator("../vendor-prefixed/twig/twig/lib", RecursiveDirectoryIterator::SKIP_DOTS); $iterator = new RecursiveDirectoryIterator("../vendor-prefixed/twig/twig/lib", RecursiveDirectoryIterator::SKIP_DOTS);

2
tests/integration/Twig/FunctionsTest.php
View File

@@ -9,7 +9,7 @@ use MailPoet\WP\Functions as WPFunctions;
class FunctionsTest extends \MailPoetTest { class FunctionsTest extends \MailPoetTest {
public function testItExecutesIsRtlFunction() { public function testItExecutesIsRtlFunction() {
$template = ['template' => '{% if is_rtl() %}rtl{% endif %}']; $template = ['template' => '{% if is_rtl() %}rtl{% endif %}'];
$twig = new \MailPoetVendor\Twig_Environment(new \MailPoetVendor\Twig_Loader_Array($template)); $twig = new \MailPoetVendor\Twig_Environment(new \MailPoetVendor\Twig\Loader\ArrayLoader($template));
WPFunctions::set(Stub::make(new WPFunctions, [ WPFunctions::set(Stub::make(new WPFunctions, [
'isRtl' => Stub::consecutive(true, false), 'isRtl' => Stub::consecutive(true, false),
])); ]));