diff --git a/mailpoet/lib/DI/ContainerConfigurator.php b/mailpoet/lib/DI/ContainerConfigurator.php index bb656feb4b..1615bf0d06 100644 --- a/mailpoet/lib/DI/ContainerConfigurator.php +++ b/mailpoet/lib/DI/ContainerConfigurator.php @@ -336,9 +336,6 @@ class ContainerConfigurator implements IContainerConfigurator { $container->autowire(\MailPoet\CustomFields\ApiDataSanitizer::class); $container->autowire(\MailPoet\CustomFields\CustomFieldsRepository::class)->setPublic(true); // Email Editor - $container->autowire(\MailPoet\EmailEditor\Utils\Cdn_Asset_Url::class) - ->setPublic(true) - ->setFactory([__CLASS__, 'getEmailEditorCdnAssetsUrl']); $container->autowire(\MailPoet\EmailEditor\Engine\Email_Editor::class)->setPublic(true); $container->autowire(\MailPoet\EmailEditor\Engine\Email_Api_Controller::class)->setPublic(true); $container->autowire(\MailPoet\EmailEditor\Engine\Settings_Controller::class)->setPublic(true); @@ -695,8 +692,4 @@ class ContainerConfigurator implements IContainerConfigurator { public static function getCdnAssetsUrl(): \MailPoet\Util\CdnAssetUrl { return new \MailPoet\Util\CdnAssetUrl((string)Env::$baseUrl); } - - public static function getEmailEditorCdnAssetsUrl(): \MailPoet\EmailEditor\Utils\Cdn_Asset_Url { - return new \MailPoet\EmailEditor\Utils\Cdn_Asset_Url((string)Env::$baseUrl); - } } diff --git a/packages/php/email-editor/src/Utils/class-cdn-asset-url.php b/packages/php/email-editor/src/Utils/class-cdn-asset-url.php deleted file mode 100644 index e7c0aa9fee..0000000000 --- a/packages/php/email-editor/src/Utils/class-cdn-asset-url.php +++ /dev/null @@ -1,47 +0,0 @@ -base_url = $base_url; - } - - /** - * Generate CDN URL for assets. - * - * @param string $path - Path for assets. - * @return string - */ - public function generate_cdn_url( $path ) { - $use_cdn = defined( 'MAILPOET_USE_CDN' ) ? MAILPOET_USE_CDN : true; - return ( $use_cdn ? self::CDN_URL : $this->base_url . '/plugin_repository/' ) . "assets/$path"; - } -} diff --git a/packages/php/email-editor/tests/integration/_bootstrap.php b/packages/php/email-editor/tests/integration/_bootstrap.php index 29e115e05e..b2f745c2e5 100644 --- a/packages/php/email-editor/tests/integration/_bootstrap.php +++ b/packages/php/email-editor/tests/integration/_bootstrap.php @@ -30,7 +30,6 @@ use MailPoet\EmailEditor\Engine\Theme_Controller; use MailPoet\EmailEditor\Integrations\Core\Initializer; use MailPoet\EmailEditor\Integrations\MailPoet\Blocks\BlockTypesController; use MailPoet\EmailEditor\Engine\Send_Preview_Email; -use MailPoet\EmailEditor\Utils\Cdn_Asset_Url; if ( (bool) getenv( 'MULTISITE' ) === true ) { // REQUEST_URI needs to be set for WP to load the proper subsite where MailPoet is activated. @@ -137,12 +136,6 @@ abstract class MailPoetTest extends \Codeception\TestCase\Test { // phpcs:ignore return new Initializer(); } ); - $container->set( - Cdn_Asset_Url::class, - function () { - return new Cdn_Asset_Url( 'http://localhost' ); - } - ); $container->set( Email_Api_Controller::class, function () { @@ -198,10 +191,8 @@ abstract class MailPoetTest extends \Codeception\TestCase\Test { // phpcs:ignore ); $container->set( Patterns::class, - function ( $container ) { - return new Patterns( - $container->get( Cdn_Asset_Url::class ), - ); + function () { + return new Patterns(); } ); $container->set(