grommunio / grommunio-sync

lib/core/devicemanager.php

Braces +3 added lines, -6 removed lines

@@ -165,8 +165,7 @@ 
 					$this->setDeviceUserData($this->type, [self::$user => $this->device], self::$devid, -1, $doCas = "merge");
 					SLog::Write(LOGLEVEL_DEBUG, "DeviceManager->Save(): Device data saved");
 				}
-			}
-			catch (StateNotFoundException $snfex) {
+			} catch (StateNotFoundException $snfex) {
 				SLog::Write(LOGLEVEL_ERROR, "DeviceManager->Save(): Exception: " . $snfex->getMessage());
 			}
 		}
@@ -950,11 +949,9 @@ 
 				}
 				$this->stateManager->SetDevice($this->device);
 			}
-		}
-		catch (StateNotFoundException $snfex) {
+		} catch (StateNotFoundException $snfex) {
 			$this->hierarchySyncRequired = true;
-		}
-		catch (UnavailableException $uaex) {
+		} catch (UnavailableException $uaex) {
 			// This is temporary and can be ignored e.g. in PING - see https://jira.z-hub.io/browse/ZP-1054
 			// If the hash was not available before we treat it like a StateNotFoundException.
 			if ($this->deviceHash === false) {

lib/core/synccollections.php

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
 			}
 
 			return true;
-		}
-		catch (GSyncException $e) {
+		} catch (GSyncException $e) {
 		}
 
 		return false;
@@ -165,8 +164,7 @@ 
 
 				return true;
 			}
-		}
-		catch (StateInvalidException $sive) {
+		} catch (StateInvalidException $sive) {
 			// in case there is something wrong with the state, just stop here
 			// later when trying to retrieve the SyncParameters nothing will be found
 
@@ -193,8 +191,7 @@ 
 			try {
 				// make sure the hierarchy cache is loaded when we are loading hierarchy states
 				$this->addparms[$folderid]["state"] = $this->stateManager->GetSyncState($spa->GetLatestSyncKey($confirmedOnly), ($folderid === false));
-			}
-			catch (StateNotFoundException $snfe) {
+			} catch (StateNotFoundException $snfe) {
 				// if we can't find the state, first we should try a sync of that folder, so
 				// we generate a fake change, so a sync on this folder is triggered
 				$this->changes[$folderid] = 1;
@@ -698,8 +695,7 @@ 
 					$changecount = $exporter->GetChangeCount();
 				}
 			}
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			if ($ste->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
 				SLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): exporter can not be re-configured due to state error, emulating change in folder to force Sync.");
 				$this->changes[$folderid] = 1;
@@ -767,8 +763,7 @@ 
 
 					$this->hierarchyExporterChecked = true;
 				}
-			}
-			catch (StatusException $ste) {
+			} catch (StatusException $ste) {
 				throw new StatusException("SyncCollections->countHierarchyChange(): exporter can not be re-configured.", self::ERROR_WRONG_HIERARCHY, null, LOGLEVEL_WARN);
 			}
 

index.php

Braces +2 added lines, -4 removed lines

@@ -150,8 +150,7 @@ 
 
 		// destruct backend after all data is on the stream
 		$backend->Logoff();
-	}
-	catch (NoPostRequestException $nopostex) {
+	} catch (NoPostRequestException $nopostex) {
 		if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
 			header(GSync::GetServerHeader());
 			header(GSync::GetSupportedProtocolVersions());
@@ -166,8 +165,7 @@ 
 				GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
 			}
 		}
-	}
-	catch (Exception $ex) {
+	} catch (Exception $ex) {
 		// Extract any previous exception message for logging purpose.
 		$exclass = get_class($ex);
 		$exception_message = $ex->getMessage();