nextcloud / circles

lib/Model/ShareToken.php

Spacing +8 added lines, -8 removed lines

@@ -281,17 +281,17 @@
 	 * @throws ShareTokenNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'token', $data) === '') {
+		if ($this->get($prefix.'token', $data) === '') {
 			throw new ShareTokenNotFoundException();
 		}
 
-		$this->setShareId($this->getInt($prefix . 'share_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setMemberId($this->get($prefix . 'member_id', $data));
-		$this->setToken($this->get($prefix . 'token', $data));
-		$this->setPassword($this->get($prefix . 'password', $data));
-		$this->setAccepted($this->getInt($prefix . 'accepted', $data, IShare::STATUS_PENDING));
+		$this->setShareId($this->getInt($prefix.'share_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setMemberId($this->get($prefix.'member_id', $data));
+		$this->setToken($this->get($prefix.'token', $data));
+		$this->setPassword($this->get($prefix.'password', $data));
+		$this->setAccepted($this->getInt($prefix.'accepted', $data, IShare::STATUS_PENDING));
 
 		return $this;
 	}

lib/Model/Membership.php

Spacing +9 added lines, -9 removed lines

@@ -302,18 +302,18 @@
 	 * @throws MembershipNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MembershipNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setCircleConfig($this->getInt($prefix . 'circle_config', $data));
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setCircleConfig($this->getInt($prefix.'circle_config', $data));
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
 
 		return $this;
 	}

lib/Model/FileCacheWrapper.php

Spacing +18 added lines, -18 removed lines

@@ -501,29 +501,29 @@
 	 * @throws FileCacheNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->getInt($prefix . 'fileid', $data) === 0) {
+		if ($this->getInt($prefix.'fileid', $data) === 0) {
 			throw new FileCacheNotFoundException();
 		}
 
-		$this->setId($this->getInt($prefix . 'fileid', $data));
-		$this->setPath($this->get($prefix . 'path', $data));
-		$this->setPermissions($this->getInt($prefix . 'permissions', $data));
-		$this->setStorageId($this->getInt($prefix . 'storage', $data));
-		$this->setPathHash($this->get($prefix . 'path_hash', $data));
-		$this->setParent($this->getInt($prefix . 'parent', $data));
-		$this->setName($this->get($prefix . 'name', $data));
-		$this->setMimeType($this->getInt($prefix . 'mimetype', $data));
-		$this->setMimePart($this->getInt($prefix . 'mimepart', $data));
-		$this->setSize($this->getInt($prefix . 'size', $data));
-		$this->setMTime($this->getInt($prefix . 'mtime', $data));
-		$this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data));
-		$this->setEncrypted($this->getBool($prefix . 'encrypted', $data));
-		$this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data));
-		$this->setEtag($this->get($prefix . 'etag', $data));
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
+		$this->setId($this->getInt($prefix.'fileid', $data));
+		$this->setPath($this->get($prefix.'path', $data));
+		$this->setPermissions($this->getInt($prefix.'permissions', $data));
+		$this->setStorageId($this->getInt($prefix.'storage', $data));
+		$this->setPathHash($this->get($prefix.'path_hash', $data));
+		$this->setParent($this->getInt($prefix.'parent', $data));
+		$this->setName($this->get($prefix.'name', $data));
+		$this->setMimeType($this->getInt($prefix.'mimetype', $data));
+		$this->setMimePart($this->getInt($prefix.'mimepart', $data));
+		$this->setSize($this->getInt($prefix.'size', $data));
+		$this->setMTime($this->getInt($prefix.'mtime', $data));
+		$this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data));
+		$this->setEncrypted($this->getBool($prefix.'encrypted', $data));
+		$this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data));
+		$this->setEtag($this->get($prefix.'etag', $data));
+		$this->setChecksum($this->get($prefix.'checksum', $data));
 
 		// small hack as there is no reason to call a recursive method for a single entry from the table
-		$this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data));
+		$this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data));
 
 		return $this;
 	}

lib/Model/Member.php

Spacing +19 added lines, -19 removed lines

@@ -848,29 +848,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MemberNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'member_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setStatus($this->get($prefix . 'status', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setNotes($this->getArray($prefix . 'note', $data));
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
-
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
+		$this->setId($this->get($prefix.'member_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setStatus($this->get($prefix.'status', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setNotes($this->getArray($prefix.'note', $data));
+		$this->setContactId($this->get($prefix.'contact_id', $data));
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
+
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
 		if ($cachedUpdate !== '') {
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
 		}
 
-		$joined = $this->get($prefix . 'joined', $data);
+		$joined = $this->get($prefix.'joined', $data);
 		if ($joined !== '') {
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
 		}
@@ -961,7 +961,7 @@ 
 	public static function parseLevelInt(int $level): int {
 		if (!array_key_exists($level, self::$DEF_LEVEL)) {
 			$all = implode(', ', array_keys(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return $level;
@@ -980,7 +980,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return (int)$level;
@@ -1001,7 +1001,7 @@ 
 		$type = array_search($typeString, Member::$TYPE);
 		if ($type === false) {
 			$all = implode(', ', array_values(self::$TYPE));
-			throw new UserTypeNotFoundException('Available types: ' . $all);
+			throw new UserTypeNotFoundException('Available types: '.$all);
 		}
 
 		return (int)$type;

lib/Model/ShareWrapper.php

Spacing +19 added lines, -19 removed lines

@@ -677,9 +677,9 @@ 
 
 		$display = $circle->getDisplayName();
 		if ($circle->getSource() === Member::TYPE_CIRCLE) {
-			$display .= ' (Circle owned by ' . $circle->getOwner()->getDisplayName() . ')';
+			$display .= ' (Circle owned by '.$circle->getOwner()->getDisplayName().')';
 		} else {
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
 		}
 
 		$share->setSharedWithDisplayName($display);
@@ -785,20 +785,20 @@ 
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
 		$shareTime = new DateTime();
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
-
-		$this->setId($this->get($prefix . 'id', $data))
-			 ->setShareType($this->getInt($prefix . 'share_type', $data))
-			 ->setPermissions($this->getInt($prefix . 'permissions', $data))
-			 ->setItemType($this->get($prefix . 'item_type', $data))
-			 ->setItemSource($this->getInt($prefix . 'item_source', $data))
-			 ->setItemTarget($this->get($prefix . 'item_target', $data))
-			 ->setFileSource($this->getInt($prefix . 'file_source', $data))
-			 ->setFileTarget($this->get($prefix . 'file_target', $data))
-			 ->setSharedWith($this->get($prefix . 'share_with', $data))
-			 ->setSharedBy($this->get($prefix . 'uid_initiator', $data))
-			 ->setShareOwner($this->get($prefix . 'uid_owner', $data))
-			 ->setToken($this->get($prefix . 'token', $data))
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
+
+		$this->setId($this->get($prefix.'id', $data))
+			 ->setShareType($this->getInt($prefix.'share_type', $data))
+			 ->setPermissions($this->getInt($prefix.'permissions', $data))
+			 ->setItemType($this->get($prefix.'item_type', $data))
+			 ->setItemSource($this->getInt($prefix.'item_source', $data))
+			 ->setItemTarget($this->get($prefix.'item_target', $data))
+			 ->setFileSource($this->getInt($prefix.'file_source', $data))
+			 ->setFileTarget($this->get($prefix.'file_target', $data))
+			 ->setSharedWith($this->get($prefix.'share_with', $data))
+			 ->setSharedBy($this->get($prefix.'uid_initiator', $data))
+			 ->setShareOwner($this->get($prefix.'uid_owner', $data))
+			 ->setToken($this->get($prefix.'token', $data))
 			 ->setShareTime($shareTime);
 
 //		if (($password = $this->get('personal_password', $data, '')) !== '') {
@@ -807,9 +807,9 @@ 
 //			$share->setPassword($this->get('password', $data, ''));
 //		}
 
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
-			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
-			 ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
+			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))
+			 ->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
 			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)
 			 ->setStatus(Ishare::STATUS_ACCEPTED);
 

lib/Model/FederatedUser.php

Spacing +6 added lines, -6 removed lines

@@ -418,15 +418,15 @@
 	 * @throws FederatedUserNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new FederatedUserNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
 

lib/Model/Federated/RemoteInstance.php

Spacing +14 added lines, -14 removed lines

@@ -46,11 +46,11 @@ 
 class RemoteInstance extends NCSignatory implements IQueryRow, JsonSerializable {
 	use TArrayTools;
 
-	public const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	public const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	public const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	public const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	public const TYPE_GLOBALSCALE = 'GlobalScale';  // every Circle is broadcasted,
+	public const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	public const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	public const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	public const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	public const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -526,7 +526,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data[self::AUTH_SIGNED] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data[self::AUTH_SIGNED] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		if (!empty($this->getAliases())) {
@@ -545,17 +545,17 @@ 
 	 * @throws RemoteNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->getInt($prefix . 'id', $data) === 0) {
+		if ($this->getInt($prefix.'id', $data) === 0) {
 			throw new RemoteNotFoundException();
 		}
 
-		$this->setDbId($this->getInt($prefix . 'id', $data));
-		$this->import($this->getArray($prefix . 'item', $data));
-		$this->setOrigData($this->getArray($prefix . 'item', $data));
-		$this->setType($this->get($prefix . 'type', $data));
-		$this->setInterface($this->getInt($prefix . 'interface', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setId($this->get($prefix . 'href', $data));
+		$this->setDbId($this->getInt($prefix.'id', $data));
+		$this->import($this->getArray($prefix.'item', $data));
+		$this->setOrigData($this->getArray($prefix.'item', $data));
+		$this->setType($this->get($prefix.'type', $data));
+		$this->setInterface($this->getInt($prefix.'interface', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setId($this->get($prefix.'href', $data));
 
 		return $this;
 	}

lib/Model/Circle.php

Spacing +33 added lines, -33 removed lines

@@ -92,26 +92,26 @@ 
 
 
 	// specific value
-	public const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	public const CFG_SINGLE = 1;        // Circle with only one single member.
-	public const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	public const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	public const CFG_SINGLE = 1; // Circle with only one single member.
+	public const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	public const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	public const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	public const CFG_OPEN = 16;             // Circle is open, people can join
-	public const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	public const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	public const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	public const CFG_PROTECTED = 256;       // Password protected to join/request
-	public const CFG_NO_OWNER = 512;        // no owner, only members
-	public const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	public const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	public const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	public const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	public const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	public const CFG_FEDERATED = 32768;         // Federated
-	public const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
+	public const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	public const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	public const CFG_OPEN = 16; // Circle is open, people can join
+	public const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	public const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	public const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	public const CFG_PROTECTED = 256; // Password protected to join/request
+	public const CFG_NO_OWNER = 512; // no owner, only members
+	public const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	public const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	public const CFG_LOCAL = 4096; // Local even on GlobalScale
+	public const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	public const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	public const CFG_FEDERATED = 32768; // Federated
+	public const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
 
 	public static $DEF_CFG_MAX = 131071;
 
@@ -478,7 +478,7 @@ 
 	 */
 	public function addInheritedMembers(array $members): self {
 		$knownIds = array_map(
-			function (Member $member): string {
+			function(Member $member): string {
 				return $member->getId();
 			}, $this->inheritedMembers
 		);
@@ -892,23 +892,23 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
-			 ->setSanitizedName($this->get($prefix . 'sanitized_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setSource($this->getInt($prefix . 'source', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
+			 ->setSanitizedName($this->get($prefix.'sanitized_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setSource($this->getInt($prefix.'source', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
 
 		$this->setPopulation($this->getInt('population', $this->getSettings()));

lib/Tools/Model/Request.php

Spacing +10 added lines, -10 removed lines

@@ -259,7 +259,7 @@ 
 	public function getInstance(): string {
 		$instance = $this->getHost();
 		if ($this->getPort() > 0) {
-			$instance .= ':' . $this->getPort();
+			$instance .= ':'.$this->getPort();
 		}
 
 		return $instance;
@@ -283,7 +283,7 @@ 
 		if ($protocol === null) {
 			if (strpos($url, '/') > -1) {
 				list($address, $baseUrl) = explode('/', $url, 2);
-				$this->setBaseUrl('/' . $baseUrl);
+				$this->setBaseUrl('/'.$baseUrl);
 			} else {
 				$address = $url;
 			}
@@ -393,7 +393,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->data[$k], $url);
+			$url = str_replace(':'.$k, $this->data[$k], $url);
 		}
 
 		return $url;
@@ -410,7 +410,7 @@ 
 				continue;
 			}
 
-			$url = str_replace(':' . $k, $this->params[$k], $url);
+			$url = str_replace(':'.$k, $this->params[$k], $url);
 		}
 
 		return $url;
@@ -421,7 +421,7 @@ 
 	 * @return string
 	 */
 	public function getPath(): string {
-		return $this->baseUrl . $this->url;
+		return $this->baseUrl.$this->url;
 	}
 
 
@@ -438,9 +438,9 @@ 
 	 * @return string
 	 */
 	public function getCompleteUrl(): string {
-		$port = ($this->getPort() > 0) ? ':' . $this->getPort() : '';
+		$port = ($this->getPort() > 0) ? ':'.$this->getPort() : '';
 
-		return $this->getUsedProtocol() . '://' . $this->getHost() . $port . $this->getParametersUrl();
+		return $this->getUsedProtocol().'://'.$this->getHost().$port.$this->getParametersUrl();
 	}
 
 
@@ -455,7 +455,7 @@ 
 	public function addHeader($key, $value): Request {
 		$header = $this->get($key, $this->headers);
 		if ($header !== '') {
-			$header .= ', ' . $value;
+			$header .= ', '.$value;
 		} else {
 			$header = $value;
 		}
@@ -685,11 +685,11 @@ 
 
 		switch ($this->getQueryStringType()) {
 			case self::QS_VAR_ARRAY:
-				return '?' . http_build_query($this->getParams());
+				return '?'.http_build_query($this->getParams());
 
 			case self::QS_VAR_DUPLICATE:
 			default:
-				return '?' . preg_replace(
+				return '?'.preg_replace(
 						'/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams())
 					);
 		}