Show help even when config file does not exist

diff --git a/src/bdrem/Config.php b/src/bdrem/Config.php
index 37c4c641a3d512aea937dba10e8ecd44ae62fc8f..65e353d3518dd7f9f5a1eab44983117f457aee4c 100644 (file)
--- a/src/bdrem/Config.php
+++ b/src/bdrem/Config.php
@@ -5,19 +5,21 @@ class Config
 {
     public $source;
     public $date;
-    public $daysPrev;
-    public $daysNext;
+    public $daysPrev = 3;
+    public $daysNext = 7;
     public $locale;
-    public $stopOnEmpty;
+    public $stopOnEmpty = false;
+    public $cfgFileExists;
 
     public function load()
     {
         $f = __DIR__ . '/../../data/bdrem.config.php';
         if (file_exists($f)) {
+            $this->cfgFileExists = true;
             return $this->loadFile($f);
         }
 
-        throw new \Exception('No config file found');
+        $this->cfgFileExists = false;
     }
 
     protected function loadFile($filename)

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index 7e6bf9a141f6a9fd436dc382df31c9b6580234f8..8fa001ffcb81b5093b50082ea43b28ac20e13ca4 100644 (file)
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -11,11 +11,15 @@ abstract class UserInterface
             $this->config = new Config();
             $this->config->load();
             setlocale(LC_TIME, $this->config->locale);
-            $source = $this->config->loadSource();
 
             $parser = $this->loadParameters();
             $this->parseParameters($parser);
 
+            if (!$this->config->cfgFileExists) {
+                throw new \Exception('No config file found');
+            }
+
+            $source = $this->config->loadSource();
             $arEvents = $source->getEvents(
                 $this->config->date,
                 $this->config->daysPrev, $this->config->daysNext
@@ -24,7 +28,7 @@ abstract class UserInterface
             $this->render($arEvents);
         } catch (\Exception $e) {
             $this->preRenderParameterError();
-            echo 'Exception: ' . $e->getCode() . ' ' . $e->getMessage() . "\n";
+            echo 'Exception: ' . $e->getCode() . ' - ' . $e->getMessage() . "\n";
             exit(1);
         }
     }