gyselroth / balloon

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

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -73,7 +73,7 @@ 
      * @param  bool $force
      * @return void
      */
-    public function __construct(?BSONDocument $node, Filesystem $fs, bool $force=false)
+    public function __construct(?BSONDocument $node, Filesystem $fs, bool $force = false)
     {
         parent::__construct($node, $fs);
         
@@ -81,11 +81,11 @@ 
             $this->_id = null;
 
             if ($this->_user instanceof User) {
-                $this->owner  = $this->_user->getId();
+                $this->owner = $this->_user->getId();
             }
         }
             
-        if($force === false) {
+        if ($force === false) {
             $this->_verifyAccess();
         }
     }
@@ -100,7 +100,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
     {
         if ($recursion === null) {
             $recursion_first = true;
@@ -199,7 +199,7 @@ 
      * @param  array|string $attribute
      * @return array|string
      */
-    public function getAttribute($attribute=[])
+    public function getAttribute($attribute = [])
     {
         if (empty($attribute)) {
             $attribute = [
@@ -245,7 +245,7 @@ 
      * @param   array $filter
      * @return  Generator
      */
-    public function getChildNodes(int $deleted=INode::DELETED_EXCLUDE, array $filter=[]): Generator
+    public function getChildNodes(int $deleted = INode::DELETED_EXCLUDE, array $filter = []): Generator
     {
         if ($this->_user instanceof User) {
             $this->_user->findNewShares();
@@ -316,7 +316,7 @@ 
      * @param   array $filter
      * @return  Generator
      */
-    public function getChildren(int $deleted=INode::DELETED_EXCLUDE, array $filter=[]): array
+    public function getChildren(int $deleted = INode::DELETED_EXCLUDE, array $filter = []): array
     {
         return iterator_to_array($this->getChildNodes($deleted, $filter));
     }
@@ -387,7 +387,7 @@ 
      * @param  array $filter
      * @return INode
      */
-    public function getChild($node, int $deleted=INode::DELETED_EXCLUDE, array $filter=[]): INode
+    public function getChild($node, int $deleted = INode::DELETED_EXCLUDE, array $filter = []): INode
     {
         //if $node is string load the object from the backend based on the current parent (the name
         //is unique per depth, so we can load the object)
@@ -456,7 +456,7 @@ 
      * @param   int $deleted
      * @return  bool
      */
-    protected function doRecursiveAction(string $method, array $params=[], int $deleted=INode::DELETED_EXCLUDE): bool
+    protected function doRecursiveAction(string $method, array $params = [], int $deleted = INode::DELETED_EXCLUDE): bool
     {
         if (!is_callable([$this, $method])) {
             throw new Exception("method $method is not callable in ".__CLASS__);
@@ -483,7 +483,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') && !$this->isReference()) {
             throw new Exception\Forbidden('not allowed to delete node '.$this->name,
@@ -546,7 +546,7 @@ 
      * @param   bool $recursion_first
      * @return  bool
      */
-    protected function _forceDelete(?string $recursion=null, bool $recursion_first=true): bool
+    protected function _forceDelete(?string $recursion = null, bool $recursion_first = true) : bool
     {
         if (!$this->isReference()) {
             $this->doRecursiveAction('delete', [
@@ -598,7 +598,7 @@ 
      * @param   array $filter
      * @return  bool
      */
-    public function childExists($name, $deleted=INode::DELETED_EXCLUDE, array $filter=[]): bool
+    public function childExists($name, $deleted = INode::DELETED_EXCLUDE, array $filter = []): bool
     {
         $find = [
             'parent'  => $this->getRealId(),
@@ -732,7 +732,7 @@ 
         }
 
         $this->shared = false;
-        $this->acl   = null;
+        $this->acl = null;
         $action = [
             '$unset' => [
                 'shared' => $this->_id
@@ -792,7 +792,7 @@ 
      * @param   arary $files
      * @return  array
      */
-    public function getChildrenRecursive(?ObjectId $id=null, ?array &$shares=[], ?array &$files=[]): array
+    public function getChildrenRecursive(?ObjectId $id = null, ? array &$shares = [], ? array &$files = []) : array
     {
         $list = [];
         $result = $this->_db->storage->find([
@@ -836,7 +836,7 @@ 
      * @param   bool $clone
      * @return  Collection
      */
-    public function addDirectory($name, array $attributes=[], int $conflict=INode::CONFLICT_NOACTION, bool $clone=false): Collection
+    public function addDirectory($name, array $attributes = [], int $conflict = INode::CONFLICT_NOACTION, bool $clone = false): Collection
     {
         if (!$this->isAllowed('w')) {
             throw new Exception\Forbidden('not allowed to create new node here',
@@ -883,7 +883,7 @@ 
                 'shared'    => ($this->shared === true ? $this->getRealId() : $this->shared)
             ];
 
-            $save  = array_merge($meta, $attributes);
+            $save = array_merge($meta, $attributes);
 
             $result = $this->_db->storage->insertOne($save);
             $save['_id'] = $result->getInsertedId();
@@ -916,7 +916,7 @@ 
      * @param   bool $clone
      * @return  File
      */
-    public function addFile($name, $data=null, array $attributes=[], int $conflict=INode::CONFLICT_NOACTION, bool $clone=false): File
+    public function addFile($name, $data = null, array $attributes = [], int $conflict = INode::CONFLICT_NOACTION, bool $clone = false): File
     {
         if (!$this->isAllowed('w')) {
             throw new Exception\Forbidden('not allowed to create new node here',
@@ -966,7 +966,7 @@ 
                 'shared'    => ($this->shared === true ? $this->getRealId() : $this->shared),
             ];
 
-            $save  = array_merge($meta, $attributes);
+            $save = array_merge($meta, $attributes);
 
             $result = $this->_db->storage->insertOne($save);
             $save['_id'] = $result->getInsertedId();
@@ -1016,7 +1016,7 @@ 
      * @param   string $data
      * @return  File
      */
-    public function createFile($name, $data=null): String
+    public function createFile($name, $data = null): String
     {
         return $this->addFile($name, $data)->getETag();
     }

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

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -222,7 +222,7 @@ 
      * @param  bool $force
      * @return void
      */
-    public function __construct(?BSONDocument $node, Filesystem $fs, bool $force=false)
+    public function __construct(?BSONDocument $node, Filesystem $fs, bool $force = false)
     {
         $this->_fs         = $fs;
         $this->_db         = $fs->getDatabase();
@@ -270,7 +270,7 @@ 
      *
      * @return mixed
      */
-    public function __call(string $attribute, array $params=[])
+    public function __call(string $attribute, array $params = [])
     {
         $prefix = 'get';
         $attr = strtolower(substr($attribute, 3));
@@ -315,7 +315,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',
@@ -390,7 +390,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;
 
 
     /**
@@ -399,7 +399,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;
@@ -595,7 +595,7 @@ 
      * @param   string $privilege
      * @return  bool
      */
-    public function isAllowed(string $privilege='r'): bool
+    public function isAllowed(string $privilege = 'r'): bool
     {
         $acl   = null;
         $share = null;
@@ -789,7 +789,7 @@ 
             $clean[] = 'meta';
         }
         
-        $attribute  = $clean;
+        $attribute = $clean;
 
         try {
             $sharenode  = $this->getShareNode();
@@ -919,7 +919,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;
@@ -928,7 +928,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).')';
@@ -948,7 +948,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,
@@ -988,7 +988,7 @@ 
             $recursion_first = false;
         }
 
-        $this->deleted  = false;
+        $this->deleted = false;
         
         if ($this instanceof File) {
             $current = $this->version;
@@ -1142,7 +1142,7 @@ 
      *
      * @return ObjectId|string
      */
-    public function getId(bool $string=false)
+    public function getId(bool $string = false)
     {
         if ($string === true) {
             return (string)$this->_id;
@@ -1192,7 +1192,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;
@@ -1259,7 +1259,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;
@@ -1321,7 +1321,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');
@@ -1337,7 +1337,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 = [
@@ -1368,7 +1368,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])) {
@@ -1388,7 +1388,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');
@@ -1401,7 +1401,7 @@ 
      * @param   UTCDateTime $ts
      * @return  bool
      */
-    public function setDestroyable(?UTCDateTime $ts): bool
+    public function setDestroyable(?UTCDateTime $ts) : bool
     {
         $this->destroy = $ts;
         
@@ -1424,7 +1424,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;
 
 
     /**
@@ -1494,7 +1494,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,
@@ -1527,7 +1527,7 @@ 
             if (empty($update)) {
                 return false;
             } else {
-                $result =$this->_db->storage->updateOne([
+                $result = $this->_db->storage->updateOne([
                     '_id' => $this->_id,
                 ], $update);
             }
@@ -1563,7 +1563,7 @@ 
      * @return  array
      */
     public static function loadNodeAttributesWithCustomFilter(
-        ?array $filter = null,
+        ? array $filter = null,
         array $attributes = ['_id'],
         ?int $limit = null,
         ?int &$cursor = null,
@@ -1579,7 +1579,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 +23 added lines, -23 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
     ];
 
@@ -123,11 +123,11 @@ 
      * @param   bool $force
      * @return  void
      */
-    public function __construct(BSONDocument $node, Filesystem $fs, bool $force=false)
+    public function __construct(BSONDocument $node, Filesystem $fs, bool $force = false)
     {
         parent::__construct($node, $fs);
 
-        if($force === false) {
+        if ($force === false) {
             $this->_verifyAccess();
         }
     }
@@ -163,7 +163,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]
@@ -320,7 +320,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,
@@ -343,7 +343,7 @@ 
         }
 
         $ts = new UTCDateTime();
-        $this->deleted  = $ts;
+        $this->deleted = $ts;
         $this->increaseVersion();
         
         $this->history[] = [
@@ -438,7 +438,7 @@ 
                     return true;
                 }
 
-                $ref  = $file['metadata']['ref'];
+                $ref = $file['metadata']['ref'];
                 
                 $found = false;
                 foreach ($ref as $key => $node) {
@@ -577,7 +577,7 @@ 
      * @param  string|array $attribute
      * @return array|string
      */
-    public function getAttribute($attribute=[])
+    public function getAttribute($attribute = [])
     {
         if (empty($attribute)) {
             $attribute = [
@@ -896,8 +896,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));
     }
@@ -921,7 +921,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),
@@ -972,7 +972,7 @@ 
                 );
             }
 
-            $file  = $tmp_file;
+            $file = $tmp_file;
         }
         
        
@@ -1040,10 +1040,10 @@ 
             $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') {
                 $mime = $this->getMimeTypeFromExtension($this->name);
-                if($mime !== null) {
+                if ($mime !== null) {
                     $this->mime = $mime;
                 }
             }
@@ -1136,7 +1136,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');
@@ -1153,7 +1153,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

src/lib/Balloon/Rest/v1/File.php

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -55,7 +55,7 @@ 
      * @param  string $encode
      * @return void
      */
-    public function getPreview(?string $id=null, ?string $p=null, ?string $encode=null): void
+    public function getPreview(?string $id = null, ?string $p = null, ?string $encode = null) : void
     {
         $node = $this->_getNode($id, $p);
         $data = $node->getPreview();
@@ -128,7 +128,7 @@ 
      * @param  string $p
      * @return Response
      */
-    public function getHistory(?string $id=null, ?string $p=null): Response
+    public function getHistory(?string $id = null, ?string $p = null) : Response
     {
         $result = Helper::escape(
             $this->_getNode($id, $p)->getHistory()
@@ -161,7 +161,7 @@ 
      * @param   string $version
      * @return  Response
      */
-    public function postRestore(int $version, ?string $id=null, ?string $p=null): Response
+    public function postRestore(int $version, ?string $id = null, ?string $p = null) : Response
     {
         $result = $this->_getNode($id, $p)->restore($version);
         return (new Response())->setCode(204);
@@ -297,15 +297,15 @@ 
      */
     public function putChunk(
         string $chunkgroup,
-        ?string $id=null,
-        ?string $p=null,
-        ?string $collection=null,
-        ?string $name=null,
-        int $index=1,
-        int $chunks=0,
-        int $size=0,
-        array $attributes=[],
-        int $conflict=0)
+        ?string $id = null,
+        ?string $p = null,
+        ?string $collection = null,
+        ?string $name = null,
+        int $index = 1,
+        int $chunks = 0,
+        int $size = 0,
+        array $attributes = [],
+        int $conflict = 0)
     {
         ini_set('auto_detect_line_endings', '1');
         $input_handler = fopen('php://input', 'rb');
@@ -464,12 +464,12 @@ 
      * @return Response
      */
     public function put(
-        ?string $id=null,
-        ?string $p=null,
-        ?string $collection=null,
-        ?string $name=null,
-        array $attributes=[],
-        int $conflict=0): Response
+        ?string $id = null,
+        ?string $p = null,
+        ?string $collection = null,
+        ?string $name = null,
+        array $attributes = [],
+        int $conflict = 0) : Response
     {
         $attributes = $this->_verifyAttributes($attributes);
 
@@ -493,12 +493,12 @@ 
      */
     protected function _put(
         $content,
-        ?string $id=null,
-        ?string $p=null,
-        ?string $collection=null,
-        ?string $name=null,
-        array $attributes=[],
-        int $conflict=0): Response
+        ?string $id = null,
+        ?string $p = null,
+        ?string $collection = null,
+        ?string $name = null,
+        array $attributes = [],
+        int $conflict = 0) : Response
     {
         if ($id === null && $p === null && $name === null) {
             throw new Exception\InvalidArgument('neither id, p nor name was set');
@@ -518,7 +518,7 @@ 
                 $result = $node->put($content, false, $attributes);
                 return (new Response())->setCode(200)->setBody($result);
             } elseif ($p === null && $id === null && $name !== null) {
-                $collection =  $this->_getNode($collection, null, 'Collection', false, true);
+                $collection = $this->_getNode($collection, null, 'Collection', false, true);
 
                 if ($collection->childExists($name)) {
                     $child = $collection->getChild($name);
@@ -534,7 +534,7 @@ 
                     return (new Response())->setCode(201)->setBody($result);
                 }
             }
-        } catch(Exception\Forbidden $e) {
+        } catch (Exception\Forbidden $e) {
             throw new Exception\Conflict('a node called '.$name.' does already exists in this collection',
                 Exception\Conflict::NODE_WITH_SAME_NAME_ALREADY_EXISTS
             );