@@ -16,10 +16,13 @@ |
||
16 | 16 | public function getDatabasePath() |
17 | 17 | { |
18 | 18 | try { |
19 | - if (!array_key_exists('database', $this->config)) throw new Exception('The config has no entry with key "database".'); |
|
20 | - if (!array_key_exists('path', $this->config['database'])) throw new Exception('The config has no entry with key "database/path".'); |
|
21 | - } |
|
22 | - catch (Exception $exception) { |
|
19 | + if (!array_key_exists('database', $this->config)) { |
|
20 | + throw new Exception('The config has no entry with key "database".'); |
|
21 | + } |
|
22 | + if (!array_key_exists('path', $this->config['database'])) { |
|
23 | + throw new Exception('The config has no entry with key "database/path".'); |
|
24 | + } |
|
25 | + } catch (Exception $exception) { |
|
23 | 26 | throw new Exception('Missing config: '.$exception->getMessage()); |
24 | 27 | } |
25 | 28 |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | use EmberDb\DocumentManager; |
4 | 4 | |
5 | -require_once __DIR__ . '/../vendor/autoload.php'; |
|
5 | +require_once __DIR__.'/../vendor/autoload.php'; |
|
6 | 6 | |
7 | 7 | $car = array( |
8 | 8 | 'license-number' => 'HH-DS 1243', |
@@ -73,7 +73,7 @@ |
||
73 | 73 | $quit = true; |
74 | 74 | $output = "Closing EmberDb command line client.\n\n"; |
75 | 75 | } else { |
76 | - Logger::log("Starting execution of '" . $inputLine . "'.\n"); |
|
76 | + Logger::log("Starting execution of '".$inputLine."'.\n"); |
|
77 | 77 | $output = $this->parser->execute($inputLine); |
78 | 78 | Logger::log("Execution finished.\n\n"); |
79 | 79 | } |
@@ -75,18 +75,18 @@ |
||
75 | 75 | |
76 | 76 | // If both are a scalar ... |
77 | 77 | if ($this->isScalar($filterValue) && $this->isScalar($entryValue)) { |
78 | - Logger::log("query:" . $filterValue . " and entry:" . $entryValue . " are both scalars.\n"); |
|
78 | + Logger::log("query:".$filterValue." and entry:".$entryValue." are both scalars.\n"); |
|
79 | 79 | $isMatch = $filterValue === $entryValue; |
80 | 80 | } |
81 | 81 | // If both are a list ... |
82 | 82 | if ($this->isList($filterValue) && $this->isList($entryValue)) { |
83 | - Logger::log("query:" . json_encode($filterValue) . " and entry:" . json_encode($entryValue) . " are both lists.\n"); |
|
83 | + Logger::log("query:".json_encode($filterValue)." and entry:".json_encode($entryValue)." are both lists.\n"); |
|
84 | 84 | $isMatch = $filterValue === $entryValue; |
85 | 85 | } |
86 | 86 | |
87 | 87 | // If both are a document ... |
88 | 88 | if ($this->isDocument($filterValue) && $this->isDocument($entryValue)) { |
89 | - Logger::log("query:" . json_encode($filterValue) . " and entry:" . json_encode($entryValue) . " are both documents.\n"); |
|
89 | + Logger::log("query:".json_encode($filterValue)." and entry:".json_encode($entryValue)." are both documents.\n"); |
|
90 | 90 | |
91 | 91 | // If filter is an operator ... |
92 | 92 | if ($this->isOperator($filterValue)) { |
@@ -70,8 +70,7 @@ |
||
70 | 70 | } |
71 | 71 | $this->documentManager->insert($collection, $document); |
72 | 72 | $output .= "Inserted document in the $collection collection.\n"; |
73 | - } |
|
74 | - catch (Exception $exception) { |
|
73 | + } catch (Exception $exception) { |
|
75 | 74 | $output .= "Error: ".$exception->getMessage()."\n"; |
76 | 75 | } |
77 | 76 | break; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | $this->name = $name; |
48 | 48 | $this->path = $path; |
49 | - $this->metaData = new MetaData($path . '/' . $name . 'meta.edb'); |
|
49 | + $this->metaData = new MetaData($path.'/'.$name.'meta.edb'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -139,6 +139,6 @@ discard block |
||
139 | 139 | |
140 | 140 | private function getCollectionFilePath() |
141 | 141 | { |
142 | - return $this->path . '/' . $this->name . '.edb'; |
|
142 | + return $this->path.'/'.$this->name.'.edb'; |
|
143 | 143 | } |
144 | 144 | } |