From a5b964c785e90f8b0552f0dc4a38b149cb16e326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lys=C3=BD?= <jan.lysy@automattic.com>
Date: Fri, 11 Jun 2021 12:45:30 +0200
Subject: [PATCH] Add try-catch for activation hook

[MAILPOET-3656]
---
 lib/Config/Initializer.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php
index d7b8abb442..55a85cbbe8 100644
--- a/lib/Config/Initializer.php
+++ b/lib/Config/Initializer.php
@@ -184,7 +184,13 @@ class Initializer {
   }
 
   public function runActivator() {
-    return $this->activator->activate();
+    try {
+      $this->activator->activate();
+    } catch (InvalidStateException $e) {
+      return $this->handleRunningMigration($e);
+    } catch (\Exception $e) {
+      return $this->handleFailedInitialization($e);
+    }
   }
 
   public function preInitialize() {
@@ -246,7 +252,7 @@ class Initializer {
 
     // if current db version and plugin version differ
     if (version_compare($currentDbVersion, Env::$version) !== 0) {
-      $this->runActivator();
+      $this->activator->activate();
     }
   }