diff --git a/.circleci/config.yml b/.circleci/config.yml index fad058ba99..26580ce49e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -143,9 +143,7 @@ jobs: ./do compile:all --env production ./do doctrine:generate-cache vendor/bin/codecept build - wp core download --skip-content --path=../wordpress ./do twig:generate-cache - rm ../wordpress -rf - run: name: 'Check Prettier formatting' command: ./do qa:prettier-check diff --git a/mailpoet/RoboFile.php b/mailpoet/RoboFile.php index 8ff34dd7c3..a4181ec915 100644 --- a/mailpoet/RoboFile.php +++ b/mailpoet/RoboFile.php @@ -1020,7 +1020,6 @@ class RoboFile extends \Robo\Tasks { public function twigGenerateCache() { $templatePath = __DIR__ . '/views/'; // \MailPoet\Config\Env::$viewsPath . '/' - define('ABSPATH', (dirname(__DIR__) . '/wordpress')); $renderer = new \MailPoet\Config\Renderer( false, __DIR__ . '/generated/twig', diff --git a/mailpoet/lib/Config/Renderer.php b/mailpoet/lib/Config/Renderer.php index b90dc1f27f..8e35ca86e9 100644 --- a/mailpoet/lib/Config/Renderer.php +++ b/mailpoet/lib/Config/Renderer.php @@ -2,9 +2,7 @@ namespace MailPoet\Config; -use MailPoet\DI\ContainerWrapper; use MailPoet\Twig; -use MailPoet\Util\CdnAssetUrl; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Twig\Extension\DebugExtension; use MailPoetVendor\Twig\Lexer as TwigLexer; @@ -80,7 +78,7 @@ class Renderer { 'assets_url' => Env::$assetsUrl, 'assets_manifest_js' => $this->assetsManifestJs, 'assets_manifest_css' => $this->assetsManifestCss, - ], ContainerWrapper::getInstance()->get(CdnAssetUrl::class))); + ])); } public function setupSyntax() {