grommunio / grommunio-dav

lib/GrommunioDavBackend.php

Braces +21 added lines, -42 removed lines

@@ -21,8 +21,7 @@ 
 	/**
 	 * Constructor.
 	 */
-	public function __construct(GLogger $glogger)
-	{
+	public function __construct(GLogger $glogger) {
 		$this->logger = $glogger;
 		$this->syncstate = new GrommunioSyncState($glogger, SYNC_DB);
 	}
@@ -35,8 +34,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function Logon($user, $pass)
-	{
+	public function Logon($user, $pass) {
 		$this->logger->trace('%s / password', $user);
 
 		$gDavVersion = 'grommunio-dav' . @constant('GDAV_VERSION');
@@ -59,8 +57,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function GetUser()
-	{
+	public function GetUser() {
 		$this->logger->trace($this->user);
 
 		return $this->user;
@@ -76,8 +73,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function CreateFolder($principalUri, $url, $class, $displayname)
-	{
+	public function CreateFolder($principalUri, $url, $class, $displayname) {
 		$props = mapi_getprops($this->GetStore($principalUri), [PR_IPM_SUBTREE_ENTRYID]);
 		$folder = mapi_msgstore_openentry($this->GetStore($principalUri), $props[PR_IPM_SUBTREE_ENTRYID]);
 		$newfolder = mapi_folder_createfolder($folder, $url, $displayname);
@@ -93,8 +89,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function DeleteFolder($id)
-	{
+	public function DeleteFolder($id) {
 		$folder = $this->GetMapiFolder($id);
 		if (!$folder) {
 			return false;
@@ -116,8 +111,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetFolders($principalUri, $classes)
-	{
+	public function GetFolders($principalUri, $classes) {
 		$this->logger->trace("principal '%s', classes '%s'", $principalUri, $classes);
 		$folders = [];
 
@@ -179,8 +173,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetObjects($id, $fileExtension, $filters = [])
-	{
+	public function GetObjects($id, $fileExtension, $filters = []) {
 		$folder = $this->GetMapiFolder($id);
 		$properties = $this->GetCustomProperties($id);
 		$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS);
@@ -251,8 +244,7 @@ 
 	 *
 	 * @return mapiresource
 	 */
-	public function CreateObject($folderId, $folder, $objectId)
-	{
+	public function CreateObject($folderId, $folder, $objectId) {
 		$mapimessage = mapi_folder_createmessage($folder);
 		// we save the objectId in PROP_APPTTSREF so we find it by this id
 		$properties = $this->GetCustomProperties($folderId);
@@ -270,8 +262,7 @@ 
 	 *
 	 * @return mapiresource
 	 */
-	public function GetMapiFolder($folderid)
-	{
+	public function GetMapiFolder($folderid) {
 		$this->logger->trace('Id: %s', $folderid);
 		$arr = explode(':', $folderid);
 		$entryid = mapi_msgstore_entryidfromsourcekey($this->GetStore($arr[0]), hex2bin($arr[1]));
@@ -284,8 +275,7 @@ 
 	 *
 	 * @return MAPIAddressbook
 	 */
-	public function GetAddressBook()
-	{
+	public function GetAddressBook() {
 		// TODO should be a singleton
 		return mapi_openaddressbook($this->session);
 	}
@@ -297,8 +287,7 @@ 
 	 *
 	 * @return false|MAPIStore if store not available
 	 */
-	public function OpenMapiStore($username = null)
-	{
+	public function OpenMapiStore($username = null) {
 		$msgstorestable = mapi_getmsgstorestable($this->session);
 		$msgstores = mapi_table_queryallrows($msgstorestable, [PR_DEFAULT_STORE, PR_ENTRYID, PR_MDB_PROVIDER]);
 
@@ -338,8 +327,7 @@ 
 	 *
 	 * @return false|MAPIStore if the store is not available
 	 */
-	public function GetStore($storename)
-	{
+	public function GetStore($storename) {
 		if ($storename == null) {
 			$storename = $this->GetUser();
 		}
@@ -370,8 +358,7 @@ 
 	 *
 	 * @return false|\grommunio\DAV\MAPIStore on error
 	 */
-	public function GetStoreById($id)
-	{
+	public function GetStoreById($id) {
 		$arr = explode(':', $id);
 
 		return $this->GetStore($arr[0]);
@@ -382,8 +369,7 @@ 
 	 *
 	 * @return MAPISession
 	 */
-	public function GetSession()
-	{
+	public function GetSession() {
 		return $this->session;
 	}
 
@@ -398,8 +384,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function GetIdOfMapiMessage($folderId, $mapimessage)
-	{
+	public function GetIdOfMapiMessage($folderId, $mapimessage) {
 		$this->logger->trace("Finding ID of %s", $mapimessage);
 		$properties = $this->GetCustomProperties($folderId);
 
@@ -433,8 +418,7 @@ 
 	 *
 	 * @return null|mapiresource
 	 */
-	public function GetMapiMessageForId($folderId, $objectUri, $mapifolder = null, $extension = null)
-	{
+	public function GetMapiMessageForId($folderId, $objectUri, $mapifolder = null, $extension = null) {
 		$this->logger->trace("Searching for '%s' in '%s' (%s) (%s)", $objectUri, $folderId, $mapifolder, $extension);
 
 		if (!$mapifolder) {
@@ -530,8 +514,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function GetObjectIdFromObjectUri($objectUri, $extension)
-	{
+	public function GetObjectIdFromObjectUri($objectUri, $extension) {
 		if (!$extension) {
 			return $objectUri;
 		}
@@ -550,8 +533,7 @@ 
 	 *
 	 * @return bool installed version is superior to the checked string
 	 */
-	protected function checkMapiExtVersion($version = "")
-	{
+	protected function checkMapiExtVersion($version = "") {
 		if (!extension_loaded("mapi")) {
 			return false;
 		}
@@ -575,8 +557,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function GetCustomProperties($id)
-	{
+	protected function GetCustomProperties($id) {
 		if (!isset($this->customprops[$id])) {
 			$this->logger->trace("Fetching properties id:%s", $id);
 			$store = $this->GetStoreById($id);
@@ -599,8 +580,7 @@ 
 	 * @return array
 	 */
 	// TODO getting named properties
-	public function GetCalendarRestriction($store, $start, $end)
-	{
+	public function GetCalendarRestriction($store, $start, $end) {
 		$props = MapiProps::GetAppointmentProperties();
 		$props = getPropIdsFromStrings($store, $props);
 
@@ -692,8 +672,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function Sync($folderId, $syncToken, $fileExtension, $limit = null)
-	{
+	public function Sync($folderId, $syncToken, $fileExtension, $limit = null) {
 		$arr = explode(':', $folderId);
 		$phpwrapper = new PHPWrapper($this->GetStoreById($folderId), $this->logger, $this->GetCustomProperties($folderId), $fileExtension, $this->syncstate, $arr[1]);
 		$mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);

lib/GrommunioCardDavBackend.php

Braces +12 added lines, -24 removed lines

@@ -21,8 +21,7 @@ 
 	/**
 	 * Constructor.
 	 */
-	public function __construct(GrommunioDavBackend $gDavBackend, GLogger $glogger)
-	{
+	public function __construct(GrommunioDavBackend $gDavBackend, GLogger $glogger) {
 		$this->gDavBackend = $gDavBackend;
 		$this->logger = $glogger;
 	}
@@ -45,8 +44,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getAddressBooksForUser($principalUri)
-	{
+	public function getAddressBooksForUser($principalUri) {
 		$this->logger->trace("principalUri: %s", $principalUri);
 
 		return $this->gDavBackend->GetFolders($principalUri, static::CONTAINER_CLASSES);
@@ -66,8 +64,7 @@ 
 	 *
 	 * @param string $addressBookId
 	 */
-	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch)
-	{
+	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 		// TODO is our logger able to log this object? It probably needs to be adapted.
 		$this->logger->trace("addressBookId: %s - proppatch: %s", $addressBookId, $propPatch);
 	}
@@ -83,8 +80,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function createAddressBook($principalUri, $url, array $properties)
-	{
+	public function createAddressBook($principalUri, $url, array $properties) {
 		$this->logger->trace("principalUri: %s - url: %s - properties: %s", $principalUri, $url, $properties);
 		// TODO Add displayname
 		return $this->gDavBackend->CreateFolder($principalUri, $url, static::CONTAINER_CLASS, "");
@@ -95,8 +91,7 @@ 
 	 *
 	 * @param mixed $addressBookId
 	 */
-	public function deleteAddressBook($addressBookId)
-	{
+	public function deleteAddressBook($addressBookId) {
 		$this->logger->trace("addressBookId: %s", $addressBookId);
 		$success = $this->gDavBackend->DeleteFolder($addressBookId);
 		// TODO evaluate $success
@@ -122,8 +117,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getCards($addressbookId)
-	{
+	public function getCards($addressbookId) {
 		$result = $this->gDavBackend->GetObjects($addressbookId, static::FILE_EXTENSION);
 		$this->logger->trace("addressbookId: %s found %d objects", $addressbookId, count($result));
 
@@ -144,8 +138,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getCard($addressBookId, $cardUri, $mapifolder = null)
-	{
+	public function getCard($addressBookId, $cardUri, $mapifolder = null) {
 		$this->logger->trace("addressBookId: %s - cardUri: %s", $addressBookId, $cardUri);
 
 		if (!$mapifolder) {
@@ -208,8 +201,7 @@ 
 	 *
 	 * @return null|string
 	 */
-	public function createCard($addressBookId, $cardUri, $cardData)
-	{
+	public function createCard($addressBookId, $cardUri, $cardData) {
 		$this->logger->trace("addressBookId: %s - cardUri: %s - cardData: %s", $addressBookId, $cardUri, $cardData);
 		$objectId = $this->gDavBackend->GetObjectIdFromObjectUri($cardUri, static::FILE_EXTENSION);
 		$folder = $this->gDavBackend->GetMapiFolder($addressBookId);
@@ -248,8 +240,7 @@ 
 	 *
 	 * @return null|string
 	 */
-	public function updateCard($addressBookId, $cardUri, $cardData)
-	{
+	public function updateCard($addressBookId, $cardUri, $cardData) {
 		$this->logger->trace("addressBookId: %s - cardUri: %s - cardData: %s", $addressBookId, $cardUri, $cardData);
 
 		$mapimessage = $this->gDavBackend->GetMapiMessageForId($addressBookId, $cardUri, null, static::FILE_EXTENSION);
@@ -270,8 +261,7 @@ 
 	 *
 	 * @return null|string
 	 */
-	private function setData($addressBookId, $mapimessage, $vcf)
-	{
+	private function setData($addressBookId, $mapimessage, $vcf) {
 		$this->logger->trace("mapimessage: %s - vcf: %s", $mapimessage, $vcf);
 		$store = $this->gDavBackend->GetStoreById($addressBookId);
 		$session = $this->gDavBackend->GetSession();
@@ -296,8 +286,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function deleteCard($addressBookId, $cardUri)
-	{
+	public function deleteCard($addressBookId, $cardUri) {
 		$this->logger->trace("addressBookId: %s - cardUri: %s", $addressBookId, $cardUri);
 		$mapifolder = $this->gDavBackend->GetMapiFolder($addressBookId);
 		$objectId = $this->gDavBackend->GetObjectIdFromObjectUri($cardUri, static::FILE_EXTENSION);
@@ -366,8 +355,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null)
-	{
+	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
 		$this->logger->trace("addressBookId: %s - syncToken: %s - syncLevel: %d - limit: %d", $addressBookId, $syncToken, $syncLevel, $limit);
 
 		return $this->gDavBackend->Sync($addressBookId, $syncToken, static::FILE_EXTENSION, $limit);

tests/grommunio-dav/GrommunioCardDavBackendTest.php

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
 	 *
 	 * @see PHPUnit_Framework_TestCase::setUp()
 	 */
-	protected function setUp()
-	{
+	protected function setUp() {
 		$gloggerMock = $this->getMockBuilder(GLogger::class)->disableOriginalConstructor()->getMock();
 		$this->gDavBackendMock = $this->getMockBuilder(GrommunioDavBackend::class)->disableOriginalConstructor()->getMock();
 		$this->kCardDavBackend = new GrommunioCardDavBackend($this->gDavBackendMock, $gloggerMock);
@@ -37,8 +36,7 @@ 
 	 *
 	 * @see PHPUnit_Framework_TestCase::tearDown()
 	 */
-	protected function tearDown()
-	{
+	protected function tearDown() {
 		$this->kCardDavBackend = null;
 		$this->gDavBackendMock = null;
 	}
@@ -46,8 +44,7 @@ 
 	/**
 	 * Tests if the constructor is created without errors.
 	 */
-	public function testConstruct()
-	{
+	public function testConstruct() {
 		$this->assertTrue(is_object($this->kCardDavBackend));
 	}
 }

tests/grommunio-dav/GrommunioDavBackendTest.php

Spacing +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@
 	public function ObjectUriProvider()
 	{
 		return [
-			['1234.ics', '.ics', '1234'],               // ok, cut .ics
-			['5678AF.vcf', '.vcf', '5678AF'],           // ok, cut .vcf
-			['123400.vcf', '.ics', '123400.vcf'],       // different extension, return as is
-			['1234.ics', '.vcf', '1234.ics'],            // different extension, return as is
+			['1234.ics', '.ics', '1234'], // ok, cut .ics
+			['5678AF.vcf', '.vcf', '5678AF'], // ok, cut .vcf
+			['123400.vcf', '.ics', '123400.vcf'], // different extension, return as is
+			['1234.ics', '.vcf', '1234.ics'], // different extension, return as is
 		];
 	}
 }

Braces +5 added lines, -10 removed lines

@@ -23,8 +23,7 @@ 
 	 *
 	 * @see PHPUnit_Framework_TestCase::setUp()
 	 */
-	protected function setUp()
-	{
+	protected function setUp() {
 		$gloggerMock = $this->getMockBuilder(GLogger::class)->disableOriginalConstructor()->getMock();
 		$this->gDavBackend = new GrommunioDavBackend($gloggerMock);
 	}
@@ -34,16 +33,14 @@ 
 	 *
 	 * @see PHPUnit_Framework_TestCase::tearDown()
 	 */
-	protected function tearDown()
-	{
+	protected function tearDown() {
 		$this->gDavBackend = null;
 	}
 
 	/**
 	 * Tests if the constructor is created without errors.
 	 */
-	public function testConstruct()
-	{
+	public function testConstruct() {
 		$this->assertTrue(is_object($this->gDavBackend));
 	}
 
@@ -56,8 +53,7 @@ 
 	 *
 	 * @dataProvider ObjectUriProvider
 	 */
-	public function testGetObjectIdFromObjectUri($objectUri, $extension, $expected)
-	{
+	public function testGetObjectIdFromObjectUri($objectUri, $extension, $expected) {
 		$this->assertEquals($expected, $this->gDavBackend->GetObjectIdFromObjectUri($objectUri, $extension));
 	}
 
@@ -66,8 +62,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function ObjectUriProvider()
-	{
+	public function ObjectUriProvider() {
 		return [
 			['1234.ics', '.ics', '1234'],               // ok, cut .ics
 			['5678AF.vcf', '.vcf', '5678AF'],           // ok, cut .vcf