diff --git a/upgrades/5.7/scripts/AfterUpgrade.php b/upgrades/5.7/scripts/AfterUpgrade.php index 23a673a05d..23d37df645 100644 --- a/upgrades/5.7/scripts/AfterUpgrade.php +++ b/upgrades/5.7/scripts/AfterUpgrade.php @@ -1,41 +1,41 @@ -get('entityManager'); - - $entityManager->createEntity('ScheduledJob', [ - 'job' => 'ProcessWebhookQueue', - 'name' => 'Process Webhook Queue', - 'scheduling' => '*/5 * * * *', - 'status' => 'Active', - ]); - - $config = $container->get('config'); - - $config->set('hashSecretKey', \Espo\Core\Utils\Util::generateApiKey()); - $config->save(); - } -} +get('entityManager'); + + $entityManager->createEntity('ScheduledJob', [ + 'job' => 'ProcessWebhookQueue', + 'name' => 'Process Webhook Queue', + 'scheduling' => '*/5 * * * *', + 'status' => 'Active', + ]); + + $config = $container->get('config'); + + $config->set('hashSecretKey', \Espo\Core\Utils\Util::generateApiKey()); + $config->save(); + } +} diff --git a/upgrades/5.7/scripts/BeforeUpgrade.php b/upgrades/5.7/scripts/BeforeUpgrade.php index e1d0d4d19f..3021723de9 100644 --- a/upgrades/5.7/scripts/BeforeUpgrade.php +++ b/upgrades/5.7/scripts/BeforeUpgrade.php @@ -1,61 +1,61 @@ -container = $container; - $this->checkDatabaseRequirements(); - - $pdo = $container->get('entityManager')->getPDO(); - - try { - $pdo->query("TRUNCATE TABLE `scheduled_job_log_record`"); - } catch (\Exception $e) {} - } - - protected function checkDatabaseRequirements() - { - $databaseRequirements = [ - 'mysql' => '5.6.0', - 'mariadb' => '10.0.0', - ]; - - $databaseHelper = new \Espo\Core\Utils\Database\Helper($this->container->get('config')); - - $databaseType = $databaseHelper->getDatabaseType(); - $fullVersion = $databaseHelper->getPdoDatabaseVersion($this->container->get('entityManager')->getPDO()); - - if (preg_match('/[0-9]+\.[0-9]+\.[0-9]+/', $fullVersion, $match)) { - $version = $match[0]; - $databaseTypeLc = strtolower($databaseType); - - if (isset($databaseRequirements[$databaseTypeLc])) { - if (version_compare($version, $databaseRequirements[$databaseTypeLc], '<')) { - $msg = "Your {$databaseType} version is not supported. Please upgrade {$databaseType} to a newer version (5.6 or later)."; - throw new \Espo\Core\Exceptions\Error($msg); - } - } - } - } -} +container = $container; + $this->checkDatabaseRequirements(); + + $pdo = $container->get('entityManager')->getPDO(); + + try { + $pdo->query("TRUNCATE TABLE `scheduled_job_log_record`"); + } catch (\Exception $e) {} + } + + protected function checkDatabaseRequirements() + { + $databaseRequirements = [ + 'mysql' => '5.6.0', + 'mariadb' => '10.0.0', + ]; + + $databaseHelper = new \Espo\Core\Utils\Database\Helper($this->container->get('config')); + + $databaseType = $databaseHelper->getDatabaseType(); + $fullVersion = $databaseHelper->getPdoDatabaseVersion($this->container->get('entityManager')->getPDO()); + + if (preg_match('/[0-9]+\.[0-9]+\.[0-9]+/', $fullVersion, $match)) { + $version = $match[0]; + $databaseTypeLc = strtolower($databaseType); + + if (isset($databaseRequirements[$databaseTypeLc])) { + if (version_compare($version, $databaseRequirements[$databaseTypeLc], '<')) { + $msg = "Your {$databaseType} version is not supported. Please upgrade {$databaseType} to a newer version (5.6 or later)."; + throw new \Espo\Core\Exceptions\Error($msg); + } + } + } + } +} diff --git a/upgrades/5.8/scripts/BeforeUpgrade.php b/upgrades/5.8/scripts/BeforeUpgrade.php index 91f8c474d5..620721a36c 100644 --- a/upgrades/5.8/scripts/BeforeUpgrade.php +++ b/upgrades/5.8/scripts/BeforeUpgrade.php @@ -1,56 +1,56 @@ -container = $container; - $this->checkDatabaseRequirements(); - } - - protected function checkDatabaseRequirements() - { - $databaseRequirements = [ - 'mysql' => '5.7.0', - 'mariadb' => '10.1.0', - ]; - - $databaseHelper = new \Espo\Core\Utils\Database\Helper($this->container->get('config')); - - $databaseType = $databaseHelper->getDatabaseType(); - $fullVersion = $databaseHelper->getPdoDatabaseVersion($this->container->get('entityManager')->getPDO()); - - if (preg_match('/[0-9]+\.[0-9]+\.[0-9]+/', $fullVersion, $match)) { - $version = $match[0]; - $databaseTypeLc = strtolower($databaseType); - - if (isset($databaseRequirements[$databaseTypeLc])) { - $requiredVersion = $databaseRequirements[$databaseTypeLc]; - if (version_compare($version, $requiredVersion, '<')) { - $msg = "Your {$databaseType} version is not supported. Please upgrade {$databaseType} to a newer version ({$requiredVersion} or later)."; - throw new \Espo\Core\Exceptions\Error($msg); - } - } - } - } -} +container = $container; + $this->checkDatabaseRequirements(); + } + + protected function checkDatabaseRequirements() + { + $databaseRequirements = [ + 'mysql' => '5.7.0', + 'mariadb' => '10.1.0', + ]; + + $databaseHelper = new \Espo\Core\Utils\Database\Helper($this->container->get('config')); + + $databaseType = $databaseHelper->getDatabaseType(); + $fullVersion = $databaseHelper->getPdoDatabaseVersion($this->container->get('entityManager')->getPDO()); + + if (preg_match('/[0-9]+\.[0-9]+\.[0-9]+/', $fullVersion, $match)) { + $version = $match[0]; + $databaseTypeLc = strtolower($databaseType); + + if (isset($databaseRequirements[$databaseTypeLc])) { + $requiredVersion = $databaseRequirements[$databaseTypeLc]; + if (version_compare($version, $requiredVersion, '<')) { + $msg = "Your {$databaseType} version is not supported. Please upgrade {$databaseType} to a newer version ({$requiredVersion} or later)."; + throw new \Espo\Core\Exceptions\Error($msg); + } + } + } + } +}