@@ -77,8 +77,9 @@ |
||
| 77 | 77 | } elseif ($this->resource->$relation instanceof Collection) { |
| 78 | 78 | $relations[$relation] = $transformer::collection($this->whenLoaded($relation)); |
| 79 | 79 | } |
| 80 | - if($this->resource->$relation == null) |
|
| 81 | - $relations[$relation] = null; |
|
| 80 | + if($this->resource->$relation == null) { |
|
| 81 | + $relations[$relation] = null; |
|
| 82 | + } |
|
| 82 | 83 | } |
| 83 | 84 | } |
| 84 | 85 | } |
@@ -28,8 +28,9 @@ |
||
| 28 | 28 | public function generate() |
| 29 | 29 | { |
| 30 | 30 | if (!$this->machineIsAvailable() && $this->appShouldRun()) { |
| 31 | - if ($this->applicationState->paused) |
|
| 32 | - return SynchronisationState::SCRIPT_PAUSED; |
|
| 31 | + if ($this->applicationState->paused) { |
|
| 32 | + return SynchronisationState::SCRIPT_PAUSED; |
|
| 33 | + } |
|
| 33 | 34 | return SynchronisationState::SCRIPT_RUNNING; |
| 34 | 35 | } |
| 35 | 36 | return SynchronisationState::CLIENT_STOPPED; |