@@ -283,8 +283,7 @@ discard block |
||
| 283 | 283 | if (isset($options['ocraservice']) && $options['ocraservice']['type'] != 'tiqr') { |
| 284 | 284 | $options['ocraservice']['ocra.suite'] = $this->_ocraSuite; |
| 285 | 285 | $this->_ocraService = Tiqr_OcraService::getOcraService($options['ocraservice']['type'], $options['ocraservice'], $logger); |
| 286 | - } |
|
| 287 | - else { // Create default ocraservice |
|
| 286 | + } else { // Create default ocraservice |
|
| 288 | 287 | $this->_ocraService = Tiqr_OcraService::getOcraService('tiqr', array('ocra.suite' => $this->_ocraSuite), $logger); |
| 289 | 288 | } |
| 290 | 289 | } |
@@ -343,10 +342,11 @@ discard block |
||
| 343 | 342 | case 'APNS': |
| 344 | 343 | case 'APNS_DIRECT': |
| 345 | 344 | $apns_version = $this->_options['apns.version'] ?? 1; |
| 346 | - if ($apns_version ==2 ) |
|
| 347 | - $message = new Tiqr_Message_APNS2($this->_options, $this->logger); |
|
| 348 | - else |
|
| 349 | - $message = new Tiqr_Message_APNS($this->_options, $this->logger); |
|
| 345 | + if ($apns_version ==2 ) { |
|
| 346 | + $message = new Tiqr_Message_APNS2($this->_options, $this->logger); |
|
| 347 | + } else { |
|
| 348 | + $message = new Tiqr_Message_APNS($this->_options, $this->logger); |
|
| 349 | + } |
|
| 350 | 350 | break; |
| 351 | 351 | |
| 352 | 352 | case 'GCM': |
@@ -511,7 +511,9 @@ discard block |
||
| 511 | 511 | $sessionId = session_id(); |
| 512 | 512 | } |
| 513 | 513 | $status = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_STATUS.$sessionId); |
| 514 | - if (is_null($status)) return self::ENROLLMENT_STATUS_IDLE; |
|
| 514 | + if (is_null($status)) { |
|
| 515 | + return self::ENROLLMENT_STATUS_IDLE; |
|
| 516 | + } |
|
| 515 | 517 | return $status; |
| 516 | 518 | } |
| 517 | 519 | |
@@ -867,8 +869,7 @@ discard block |
||
| 867 | 869 | |
| 868 | 870 | try { |
| 869 | 871 | return $this->_stateStorage->getValue("authenticated_".$sessionId); |
| 870 | - } |
|
| 871 | - catch (Exception $e) { |
|
| 872 | + } catch (Exception $e) { |
|
| 872 | 873 | $this->logger->error('getAuthenticatedUser failed', array('exception'=>$e)); |
| 873 | 874 | return NULL; |
| 874 | 875 | } |