@@ -281,17 +281,17 @@ |
||
| 281 | 281 | * @throws ShareTokenNotFoundException |
| 282 | 282 | */ |
| 283 | 283 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 284 | - if ($this->get($prefix . 'token', $data) === '') { |
|
| 284 | + if ($this->get($prefix.'token', $data) === '') { |
|
| 285 | 285 | throw new ShareTokenNotFoundException(); |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - $this->setShareId($this->getInt($prefix . 'share_id', $data)); |
|
| 289 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
| 290 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 291 | - $this->setMemberId($this->get($prefix . 'member_id', $data)); |
|
| 292 | - $this->setToken($this->get($prefix . 'token', $data)); |
|
| 293 | - $this->setPassword($this->get($prefix . 'password', $data)); |
|
| 294 | - $this->setAccepted($this->getInt($prefix . 'accepted', $data, IShare::STATUS_PENDING)); |
|
| 288 | + $this->setShareId($this->getInt($prefix.'share_id', $data)); |
|
| 289 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
| 290 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 291 | + $this->setMemberId($this->get($prefix.'member_id', $data)); |
|
| 292 | + $this->setToken($this->get($prefix.'token', $data)); |
|
| 293 | + $this->setPassword($this->get($prefix.'password', $data)); |
|
| 294 | + $this->setAccepted($this->getInt($prefix.'accepted', $data, IShare::STATUS_PENDING)); |
|
| 295 | 295 | |
| 296 | 296 | return $this; |
| 297 | 297 | } |
@@ -302,18 +302,18 @@ |
||
| 302 | 302 | * @throws MembershipNotFoundException |
| 303 | 303 | */ |
| 304 | 304 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 305 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
| 305 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
| 306 | 306 | throw new MembershipNotFoundException(); |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 310 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
| 311 | - $this->setLevel($this->getInt($prefix . 'level', $data)); |
|
| 312 | - $this->setCircleConfig($this->getInt($prefix . 'circle_config', $data)); |
|
| 313 | - $this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data)); |
|
| 314 | - $this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data)); |
|
| 315 | - $this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data)); |
|
| 316 | - $this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data)); |
|
| 309 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 310 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
| 311 | + $this->setLevel($this->getInt($prefix.'level', $data)); |
|
| 312 | + $this->setCircleConfig($this->getInt($prefix.'circle_config', $data)); |
|
| 313 | + $this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data)); |
|
| 314 | + $this->setInheritanceLast($this->get($prefix.'inheritance_last', $data)); |
|
| 315 | + $this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data)); |
|
| 316 | + $this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data)); |
|
| 317 | 317 | |
| 318 | 318 | return $this; |
| 319 | 319 | } |
@@ -501,29 +501,29 @@ |
||
| 501 | 501 | * @throws FileCacheNotFoundException |
| 502 | 502 | */ |
| 503 | 503 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 504 | - if ($this->getInt($prefix . 'fileid', $data) === 0) { |
|
| 504 | + if ($this->getInt($prefix.'fileid', $data) === 0) { |
|
| 505 | 505 | throw new FileCacheNotFoundException(); |
| 506 | 506 | } |
| 507 | 507 | |
| 508 | - $this->setId($this->getInt($prefix . 'fileid', $data)); |
|
| 509 | - $this->setPath($this->get($prefix . 'path', $data)); |
|
| 510 | - $this->setPermissions($this->getInt($prefix . 'permissions', $data)); |
|
| 511 | - $this->setStorageId($this->getInt($prefix . 'storage', $data)); |
|
| 512 | - $this->setPathHash($this->get($prefix . 'path_hash', $data)); |
|
| 513 | - $this->setParent($this->getInt($prefix . 'parent', $data)); |
|
| 514 | - $this->setName($this->get($prefix . 'name', $data)); |
|
| 515 | - $this->setMimeType($this->getInt($prefix . 'mimetype', $data)); |
|
| 516 | - $this->setMimePart($this->getInt($prefix . 'mimepart', $data)); |
|
| 517 | - $this->setSize($this->getInt($prefix . 'size', $data)); |
|
| 518 | - $this->setMTime($this->getInt($prefix . 'mtime', $data)); |
|
| 519 | - $this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data)); |
|
| 520 | - $this->setEncrypted($this->getBool($prefix . 'encrypted', $data)); |
|
| 521 | - $this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data)); |
|
| 522 | - $this->setEtag($this->get($prefix . 'etag', $data)); |
|
| 523 | - $this->setChecksum($this->get($prefix . 'checksum', $data)); |
|
| 508 | + $this->setId($this->getInt($prefix.'fileid', $data)); |
|
| 509 | + $this->setPath($this->get($prefix.'path', $data)); |
|
| 510 | + $this->setPermissions($this->getInt($prefix.'permissions', $data)); |
|
| 511 | + $this->setStorageId($this->getInt($prefix.'storage', $data)); |
|
| 512 | + $this->setPathHash($this->get($prefix.'path_hash', $data)); |
|
| 513 | + $this->setParent($this->getInt($prefix.'parent', $data)); |
|
| 514 | + $this->setName($this->get($prefix.'name', $data)); |
|
| 515 | + $this->setMimeType($this->getInt($prefix.'mimetype', $data)); |
|
| 516 | + $this->setMimePart($this->getInt($prefix.'mimepart', $data)); |
|
| 517 | + $this->setSize($this->getInt($prefix.'size', $data)); |
|
| 518 | + $this->setMTime($this->getInt($prefix.'mtime', $data)); |
|
| 519 | + $this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data)); |
|
| 520 | + $this->setEncrypted($this->getBool($prefix.'encrypted', $data)); |
|
| 521 | + $this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data)); |
|
| 522 | + $this->setEtag($this->get($prefix.'etag', $data)); |
|
| 523 | + $this->setChecksum($this->get($prefix.'checksum', $data)); |
|
| 524 | 524 | |
| 525 | 525 | // small hack as there is no reason to call a recursive method for a single entry from the table |
| 526 | - $this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data)); |
|
| 526 | + $this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data)); |
|
| 527 | 527 | |
| 528 | 528 | return $this; |
| 529 | 529 | } |
@@ -848,29 +848,29 @@ discard block |
||
| 848 | 848 | * @throws MemberNotFoundException |
| 849 | 849 | */ |
| 850 | 850 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 851 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
| 851 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
| 852 | 852 | throw new MemberNotFoundException(); |
| 853 | 853 | } |
| 854 | 854 | |
| 855 | - $this->setId($this->get($prefix . 'member_id', $data)); |
|
| 856 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
| 857 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 858 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
| 859 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
| 860 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 861 | - $this->setLevel($this->getInt($prefix . 'level', $data)); |
|
| 862 | - $this->setStatus($this->get($prefix . 'status', $data)); |
|
| 863 | - $this->setDisplayName($this->get($prefix . 'cached_name', $data)); |
|
| 864 | - $this->setNotes($this->getArray($prefix . 'note', $data)); |
|
| 865 | - $this->setContactId($this->get($prefix . 'contact_id', $data)); |
|
| 866 | - $this->setContactMeta($this->get($prefix . 'contact_meta', $data)); |
|
| 867 | - |
|
| 868 | - $cachedUpdate = $this->get($prefix . 'cached_update', $data); |
|
| 855 | + $this->setId($this->get($prefix.'member_id', $data)); |
|
| 856 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
| 857 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 858 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
| 859 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
| 860 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 861 | + $this->setLevel($this->getInt($prefix.'level', $data)); |
|
| 862 | + $this->setStatus($this->get($prefix.'status', $data)); |
|
| 863 | + $this->setDisplayName($this->get($prefix.'cached_name', $data)); |
|
| 864 | + $this->setNotes($this->getArray($prefix.'note', $data)); |
|
| 865 | + $this->setContactId($this->get($prefix.'contact_id', $data)); |
|
| 866 | + $this->setContactMeta($this->get($prefix.'contact_meta', $data)); |
|
| 867 | + |
|
| 868 | + $cachedUpdate = $this->get($prefix.'cached_update', $data); |
|
| 869 | 869 | if ($cachedUpdate !== '') { |
| 870 | 870 | $this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp()); |
| 871 | 871 | } |
| 872 | 872 | |
| 873 | - $joined = $this->get($prefix . 'joined', $data); |
|
| 873 | + $joined = $this->get($prefix.'joined', $data); |
|
| 874 | 874 | if ($joined !== '') { |
| 875 | 875 | $this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp()); |
| 876 | 876 | } |
@@ -961,7 +961,7 @@ discard block |
||
| 961 | 961 | public static function parseLevelInt(int $level): int { |
| 962 | 962 | if (!array_key_exists($level, self::$DEF_LEVEL)) { |
| 963 | 963 | $all = implode(', ', array_keys(self::$DEF_LEVEL)); |
| 964 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
| 964 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
| 965 | 965 | } |
| 966 | 966 | |
| 967 | 967 | return $level; |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | |
| 981 | 981 | if (!$level) { |
| 982 | 982 | $all = implode(', ', array_values(self::$DEF_LEVEL)); |
| 983 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
| 983 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | return (int)$level; |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | $type = array_search($typeString, Member::$TYPE); |
| 1002 | 1002 | if ($type === false) { |
| 1003 | 1003 | $all = implode(', ', array_values(self::$TYPE)); |
| 1004 | - throw new UserTypeNotFoundException('Available types: ' . $all); |
|
| 1004 | + throw new UserTypeNotFoundException('Available types: '.$all); |
|
| 1005 | 1005 | } |
| 1006 | 1006 | |
| 1007 | 1007 | return (int)$type; |
@@ -418,15 +418,15 @@ |
||
| 418 | 418 | * @throws FederatedUserNotFoundException |
| 419 | 419 | */ |
| 420 | 420 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 421 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
| 421 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
| 422 | 422 | throw new FederatedUserNotFoundException(); |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 426 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
| 427 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
| 428 | - $this->setDisplayName($this->get($prefix . 'cached_name', $data)); |
|
| 429 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 425 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 426 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
| 427 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
| 428 | + $this->setDisplayName($this->get($prefix.'cached_name', $data)); |
|
| 429 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 430 | 430 | |
| 431 | 431 | $this->getManager()->manageImportFromDatabase($this, $data, $prefix); |
| 432 | 432 | |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | class RemoteInstance extends NCSignatory implements IQueryRow, JsonSerializable { |
| 47 | 47 | use TArrayTools; |
| 48 | 48 | |
| 49 | - public const TYPE_UNKNOWN = 'Unknown'; // not trusted |
|
| 50 | - public const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle. |
|
| 51 | - public const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted if a member belongs to the circle. |
|
| 52 | - public const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted. |
|
| 53 | - public const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted, |
|
| 49 | + public const TYPE_UNKNOWN = 'Unknown'; // not trusted |
|
| 50 | + public const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle. |
|
| 51 | + public const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted if a member belongs to the circle. |
|
| 52 | + public const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted. |
|
| 53 | + public const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted, |
|
| 54 | 54 | |
| 55 | 55 | public static $LIST_TYPE = [ |
| 56 | 56 | self::TYPE_UNKNOWN, |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | ]; |
| 527 | 527 | |
| 528 | 528 | if ($this->getAuthSigned() !== '') { |
| 529 | - $data[self::AUTH_SIGNED] = $this->getAlgorithm() . ':' . $this->getAuthSigned(); |
|
| 529 | + $data[self::AUTH_SIGNED] = $this->getAlgorithm().':'.$this->getAuthSigned(); |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | if (!empty($this->getAliases())) { |
@@ -545,17 +545,17 @@ discard block |
||
| 545 | 545 | * @throws RemoteNotFoundException |
| 546 | 546 | */ |
| 547 | 547 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 548 | - if ($this->getInt($prefix . 'id', $data) === 0) { |
|
| 548 | + if ($this->getInt($prefix.'id', $data) === 0) { |
|
| 549 | 549 | throw new RemoteNotFoundException(); |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | - $this->setDbId($this->getInt($prefix . 'id', $data)); |
|
| 553 | - $this->import($this->getArray($prefix . 'item', $data)); |
|
| 554 | - $this->setOrigData($this->getArray($prefix . 'item', $data)); |
|
| 555 | - $this->setType($this->get($prefix . 'type', $data)); |
|
| 556 | - $this->setInterface($this->getInt($prefix . 'interface', $data)); |
|
| 557 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 558 | - $this->setId($this->get($prefix . 'href', $data)); |
|
| 552 | + $this->setDbId($this->getInt($prefix.'id', $data)); |
|
| 553 | + $this->import($this->getArray($prefix.'item', $data)); |
|
| 554 | + $this->setOrigData($this->getArray($prefix.'item', $data)); |
|
| 555 | + $this->setType($this->get($prefix.'type', $data)); |
|
| 556 | + $this->setInterface($this->getInt($prefix.'interface', $data)); |
|
| 557 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 558 | + $this->setId($this->get($prefix.'href', $data)); |
|
| 559 | 559 | |
| 560 | 560 | return $this; |
| 561 | 561 | } |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | */ |
| 139 | 139 | public function setBody(string $body): self { |
| 140 | 140 | $this->body = $body; |
| 141 | - $this->setDigest('SHA-256=' . base64_encode(hash("sha256", utf8_encode($body), true))); |
|
| 141 | + $this->setDigest('SHA-256='.base64_encode(hash("sha256", utf8_encode($body), true))); |
|
| 142 | 142 | |
| 143 | 143 | return $this; |
| 144 | 144 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | $item = new $class(); |
| 294 | 294 | if (!$item instanceof IDeserializable && !$item instanceof JsonSerializable) { |
| 295 | 295 | throw new InvalidItemException( |
| 296 | - $class . ' does not implement IDeserializable and JsonSerializable' |
|
| 296 | + $class.' does not implement IDeserializable and JsonSerializable' |
|
| 297 | 297 | ); |
| 298 | 298 | } |
| 299 | 299 | |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | foreach ($keys as $key) { |
| 421 | 421 | if (!$this->haveKey($key)) { |
| 422 | 422 | if ($must) { |
| 423 | - throw new MalformedArrayException($key . ' missing in ' . json_encode($this->keys())); |
|
| 423 | + throw new MalformedArrayException($key.' missing in '.json_encode($this->keys())); |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | return false; |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | */ |
| 82 | 82 | public function createSimpleSignatory(NCSignatory $signatory): void { |
| 83 | 83 | $app = $this->setup('app', '', self::$SIGNATORIES_APP); |
| 84 | - $signatory->setKeyId($signatory->getId() . '#main-key'); |
|
| 84 | + $signatory->setKeyId($signatory->getId().'#main-key'); |
|
| 85 | 85 | $signatory->setKeyOwner($signatory->getId()); |
| 86 | 86 | $this->generateKeys($signatory); |
| 87 | 87 | |