Merge branch 'phpstan' into 'master'

Fixed phpstan issues See merge request grommunio/grommunio-sync!51
grommunio · Nov 6, 2023 · 2a5f779 · 2a5f779
2 parents 11d8060 + d2dcb16
commit 2a5f779
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ settings.json
 vendor/phpstan*
 vendor/bin/phpstan*
 mapi
+phpstan.neon.dist
diff --git a/lib/core/changesmemorywrapper.php b/lib/core/changesmemorywrapper.php
@@ -334,6 +334,8 @@ public function ImportFolderDeletion($folder) {
 
 			return true;
 		}
+
+		return false;
 	}
 
 	/*----------------------------------------------------------------------------------------------------------

diff --git a/lib/core/interprocessdata.php b/lib/core/interprocessdata.php
@@ -163,14 +163,14 @@ protected function setData($data, $id = 2, $ttl = -1) {
 
 	protected function setDeviceUserData($key, $data, $devid, $user, $subkey = -1, $doCas = false, $rawdata = false) {
 		$compKey = $this->getComposedKey($devid, $user, $subkey);
+		$ok = false;
 
 		// overwrite
 		if (!$doCas) {
 			$ok = ($this->ipcProvider->get()->hset($key, $compKey, json_encode($data)) !== false);
 		}
 		// merge data and do CAS on the $compKey
 		elseif ($doCas == "merge") {
-			$ok = false;
 			$okCount = 0;
 			// TODO: make this configurable (retrycount)?
 			while (!$ok && $okCount < 5) {
@@ -204,7 +204,6 @@ protected function setDeviceUserData($key, $data, $devid, $user, $subkey = -1, $
 		}
 		// delete keys of data and do CAS on the $compKey
 		elseif ($doCas == "deletekeys") {
-			$ok = false;
 			$okCount = 0;
 			// TODO: make this configurable (retrycount)?
 			while (!$ok && $okCount < 5) {

diff --git a/lib/core/sharedfolders.php b/lib/core/sharedfolders.php
@@ -10,6 +10,8 @@ class SharedFolders extends InterProcessData {
 	private static $instance = false;
 	private $shared;
 	private $updateTime;
+	private $localpart;
+	private $mainDomain;
 
 	public static function GetSharedFolders() {
 		if (!self::$instance) {

diff --git a/lib/core/stateobject.php b/lib/core/stateobject.php
@@ -180,7 +180,7 @@ public static function ThrowStateInvalidException() {
 	 *
 	 * Serializes the object to a value that can be serialized natively by json_encode()
 	 *
-	 * @return array
+	 * @return mixed
 	 */
 	public function jsonSerialize() {
 		return [

diff --git a/lib/core/streamer.php b/lib/core/streamer.php
@@ -431,7 +431,7 @@ public function GetStreamerVars() {
 	 *
 	 * Serializes the object to a value that can be serialized natively by json_encode()
 	 *
-	 * @return array
+	 * @return mixed
 	 */
 	public function jsonSerialize() {
 		$data = [];

diff --git a/lib/grommunio/exporter.php b/lib/grommunio/exporter.php
@@ -19,12 +19,11 @@ class ExportChangesICS implements IExportChanges {
 	private $store;
 	private $session;
 	private $restriction;
-	private $contentparameters;
+	private $contentParameters;
 	private $flags;
 	private $exporterflags;
 	private $exporter;
-	private $moveSrcState;
-	private $moveDstState;
+	private $statestream;
 
 	/**
 	 * Constructor.
@@ -79,6 +78,7 @@ public function __construct($session, $store, $folderid = false) {
 		}
 		catch (MAPIException $me) {
 			$this->exporter = false;
+
 			// We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
 			// if this happened while doing content sync, the mobile will try to resync the folderhierarchy
 			throw new StatusException(sprintf("ExportChangesICS('%s','%s','%s'): Error, unable to open folder: 0x%X", $session, $store, Utils::PrintAsString($folderid), mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN);
@@ -136,6 +136,8 @@ public function Config($state, $flags = 0) {
 
 		mapi_stream_write($stream, $state);
 		$this->statestream = $stream;
+
+		return true;
 	}
 
 	/**
@@ -171,6 +173,8 @@ public function ConfigContentParameters($contentparameters) {
 		}
 
 		$this->contentParameters = $contentparameters;
+
+		return true;
 	}
 
 	/**

diff --git a/lib/request/find.php b/lib/request/find.php
@@ -140,17 +140,18 @@ public function Handle($commandCode) {
 
 			try {
 				if ($searchname == ISearchProvider::SEARCH_GAL) {
-					// get search results from the searchprovider
-					$rows = $searchprovider->GetGALSearchResults($searchquery, $searchrange, $searchpicture);
+					// TODO: Fix GAL search in Find command
+					// $rows = $searchprovider->GetGALSearchResults($cpo->GetFindFreeText(), "0-100", null);
+					throw new StatusException("GAL search in FIND command is not implemented. Please report this including the 'WBXML debug data' logged. Be aware that the debug data could contain confidential information.", SYNC_FINDSTATUS_INVALIDREQUEST, null, LOGLEVEL_FATAL);
 				}
-				elseif ($searchname == ISearchProvider::SEARCH_MAILBOX) {
+				if ($searchname == ISearchProvider::SEARCH_MAILBOX) {
 					$backendFolderId = self::$deviceManager->GetBackendIdForFolderId($cpo->GetFindFolderid());
 					$cpo->SetFindFolderid($backendFolderId);
 					$rows = $searchprovider->GetMailboxSearchResults($cpo);
 				}
 			}
 			catch (StatusException $stex) {
-				$storestatus = $stex->getCode();
+				$status = $stex->getCode();
 			}
 
 			self::$encoder->startTag(SYNC_FIND_RESPONSE);
@@ -160,7 +161,7 @@ public function Handle($commandCode) {
 			self::$encoder->endTag();
 
 			self::$encoder->startTag(SYNC_FIND_STATUS);
-			self::$encoder->content(SYNC_FINDSTATUS_SUCCESS);
+			self::$encoder->content($status);
 			self::$encoder->endTag();
 
 			if (isset($rows['range'])) {

diff --git a/lib/wbxml/wbxmldecoder.php b/lib/wbxml/wbxmldecoder.php
@@ -442,7 +442,7 @@ private function getOpaque($len) {
 	/**
 	 * Reads one byte from the input stream.
 	 *
-	 * @return int
+	 * @return int|void
 	 */
 	private function getByte() {
 		$ch = fread($this->in, 1);