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

Ensure container for third party plugins using MP api

Browse Source 
[MAILPOET-1637]
This commit is contained in:
Rostislav Wolny
2018-11-15 09:03:08 +01:00
parent 38e9d806b8
commit c36aad1345
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/API/API.php
View File

@ -4,6 +4,7 @@ namespace MailPoet\API;
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container; use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
use MailPoet\DI\ContainerFactory;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
@ -17,12 +18,11 @@ class API {
} }
static function JSON() { static function JSON() {
self::checkContainer();
return self::$container->get(JSON\API::class); return self::$container->get(JSON\API::class);
} }
static function MP($version) { static function MP($version) {
self::checkContainer(); self::ensureContainerIsLoaded();
$api_class = sprintf('%s\MP\%s\API', __NAMESPACE__, $version); $api_class = sprintf('%s\MP\%s\API', __NAMESPACE__, $version);
try { try {
return self::$container->get($api_class); return self::$container->get($api_class);
@ -31,9 +31,14 @@ class API {
} }
} }
private static function checkContainer() { /**
* MP API is used by third party plugins so we have to ensure that container is loaded
* @see https://kb.mailpoet.com/article/195-add-subscribers-through-your-own-form-or-plugin
*/
private static function ensureContainerIsLoaded() {
if(!self::$container) { if(!self::$container) {
throw new \Exception(__('Api was not initialized properly. Is MailPoet plugin active?.', 'mailpoet')); $factory = new ContainerFactory();
self::$container = $factory->getContainer();
} }
} }
} }