|
@@ -126,10 +126,10 @@ discard block |
|
|
block discarded – undo |
|
126
|
126
|
public function __construct(array $options = array()) |
|
127
|
127
|
{ |
|
128
|
128
|
// Default options |
|
129
|
|
- $this->environment = isset($options['environment']) && $options['environment'] ? (string)$options['environment'] : 'prod'; |
|
130
|
|
- $this->debug = isset($options['debug']) && null !== $options['debug'] ? (boolean)$options['debug'] : false; |
|
131
|
|
- $this->rootDir = isset($options['rootDir']) && $options['rootDir'] ? (string)$options['rootDir'] : $this->getRootDir(); |
|
132
|
|
- $this->name = isset($options['name']) && $options['name'] ? (string)$options['name'] : $this->getName(); |
|
|
129
|
+ $this->environment = isset($options['environment']) && $options['environment'] ? (string) $options['environment'] : 'prod'; |
|
|
130
|
+ $this->debug = isset($options['debug']) && null !== $options['debug'] ? (boolean) $options['debug'] : false; |
|
|
131
|
+ $this->rootDir = isset($options['rootDir']) && $options['rootDir'] ? (string) $options['rootDir'] : $this->getRootDir(); |
|
|
132
|
+ $this->name = isset($options['name']) && $options['name'] ? (string) $options['name'] : $this->getName(); |
|
133
|
133
|
|
|
134
|
134
|
if ($this->debug) { |
|
135
|
135
|
$this->startTime = microtime(true); |
|
@@ -289,9 +289,9 @@ discard block |
|
|
block discarded – undo |
|
289
|
289
|
$controllerArguments |
|
290
|
290
|
); |
|
291
|
291
|
|
|
292
|
|
- if($result === null) { |
|
|
292
|
+ if ($result === null) { |
|
293
|
293
|
throw new \Exception('Your action returned null. It must always return something'); |
|
294
|
|
- } else if(is_string($result)) { |
|
|
294
|
+ } else if (is_string($result)) { |
|
295
|
295
|
$response->setContent($result); |
|
296
|
296
|
} else if ($result instanceof ResponseInterface || $result instanceof SymfonyResponse) { |
|
297
|
297
|
$response = $result; |
Please login to merge, or discard this patch.