gyselroth / balloon

src/lib/Balloon/Auth/Adapter/Basic/Ldap.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -74,7 +74,7 @@ 
      * @param   Logger $logger
      * @return  void
      */
-    public function __construct(?Iterable $config, Logger $logger)
+    public function __construct(? Iterable $config, Logger $logger)
     {
         $this->logger = $logger;
         $this->setOptions($config);
@@ -109,7 +109,7 @@ 
      * @param   Iterable
      * @return  Ldap
      */
-    public function setOptions(?Iterable $config): LdapServer
+    public function setOptions(? Iterable $config) : LdapServer
     {
         if ($config === null) {
             return $this;

src/lib/Balloon/Auth/Adapter/None.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -31,7 +31,7 @@ 
      * @param  Logger $logger
      * @return void
      */
-    public function __construct(?Iterable $config, Logger $logger)
+    public function __construct(? Iterable $config, Logger $logger)
     {
     }
 
@@ -41,7 +41,7 @@ 
      *
      * @return int
      */
-    public function getAttributeSyncCache(): int
+    public function getAttributeSyncCache() : int
     {
         return -1;
     }

src/lib/Balloon/Auth/Adapter/Preauth.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -40,7 +40,7 @@ 
      * @param   Iterable $config
      * @return  LdapServer
      */
-    public function setOptions(?Iterable $config): LdapServer
+    public function setOptions(? Iterable $config) : LdapServer
     {
         if ($config === null) {
             return $this;
@@ -108,7 +108,7 @@ 
      */
     public function preauth(string $value): bool
     {
-        $parts   = explode('|', $value);
+        $parts = explode('|', $value);
 
         if (count($parts) !== 2) {
             $this->logger->warning('invalid header x-preauth value, parts != 2', [
@@ -195,7 +195,7 @@ 
             'category' => get_class($this)
         ]);
 
-        $this->ldap_dn   = $dn;
+        $this->ldap_dn = $dn;
 
         return true;
     }
@@ -220,6 +220,6 @@ 
         $ip_decimal = ip2long($ip);
         $wildcard_decimal = pow(2, (32 - $netmask)) - 1;
         $netmask_decimal = ~ $wildcard_decimal;
-        return (($ip_decimal & $netmask_decimal) == ($range_decimal & $netmask_decimal));
+        return (($ip_decimal&$netmask_decimal) == ($range_decimal&$netmask_decimal));
     }
 }

src/lib/Balloon/Auth/Adapter/AdapterInterface.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -23,7 +23,7 @@ 
      * @param   Logger $logger
      * @return  void
      */
-    public function __construct(?Iterable $config, Logger $logger);
+    public function __construct(? Iterable $config, Logger $logger);
 
 
     /**

src/lib/Balloon/Auth/Adapter/Oauth2.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -97,7 +97,7 @@ 
      * @param   Logger $logger
      * @return  void
      */
-    public function __construct(?Iterable $config, Logger $logger)
+    public function __construct(? Iterable $config, Logger $logger)
     {
         $this->logger = $logger;
         $this->setOptions($config);
@@ -110,7 +110,7 @@ 
      * @param   Iterable
      * @return  Oauth2
      */
-    public function setOptions(?Iterable $config): Oauth2
+    public function setOptions(? Iterable $config) : Oauth2
     {
         if ($config === null) {
             return $this;
@@ -266,9 +266,9 @@ 
         $jre = json_decode($re);
         
         if ($jre->status == "success") {
-            return (array) $jre->data;
+            return (array)$jre->data;
         } elseif ($jre->status == "fail") {
-            throw new Exception('Error while validating the acces token. Auth server responded: ' . $jre->message);
+            throw new Exception('Error while validating the acces token. Auth server responded: '.$jre->message);
         } else {
             throw new Exception('could not decode response: '.$re);
         }

src/lib/Balloon/Preview.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -41,7 +41,7 @@ 
      * @param  Iterable $config
      * @return void
      */
-    public function __construct(Logger $logger, ?Iterable $config)
+    public function __construct(Logger $logger, ? Iterable $config)
     {
         $this->logger = $logger;
         $this->addConverter($config);

src/lib/Balloon/Filesystem/Delta.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -85,7 +85,7 @@ 
      * @param   string $cursor
      * @return  array
      */
-    protected function decodeCursor(?string $cursor): ?array
+    protected function decodeCursor(? string $cursor) : ? array
     {
         if ($cursor === null) {
             return null;
@@ -115,7 +115,7 @@ 
      * @param   INode $node
      * @return  array
      */
-    public function buildFeedFromCurrentState(?array $cursor=null, int $limit=100, array $attributes=[], ?INode $node=null): array
+    public function buildFeedFromCurrentState(? array $cursor = null, int $limit = 100, array $attributes = [], ? INode $node = null) : array
     {
         $current_cursor = 0;
         $filter = ['$and' => [
@@ -153,7 +153,7 @@ 
                 $ts       = $last['timestamp'];
             }
 
-            $reset  = true;
+            $reset = true;
             if ($has_more === false) {
                 $cursor = base64_encode('delta|0|0|'.$delta_id.'|'.$ts);
             } else {
@@ -201,7 +201,7 @@ 
      * @param  INode $node
      * @return BSONDocument
      */
-    public function getLastRecord(?INode $node=null): ?BSONDocument
+    public function getLastRecord(? INode $node = null) : ? BSONDocument
     {
         $filter = $this->getDeltaFilter();
         
@@ -227,7 +227,7 @@ 
      * @param  INode $node
      * @return string
      */
-    public function getLastCursor(?INode $node=null): string
+    public function getLastCursor(? INode $node = null) : string
     {
         $filter = $this->getDeltaFilter();
         
@@ -259,11 +259,11 @@ 
      * @param   INode $node
      * @return  array
      */
-    public function getDeltaFeed(?string $cursor=null, int $limit=250, array $attributes=[], ?INode $node=null): array
+    public function getDeltaFeed(? string $cursor = null, int $limit = 250, array $attributes = [], ? INode $node = null) : array
     {
         $this->user->findNewShares();
 
-        $attributes = array_merge(['id', 'directory', 'deleted',  'path', 'changed', 'created', 'owner'],
+        $attributes = array_merge(['id', 'directory', 'deleted', 'path', 'changed', 'created', 'owner'],
             $attributes);
 
         $cursor = $this->decodeCursor($cursor);
@@ -429,7 +429,7 @@ 
      * @param   INode $node
      * @return  array
      */
-    public function getEventLog(int $limit=100, int $skip=0, ?INode $node=null): array
+    public function getEventLog(int $limit = 100, int $skip = 0, ? INode $node = null) : array
     {
         $filter = $this->getDeltaFilter();
 
@@ -456,7 +456,7 @@ 
         
         $events = [];
         foreach ($result as $log) {
-            $id    = (string)$log['_id'];
+            $id = (string)$log['_id'];
             $events[$id] = [
                 'event'     => $id,
                 'timestamp' => Helper::DateTimeToUnix($log['timestamp']),

src/lib/Balloon/Filesystem/Node/Node.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -221,7 +221,7 @@ 
      * @param  Filesystem $fs
      * @return void
      */
-    public function __construct(?BSONDocument $node, Filesystem $fs)
+    public function __construct(? BSONDocument $node, Filesystem $fs)
     {
         $this->_fs         = $fs;
         $this->_db         = $fs->getDatabase();
@@ -269,7 +269,7 @@ 
      *
      * @return mixed
      */
-    public function __call(string $attribute, array $params=[])
+    public function __call(string $attribute, array $params = [])
     {
         $prefix = 'get';
         $attr = strtolower(substr($attribute, 3));
@@ -314,7 +314,7 @@ 
      * @param  int $conflict
      * @return INode
      */
-    public function setParent(Collection $parent, int $conflict=INode::CONFLICT_NOACTION): INode
+    public function setParent(Collection $parent, int $conflict = INode::CONFLICT_NOACTION): INode
     {
         if ($this->parent === $parent->getId()) {
             throw new Exception\Conflict('source node '.$this->name.' is already in the requested parent folder',
@@ -389,7 +389,7 @@ 
      * @param   bool $recursion_first
      * @return  INode
      */
-    abstract public function copyTo(Collection $parent, int $conflict=INode::CONFLICT_NOACTION, ?string $recursion=null, bool $recursion_first=true): INode;
+    abstract public function copyTo(Collection $parent, int $conflict = INode::CONFLICT_NOACTION, ? string $recursion = null, bool $recursion_first = true) : INode;
 
 
     /**
@@ -398,7 +398,7 @@ 
      * @param   bool $reference
      * @return  ObjectId
      */
-    public function getShareId(bool $reference=false): ?ObjectId
+    public function getShareId(bool $reference = false): ? ObjectId
     {
         if ($this->isReference() && $reference === true) {
             return $this->_id;
@@ -446,7 +446,7 @@ 
      * @param   bool $reference
      * @return  Collection
      */
-    public function getShareNode(): ?Collection
+    public function getShareNode(): ? Collection
     {
         if ($this->isSpecial()) {
             return $this->_fs->findNodeWithId($this->getShareId(true));
@@ -594,7 +594,7 @@ 
      * @param   string $privilege
      * @return  bool
      */
-    public function isAllowed(string $privilege='r'): bool
+    public function isAllowed(string $privilege = 'r'): bool
     {
         $acl   = null;
         $share = null;
@@ -788,7 +788,7 @@ 
             $clean[] = 'meta';
         }
         
-        $attribute  = $clean;
+        $attribute = $clean;
 
         try {
             $sharenode  = $this->getShareNode();
@@ -918,7 +918,7 @@ 
      * @param   string $name
      * @return  string
      */
-    protected function _getDuplicateName(?string $name=null): string
+    protected function _getDuplicateName(? string $name = null) : string
     {
         if ($name === null) {
             $name = $this->name;
@@ -927,7 +927,7 @@ 
         if ($this instanceof Collection) {
             return $name.' ('.substr(uniqid('', true), -4).')';
         } else {
-            $ext  = substr(strrchr($name, '.'), 1);
+            $ext = substr(strrchr($name, '.'), 1);
 
             if ($ext === false) {
                 return $name.' ('.substr(uniqid('', true), -4).')';
@@ -947,7 +947,7 @@ 
      * @param   bool $recursion_first
      * @return  bool
      */
-    public function undelete(int $conflict=INode::CONFLICT_NOACTION, ?string $recursion=null, bool $recursion_first=true): bool
+    public function undelete(int $conflict = INode::CONFLICT_NOACTION, ? string $recursion = null, bool $recursion_first = true) : bool
     {
         if (!$this->isAllowed('w')) {
             throw new Exception\Forbidden('not allowed to restore node '.$this->name,
@@ -987,7 +987,7 @@ 
             $recursion_first = false;
         }
 
-        $this->deleted  = false;
+        $this->deleted = false;
         
         if ($this instanceof File) {
             $current = $this->version;
@@ -1141,7 +1141,7 @@ 
      *
      * @return ObjectId|string
      */
-    public function getId(bool $string=false)
+    public function getId(bool $string = false)
     {
         if ($string === true) {
             return (string)$this->_id;
@@ -1156,7 +1156,7 @@ 
      *
      * @return Collection
      */
-    public function getParent(): ?Collection
+    public function getParent(): ? Collection
     {
         try {
             if ($this->isRoot()) {
@@ -1191,7 +1191,7 @@ 
      * @param   array $parents
      * @return  array
      */
-    public function getParents(?INode $node=null, array $parents=[]): array
+    public function getParents(? INode $node = null, array $parents = []) : array
     {
         if ($node === null) {
             $node = $this;
@@ -1258,7 +1258,7 @@ 
      * @param   int $depth
      * @return  bool
      */
-    public function zip(ZipStream $archive, bool $self=true, ?INode $parent=null, string $path='', int $depth=0): bool
+    public function zip(ZipStream $archive, bool $self = true, ? INode $parent = null, string $path = '', int $depth = 0) : bool
     {
         if ($parent === null) {
             $parent = $this;
@@ -1320,7 +1320,7 @@ 
      * @param   mixed $value
      * @return  INode
      */
-    public function setMetaAttribute($attributes, $value=null): INode
+    public function setMetaAttribute($attributes, $value = null): INode
     {
         $this->meta = self::validateMetaAttribute($attributes, $value, $this->meta);
         $this->save('meta');
@@ -1336,7 +1336,7 @@ 
      * @param   array $set
      * @return  array
      */
-    public static function validateMetaAttribute($attributes, $value=null, array $set=[]): array
+    public static function validateMetaAttribute($attributes, $value = null, array $set = []): array
     {
         if (is_string($attributes)) {
             $attributes = [
@@ -1367,7 +1367,7 @@ 
      * @param  string|array $attribute Specify attributes to return
      * @return string|array
      */
-    public function getMetaAttribute($attribute=[])
+    public function getMetaAttribute($attribute = [])
     {
         if (is_string($attribute)) {
             if (isset($this->meta[$attribute])) {
@@ -1387,7 +1387,7 @@ 
      * @param   bool $readonly
      * @return  bool
      */
-    public function setReadonly(bool $readonly=true): bool
+    public function setReadonly(bool $readonly = true): bool
     {
         $this->readonly = $readonly;
         return $this->save('readonly');
@@ -1400,7 +1400,7 @@ 
      * @param   UTCDateTime $ts
      * @return  bool
      */
-    public function setDestroyable(?UTCDateTime $ts): bool
+    public function setDestroyable(? UTCDateTime $ts) : bool
     {
         $this->destroy = $ts;
         
@@ -1423,7 +1423,7 @@ 
      * @param   string $recursion
      * @return  bool
      */
-    abstract public function delete(bool $force=false, ?string $recursion=null, bool $recursion_first=true): bool;
+    abstract public function delete(bool $force = false, ? string $recursion = null, bool $recursion_first = true) : bool;
 
 
     /**
@@ -1493,7 +1493,7 @@ 
      * @param  bool $recursion_first
      * @return bool
      */
-    public function save($attributes=[], $remove=[], ?string $recursion=null, bool $recursion_first=true): bool
+    public function save($attributes = [], $remove = [], ? string $recursion = null, bool $recursion_first = true) : bool
     {
         if (!$this->isAllowed('w') && !$this->isReference()) {
             throw new Exception\Forbidden('not allowed to modify node '.$this->name,
@@ -1526,7 +1526,7 @@ 
             if (empty($update)) {
                 return false;
             } else {
-                $result =$this->_db->storage->updateOne([
+                $result = $this->_db->storage->updateOne([
                     '_id' => $this->_id,
                 ], $update);
             }
@@ -1562,11 +1562,11 @@ 
      * @return  array
      */
     public static function loadNodeAttributesWithCustomFilter(
-        ?array $filter = null,
+        ? array $filter = null,
         array $attributes = ['_id'],
-        ?int $limit = null,
-        ?int &$cursor = null,
-        ?bool &$has_more = null)
+        ? int $limit = null,
+        ? int&$cursor = null,
+        ? bool&$has_more = null)
     {
         $default = [
             '_id'       => 1,
@@ -1578,7 +1578,7 @@ 
 
         $search_attributes = array_merge($default, array_fill_keys($attributes, 1));
         $list   = [];
-        $result =$this->_db->storage->find($filter, [
+        $result = $this->_db->storage->find($filter, [
             'skip'      => $cursor,
             'limit'     => $limit,
             'projection'=> $search_attributes

src/lib/Balloon/Filesystem/Node/File.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -47,14 +47,14 @@ 
      * @param array
      **/
     protected $temp_files = [
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
+        '/^\._(.*)$/', // OS/X resource forks
+        '/^.DS_Store$/', // OS/X custom folder settings
         '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swpx$/',  // ViM temporary files
-        '/^.(.*).swx$/',   // ViM temporary files
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
+        '/^Thumbs.db$/', // Windows thumbnail cache
+        '/^.(.*).swpx$/', // ViM temporary files
+        '/^.(.*).swx$/', // ViM temporary files
+        '/^.(.*).swp$/', // ViM temporary files
+        '/^\.dat(.*)$/', // Smultron seems to create these
         '/^~lock.(.*)#$/', // Windows 7 lockfiles
     ];
 
@@ -159,7 +159,7 @@ 
      * @param  bool $recursion_first
      * @return INode
      */
-    public function copyTo(Collection $parent, int $conflict=INode::CONFLICT_NOACTION, ?string $recursion=null, bool $recursion_first=true): INode
+    public function copyTo(Collection $parent, int $conflict = INode::CONFLICT_NOACTION, ? string $recursion = null, bool $recursion_first = true) : INode
     {
         $this->_pluginmgr->run('preCopyFile',
             [$this, $parent, &$conflict, &$recursion, &$recursion_first]
@@ -316,7 +316,7 @@ 
      * @param   bool $recursion_first
      * @return  bool
      */
-    public function delete(bool $force=false, ?string $recursion=null, bool $recursion_first=true): bool
+    public function delete(bool $force = false, ? string $recursion = null, bool $recursion_first = true) : bool
     {
         if (!$this->isAllowed('w')) {
             throw new Exception\Forbidden('not allowed to delete node '.$this->name,
@@ -339,7 +339,7 @@ 
         }
 
         $ts = new UTCDateTime();
-        $this->deleted  = $ts;
+        $this->deleted = $ts;
         $this->increaseVersion();
         
         $this->history[] = [
@@ -434,7 +434,7 @@ 
                     return true;
                 }
 
-                $ref  = $file['metadata']['ref'];
+                $ref = $file['metadata']['ref'];
                 
                 $found = false;
                 foreach ($ref as $key => $node) {
@@ -573,7 +573,7 @@ 
      * @param  string|array $attribute
      * @return array|string
      */
-    public function getAttribute($attribute=[])
+    public function getAttribute($attribute = [])
     {
         if (empty($attribute)) {
             $attribute = [
@@ -892,8 +892,8 @@ 
     {
         assert(strlen($data) == 16);
 
-        $data[6] = chr(ord($data[6]) & 0x0f | 0x40); // set version to 0100
-        $data[8] = chr(ord($data[8]) & 0x3f | 0x80); // set bits 6-7 to 10
+        $data[6] = chr(ord($data[6])&0x0f|0x40); // set version to 0100
+        $data[8] = chr(ord($data[8])&0x3f|0x80); // set bits 6-7 to 10
 
         return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
     }
@@ -917,7 +917,7 @@ 
      * @param   array $attributes
      * @return  int
      */
-    public function put($file, bool $new=false, array $attributes=[]): int
+    public function put($file, bool $new = false, array $attributes = []): int
     {
         $this->_logger->debug('PUT new content data for ['.$this->_id.']', [
             'category' => get_class($this),
@@ -968,7 +968,7 @@ 
                 );
             }
 
-            $file  = $tmp_file;
+            $file = $tmp_file;
         }
         
        
@@ -1036,7 +1036,7 @@ 
             $this->mime = $attributes['mime'];
         } elseif ($file !== null) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
-            $this->mime  = finfo_file($finfo, $file);
+            $this->mime = finfo_file($finfo, $file);
             if ($this->mime == 'application/zip' || $this->mime == 'application/vnd.ms-office') {
                 $this->mime = $this->getMimeTypeFromExtension($this->name);
             }
@@ -1129,7 +1129,7 @@ 
      * @param  string $db mimetypes
      * @return string
      */
-    public function getMimeTypeFromExtension(string $filename, string $db='/etc/mime.types'): string
+    public function getMimeTypeFromExtension(string $filename, string $db = '/etc/mime.types'): string
     {
         if (!is_readable($db)) {
             throw new Exception('mime database '.$db.' was not found or is not readable');
@@ -1146,7 +1146,7 @@ 
             if (substr($line, 0, 1) == '#') {
                 continue;
             } // skip comments
-            $line = rtrim($line) . " ";
+            $line = rtrim($line)." ";
             if (!preg_match($regex, $line, $matches)) {
                 continue;
             } // no match to the extension