git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework setup check
[phorkie.git]
/
src
/
phorkie
/
SetupCheck.php
diff --git
a/src/phorkie/SetupCheck.php
b/src/phorkie/SetupCheck.php
index 177a0f75d8c98ffd32b9b328de0807671a3ca134..c459e2af546d251c981fc9f0888dc525e9f53072 100644
(file)
--- a/
src/phorkie/SetupCheck.php
+++ b/
src/phorkie/SetupCheck.php
@@
-18,6
+18,8
@@
class SetupCheck
protected $writableDirs;
protected $elasticsearch;
protected $writableDirs;
protected $elasticsearch;
+ public $messages = array();
+
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
@@
-31,11
+33,25
@@
class SetupCheck
public static function run()
{
$sc = new self();
public static function run()
{
$sc = new self();
+ $sc->checkConfigFiles();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
+
+ return $sc->messages;
+ }
+
+ public function checkConfigFiles()
+ {
+ foreach ($GLOBALS['phorkie']['cfgfiles'] as $file => $loaded) {
+ if ($loaded) {
+ $this->ok('Loaded config file: ' . $file);
+ } else {
+ $this->info('Possible config file: ' . $file . ' (not loaded)');
+ }
+ }
}
public function checkDeps()
}
public function checkDeps()
@@
-69,8
+85,7
@@
class SetupCheck
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
- }
- if (!is_writable($dir)) {
+ } else if (!is_writable($dir)) {
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
@@
-120,7
+135,17
@@
class SetupCheck
public function fail($msg)
{
public function fail($msg)
{
- throw new Exception($msg);
+ $this->messages[] = array('error', $msg);
+ }
+
+ public function info($msg)
+ {
+ $this->messages[] = array('info', $msg);
+ }
+
+ public function ok($msg)
+ {
+ $this->messages[] = array('ok', $msg);
}
}
}
}