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

Check existence panels shen creating debugger

Browse Source 
[MAILPOET-3420]
This commit is contained in:
Pavel Dohnal
2021-03-25 14:33:08 +01:00
committed by Veljko V
parent 4bb44554c3
commit 2360fe0a5a
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/API/JSON/API.php
View File

@ -190,7 +190,11 @@ class API {
throw new \Exception(__('HTTP request method not allowed.', 'mailpoet')); throw new \Exception(__('HTTP request method not allowed.', 'mailpoet'));
} }
if (class_exists(Debugger::class)) { if (
class_exists(Debugger::class)
&& class_exists(DIPanel::class)
&& class_exists(ApiPanel::class)
) {
ApiPanel::init($endpoint, $this->requestMethod, $this->requestData); ApiPanel::init($endpoint, $this->requestMethod, $this->requestData);
DIPanel::init(); DIPanel::init();
} }

5
lib/AdminPages/PageRenderer.php
View File

@ -64,7 +64,10 @@ class PageRenderer {
'wp_segment_state' => $wpSegmentState, 'wp_segment_state' => $wpSegmentState,
]; ];
try { try {
if (class_exists(Debugger::class)) { if (
class_exists(Debugger::class)
&& class_exists(DIPanel::class)
) {
DIPanel::init(); DIPanel::init();
} }
echo $this->renderer->render($template, $data + $defaults); echo $this->renderer->render($template, $data + $defaults);

9
lib/Doctrine/EntityManagerFactory.php
View File

@ -6,6 +6,8 @@ use MailPoet\Doctrine\EventListeners\EmojiEncodingListener;
use MailPoet\Doctrine\EventListeners\LastSubscribedAtListener; use MailPoet\Doctrine\EventListeners\LastSubscribedAtListener;
use MailPoet\Doctrine\EventListeners\TimestampListener; use MailPoet\Doctrine\EventListeners\TimestampListener;
use MailPoet\Doctrine\EventListeners\ValidationListener; use MailPoet\Doctrine\EventListeners\ValidationListener;
use MailPoet\Tracy\ApiPanel\ApiPanel;
use MailPoet\Tracy\DIPanel\DIPanel;
use MailPoet\Tracy\DoctrinePanel\DoctrinePanel; use MailPoet\Tracy\DoctrinePanel\DoctrinePanel;
use MailPoetVendor\Doctrine\DBAL\Connection; use MailPoetVendor\Doctrine\DBAL\Connection;
use MailPoetVendor\Doctrine\ORM\Configuration; use MailPoetVendor\Doctrine\ORM\Configuration;
@ -49,10 +51,13 @@ class EntityManagerFactory {
$this->lastSubscribedAtListener = $lastSubscribedAtListener; $this->lastSubscribedAtListener = $lastSubscribedAtListener;
} }
public function createEntityManager() { public function createEntityManager(): EntityManager {
$entityManager = EntityManager::create($this->connection, $this->configuration); $entityManager = EntityManager::create($this->connection, $this->configuration);
$this->setupListeners($entityManager); $this->setupListeners($entityManager);
if (class_exists(Debugger::class)) { if (
class_exists(Debugger::class)
&& class_exists(DoctrinePanel::class)
) {
DoctrinePanel::init($entityManager); DoctrinePanel::init($entityManager);
} }
return $entityManager; return $entityManager;