Remove Cdn_Asset_Url class
[MAILPOET-6243]
This commit is contained in:
committed by
Oluwaseun Olorunsola
parent
b8147ed810
commit
b52304179e
@@ -336,9 +336,6 @@ class ContainerConfigurator implements IContainerConfigurator {
|
|||||||
$container->autowire(\MailPoet\CustomFields\ApiDataSanitizer::class);
|
$container->autowire(\MailPoet\CustomFields\ApiDataSanitizer::class);
|
||||||
$container->autowire(\MailPoet\CustomFields\CustomFieldsRepository::class)->setPublic(true);
|
$container->autowire(\MailPoet\CustomFields\CustomFieldsRepository::class)->setPublic(true);
|
||||||
// Email Editor
|
// 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_Editor::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\EmailEditor\Engine\Email_Api_Controller::class)->setPublic(true);
|
$container->autowire(\MailPoet\EmailEditor\Engine\Email_Api_Controller::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\EmailEditor\Engine\Settings_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 {
|
public static function getCdnAssetsUrl(): \MailPoet\Util\CdnAssetUrl {
|
||||||
return new \MailPoet\Util\CdnAssetUrl((string)Env::$baseUrl);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -1,47 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* This file is part of the MailPoet plugin.
|
|
||||||
*
|
|
||||||
* @package MailPoet\EmailEditor
|
|
||||||
*/
|
|
||||||
|
|
||||||
declare(strict_types = 1);
|
|
||||||
namespace MailPoet\EmailEditor\Utils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class for CDN asset URL.
|
|
||||||
*/
|
|
||||||
class Cdn_Asset_Url {
|
|
||||||
/**
|
|
||||||
* URL for CDN assets.
|
|
||||||
*/
|
|
||||||
const CDN_URL = 'https://ps.w.org/mailpoet/';
|
|
||||||
/**
|
|
||||||
* Base URL for assets.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
private $base_url;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cdn_Asset_Url constructor.
|
|
||||||
*
|
|
||||||
* @param string $base_url - Base URL for assets.
|
|
||||||
*/
|
|
||||||
public function __construct(
|
|
||||||
string $base_url
|
|
||||||
) {
|
|
||||||
$this->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";
|
|
||||||
}
|
|
||||||
}
|
|
@@ -30,7 +30,6 @@ use MailPoet\EmailEditor\Engine\Theme_Controller;
|
|||||||
use MailPoet\EmailEditor\Integrations\Core\Initializer;
|
use MailPoet\EmailEditor\Integrations\Core\Initializer;
|
||||||
use MailPoet\EmailEditor\Integrations\MailPoet\Blocks\BlockTypesController;
|
use MailPoet\EmailEditor\Integrations\MailPoet\Blocks\BlockTypesController;
|
||||||
use MailPoet\EmailEditor\Engine\Send_Preview_Email;
|
use MailPoet\EmailEditor\Engine\Send_Preview_Email;
|
||||||
use MailPoet\EmailEditor\Utils\Cdn_Asset_Url;
|
|
||||||
|
|
||||||
if ( (bool) getenv( 'MULTISITE' ) === true ) {
|
if ( (bool) getenv( 'MULTISITE' ) === true ) {
|
||||||
// REQUEST_URI needs to be set for WP to load the proper subsite where MailPoet is activated.
|
// 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();
|
return new Initializer();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
$container->set(
|
|
||||||
Cdn_Asset_Url::class,
|
|
||||||
function () {
|
|
||||||
return new Cdn_Asset_Url( 'http://localhost' );
|
|
||||||
}
|
|
||||||
);
|
|
||||||
$container->set(
|
$container->set(
|
||||||
Email_Api_Controller::class,
|
Email_Api_Controller::class,
|
||||||
function () {
|
function () {
|
||||||
@@ -198,10 +191,8 @@ abstract class MailPoetTest extends \Codeception\TestCase\Test { // phpcs:ignore
|
|||||||
);
|
);
|
||||||
$container->set(
|
$container->set(
|
||||||
Patterns::class,
|
Patterns::class,
|
||||||
function ( $container ) {
|
function () {
|
||||||
return new Patterns(
|
return new Patterns();
|
||||||
$container->get( Cdn_Asset_Url::class ),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
$container->set(
|
$container->set(
|
||||||
|
Reference in New Issue
Block a user