Changelog and some small changes for #639

This commit is contained in:
Bernd Bestel
2020-03-22 18:02:19 +01:00
parent 3fc14db5d5
commit 375865d80e
3 changed files with 43 additions and 29 deletions

View File

@@ -1,14 +1,13 @@
<?php
class ERequirementNotMet extends Exception {
}
class ERequirementNotMet extends Exception { }
const REQUIRED_PHP_EXTENSIONS = array('fileinfo', 'pdo_sqlite', 'gd');
const REQUIRED_PHP_EXTENSIONS = array("fileinfo", "pdo_sqlite", "gd");
class PrerequisiteChecker {
public function checkRequirements() {
class PrerequisiteChecker
{
public function checkRequirements()
{
self::checkForConfigFile();
self::checkForConfigDistFile();
self::checkForComposer();
@@ -17,34 +16,47 @@ class PrerequisiteChecker {
}
private function checkForConfigFile() {
if (!file_exists(__DIR__ . "/../data/config.php"))
throw new ERequirementNotMet("/data/config.php not found. Have you copied config-dist.php to the data directory and renamed it to config.php?");
private function checkForConfigFile()
{
if (!file_exists(__DIR__ . '/../data/config.php'))
{
throw new ERequirementNotMet('/data/config.php not found. Have you copied config-dist.php to the data directory and renamed it to config.php?');
}
}
private function checkForConfigDistFile() {
if (!file_exists(__DIR__ . "/../config-dist.php"))
throw new ERequirementNotMet("config-dist.php not found. Please do not remove this file.");
private function checkForConfigDistFile()
{
if (!file_exists(__DIR__ . '/../config-dist.php'))
{
throw new ERequirementNotMet('config-dist.php not found. Please do not remove this file.');
}
}
private function checkForComposer() {
if (!file_exists(__DIR__ . "/../vendor/autoload.php"))
throw new ERequirementNotMet("/vendor/autoload.php not found. Have you run Composer?");
private function checkForComposer()
{
if (!file_exists(__DIR__ . '/../vendor/autoload.php'))
{
throw new ERequirementNotMet('/vendor/autoload.php not found. Have you run Composer?');
}
}
private function checkForYarn() {
if (!file_exists(__DIR__ . "/../public/node_modules"))
throw new ERequirementNotMet("/public/node_modules not found. Have you run Yarn?");
private function checkForYarn()
{
if (!file_exists(__DIR__ . '/../public/node_modules'))
{
throw new ERequirementNotMet('/public/node_modules not found. Have you run Yarn?');
}
}
private function checkForPhpExtensions() {
private function checkForPhpExtensions()
{
$loadedExtensions = get_loaded_extensions();
foreach (REQUIRED_PHP_EXTENSIONS as $extension) {
foreach (REQUIRED_PHP_EXTENSIONS as $extension)
{
if (!in_array($extension, $loadedExtensions))
{
throw new ERequirementNotMet("PHP module '{$extension}' not installed, but required.");
}
}
}
}
?>