rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Connection.php

Spacing +6 added lines, -6 removed lines

@@ -202,12 +202,12 @@ 
 			}
 		}
 		if ($tlsCipher = $this->setting->getTlsOption(ConnectionSettings::tlsOptionCipher, null)) {
-			if(true === is_string($tlsCipher)) {
+			if (true === is_string($tlsCipher)) {
 				$options[CURLOPT_SSL_CIPHER_LIST] = $tlsCipher;
 			}
 		}
 		if ($pinnedKey = $this->setting->getTlsOption(ConnectionSettings::tlsOptionPinnedKey, Constants::DEFAULT_PINNED_KEY)) {
-			if(true === is_string($pinnedKey)) {
+			if (true === is_string($pinnedKey)) {
 				$options[CURLOPT_PINNEDPUBLICKEY] = $pinnedKey;
 			}
 		}
@@ -239,7 +239,7 @@ 
 		return $this->call($command->getPath(),
 			$this->createDefaultOptions($progress),
 			$params,
-			function ($httpCode, $response) use ($command) {
+			function($httpCode, $response) use ($command) {
 				return $command->parseResult($httpCode, $response);
 			});
 	}
@@ -257,7 +257,7 @@ 
 		$options[CURLOPT_HTTPHEADER] = array(
 			'Content-Type: application/x-www-form-urlencoded');
 
-		return $this->call($command->getPath(), $options, null, function ($httpCode, $response) use ($command) {
+		return $this->call($command->getPath(), $options, null, function($httpCode, $response) use ($command) {
 			return $command->parseResult($httpCode, $response);
 		});
 	}
@@ -277,7 +277,7 @@ 
 			'blob' => $command->getData()
 		);
 
-		return $this->call($command->getPath(), $options, $params, function ($httpCode, $response) use ($command) {
+		return $this->call($command->getPath(), $options, $params, function($httpCode, $response) use ($command) {
 			return $command->parseResult($httpCode, $response);
 		});
 	}
@@ -304,7 +304,7 @@ 
 
 		$response = curl_exec($session);
 		if (false === $response) {
-			throw new Exception($path . ' ' . curl_error($session));
+			throw new Exception($path.' '.curl_error($session));
 		}
 
 		$httpCode = curl_getinfo($session, CURLINFO_HTTP_CODE);

source/Threema/MsgApi/ConnectionSettings.php

Spacing +5 added lines, -5 removed lines

@@ -49,20 +49,20 @@
 		$this->host = $host;
 
 		// TLS options
-		if(null !== $tlsOptions && is_array($tlsOptions)) {
-			if(true === array_key_exists(self::tlsOptionForceHttps, $tlsOptions)) {
+		if (null !== $tlsOptions && is_array($tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionForceHttps, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionForceHttps] = $tlsOptions[self::tlsOptionForceHttps] === true;
 			}
 
-			if(true === array_key_exists(self::tlsOptionVersion, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionVersion, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionVersion] = $tlsOptions[self::tlsOptionVersion];
 			}
 
-			if(true === array_key_exists(self::tlsOptionCipher, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionCipher, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionCipher] = $tlsOptions[self::tlsOptionCipher];
 			}
 
-			if(true === array_key_exists(self::tlsOptionPinnedKey, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionPinnedKey, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionPinnedKey] = $tlsOptions[self::tlsOptionPinnedKey];
 			}
 		}

source/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -2,11 +2,11 @@ 
 require_once("Salt/autoload.php");
 
 //define possibly missing constants
-defined('CURL_SSLVERSION_DEFAULT')  || define('CURL_SSLVERSION_DEFAULT', 0);
-defined('CURL_SSLVERSION_TLSv1')    || define('CURL_SSLVERSION_TLSv1', 1);
-defined('CURL_SSLVERSION_TLSv1_1')  || define('CURL_SSLVERSION_TLSv1_1', 5);
-defined('CURL_SSLVERSION_TLSv1_2')  || define('CURL_SSLVERSION_TLSv1_2', 6);
-defined('CURLOPT_PINNEDPUBLICKEY')  || define('CURLOPT_PINNEDPUBLICKEY', 1234); //TODO: Usew real value!!
+defined('CURL_SSLVERSION_DEFAULT') || define('CURL_SSLVERSION_DEFAULT', 0);
+defined('CURL_SSLVERSION_TLSv1') || define('CURL_SSLVERSION_TLSv1', 1);
+defined('CURL_SSLVERSION_TLSv1_1') || define('CURL_SSLVERSION_TLSv1_1', 5);
+defined('CURL_SSLVERSION_TLSv1_2') || define('CURL_SSLVERSION_TLSv1_2', 6);
+defined('CURLOPT_PINNEDPUBLICKEY') || define('CURLOPT_PINNEDPUBLICKEY', 1234); //TODO: Usew real value!!
 
 //define autoloader
 $d = dirname(__FILE__);
@@ -16,12 +16,12 @@ 
 	$fileName  = '';
 	if ($lastNsPos = strrpos($className, '\\')) {
 		$namespace = substr($className, 0, $lastNsPos);
-		$className = substr($className, $lastNsPos + 1);
-		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+		$className = substr($className, $lastNsPos+1);
+		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
 	}
-	$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+	$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 
-	if(true === file_exists( $d.'/'.$fileName)) {
+	if (true === file_exists($d.'/'.$fileName)) {
 		require $d.'/'.$fileName;
 	}
 });
@@ -30,7 +30,7 @@ 
 define('MSGAPI_SDK_VERSION', $sdkVersion);
 $cryptTool = Threema\MsgApi\Tools\CryptTool::getInstance();
 
-if(null === $cryptTool) {
+if (null === $cryptTool) {
 	throw new \Threema\Core\Exception("no supported crypt-tool");
 }