|
@@ -11,14 +11,14 @@ |
|
|
block discarded – undo |
|
11
|
11
|
$json = $args[0]; |
|
12
|
12
|
|
|
13
|
13
|
if (trim($json)[0] != '{') { |
|
14
|
|
- $path = $this->baseDir . $json; |
|
15
|
|
- if (!file_exists($path)) throw new \Exception('File does not exist at: ' . $path); |
|
|
14
|
+ $path = $this->baseDir.$json; |
|
|
15
|
+ if (!file_exists($path)) throw new \Exception('File does not exist at: '.$path); |
|
16
|
16
|
$json = file_get_contents($json); |
|
17
|
17
|
} |
|
18
|
18
|
|
|
19
|
19
|
$map = json_decode($json, true); |
|
20
|
20
|
|
|
21
|
|
- if (!is_array($map)) throw new \Exception('Could not decode json: ' . json_last_error_msg()); |
|
|
21
|
+ if (!is_array($map)) throw new \Exception('Could not decode json: '.json_last_error_msg()); |
|
22
|
22
|
|
|
23
|
23
|
return $map; |
|
24
|
24
|
} |
Please login to merge, or discard this patch.