gyselroth / balloon

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

Indentation +7 added lines, -7 removed lines

@@ -184,7 +184,7 @@ 
                 'changed' => $this->changed,
                 'deleted' => $this->deleted,
                 'thumbnail' => $this->thumbnail,
-		'meta' => $this->meta
+        'meta' => $this->meta
             ], INode::CONFLICT_NOACTION, true);
         }
 
@@ -210,7 +210,7 @@ 
             $v = (array)$version;
 
             $v['user'] = (new User($version['user'], $this->_logger, $this->_fs))
-              ->getUsername();
+                ->getUsername();
             $v['changed'] = Helper::DateTimeToUnix($version['changed']);
             $filtered[] = $v;
         }
@@ -602,15 +602,15 @@ 
         $build = [];
         foreach ($requested as $key => $attr) {
             switch ($attr) {
-               case 'hash':
+                case 'hash':
                case 'version':
                case 'thumbnail':
                    $build[$attr] = $this->{$attr};
-               break;
+                break;
             
-               case 'history':
+                case 'history':
                    $build['history'] = $this->getHistory();
-               break;
+                break;
             }
         }
 
@@ -875,7 +875,7 @@ 
             //somehow mongo-connector does not catch metadata when set during uploadFromStream()
             $stream = $bucket->uploadFromStream($id, $contents, ['_id' => $id/*, 'metadata' => $file*/]);
             $this->_db->{'fs.files'}->updateOne(['_id' => $id], [
-              '$set' => ['metadata'=> $file]
+                '$set' => ['metadata'=> $file]
             ]);
             
             $this->_logger->info('added new gridfs content node ['.$id.'] for file ['.$this->_id.']', [

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

Indentation +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
                 'changed' => $this->changed,
                 'deleted' => $this->deleted,
                 'filter'  => $this->filter,
-		'meta' => $this->meta
+        'meta' => $this->meta
             ], INode::CONFLICT_NOACTION, true);
         }
 
@@ -899,7 +899,7 @@ 
                 'category' => get_class($this),
             ]);
             
-	    if(!$this->isRoot()) {
+        if(!$this->isRoot()) {
                 $this->changed = $save['changed'];
                 $this->save('changed');
             }            

Spacing +23 added lines, -23 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;
@@ -200,7 +200,7 @@ 
      * @param  array|string $attribute
      * @return array|string
      */
-    public function getAttribute($attribute=[])
+    public function getAttribute($attribute = [])
     {
         if (empty($attribute)) {
             $attribute = [
@@ -246,7 +246,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();
@@ -298,7 +298,7 @@ 
         }
         
         if (!empty($this->filter)) {
-            if(is_string($this->filter)) {
+            if (is_string($this->filter)) {
                 $filter = json_decode($this->filter, true);
             } else {
                 $filter = $this->filter;
@@ -323,7 +323,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));
     }
@@ -394,7 +394,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)
@@ -463,7 +463,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__);
@@ -490,7 +490,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,
@@ -553,7 +553,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', [
@@ -605,7 +605,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(),
@@ -739,7 +739,7 @@ 
         }
 
         $this->shared = false;
-        $this->acl   = null;
+        $this->acl = null;
         $action = [
             '$unset' => [
                 'shared' => $this->_id
@@ -799,7 +799,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([
@@ -843,7 +843,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',
@@ -890,7 +890,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();
@@ -899,7 +899,7 @@ 
                 'category' => get_class($this),
             ]);
             
-	    if(!$this->isRoot()) {
+	    if (!$this->isRoot()) {
                 $this->changed = $save['changed'];
                 $this->save('changed');
             }            
@@ -928,7 +928,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',
@@ -978,7 +978,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();
@@ -987,7 +987,7 @@ 
                 'category' => get_class($this),
             ]);
 
-            if(!$this->isRoot()) {
+            if (!$this->isRoot()) {
                 $this->changed = $save['changed'];
                 $this->save('changed');
             }            
@@ -1033,7 +1033,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.php

Indentation +10 added lines, -10 removed lines

@@ -204,14 +204,14 @@ 
      *
      * @return Delta
      */
-     public function getDelta(): Delta
-     {
-         if ($this->delta instanceof Delta) {
-             return $this->delta;
-         }
+        public function getDelta(): Delta
+        {
+            if ($this->delta instanceof Delta) {
+                return $this->delta;
+            }
  
-         return $this->delta = new Delta($this);
-     }
+            return $this->delta = new Delta($this);
+        }
 
     
     /**
@@ -579,8 +579,8 @@ 
     protected function _searchElastic(array $query, array $shares): array
     {
         $client = \Elasticsearch\ClientBuilder::create()
-                   ->setHosts((array)$this->config->search->hosts->server)
-                   ->build();
+                    ->setHosts((array)$this->config->search->hosts->server)
+                    ->build();
 
         $bool =  $query['body']['query'];
 
@@ -775,7 +775,7 @@ 
     {
         $list   = [];
         
-	$result =$this->db->storage->find($filter, [
+    $result =$this->db->storage->find($filter, [
             'skip'      => $cursor,
             'limit'     => $limit,
         ]);

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Balloon
@@ -295,7 +295,7 @@ 
      * @param   int $deleted
      * @return  INode
      */
-    public function findNodeWithId($id, ?string $class=null, int $deleted=INode::DELETED_INCLUDE): INode
+    public function findNodeWithId($id, ?string $class = null, int $deleted = INode::DELETED_INCLUDE) : INode
     {
         if (!is_string($id) && !($id instanceof ObjectID)) {
             throw new Exception\InvalidArgument($id.' node id has to be a string or instance of \MongoDB\BSON\ObjectID');
@@ -353,13 +353,13 @@ 
      * @param   string $class Fore check node type
      * @return  INode
      */
-    public function findNodeWithPath(string $path='', ?string $class=null): INode
+    public function findNodeWithPath(string $path = '', ?string $class = null) : INode
     {
         if (empty($path) || $path[0] != '/') {
             $path = '/'.$path;
         }
         
-        $last = strlen($path)-1;
+        $last = strlen($path) - 1;
         if ($path[$last] == '/') {
             $path = substr($path, 0, -1);
         }
@@ -390,7 +390,7 @@ 
      * @param   string $class Fore check node type
      * @return  INode
      */
-    public function findNodeWithShareToken(string $token, ?string $class=null): INode
+    public function findNodeWithShareToken(string $token, ?string $class = null) : INode
     {
         $node = $this->db->storage->findOne([
             'sharelink.token' => $token,
@@ -434,7 +434,7 @@ 
      * @param   bool $deleted
      * @return  Generator
      */
-    public function findNodes(array $id=[], ?string $class=null, int $deleted=INode::DELETED_INCLUDE): Generator
+    public function findNodes(array $id = [], ?string $class = null, int $deleted = INode::DELETED_INCLUDE) : Generator
     {
         $id = (array)$id;
 
@@ -488,7 +488,7 @@ 
      * @param   int $deleted
      * @return  array
      */
-    public function search(array $query, int $deleted=INode::DELETED_INCLUDE): array
+    public function search(array $query, int $deleted = INode::DELETED_INCLUDE): array
     {
         if ($this->user instanceof User) {
             $this->user->findNewShares();
@@ -582,7 +582,7 @@ 
                    ->setHosts((array)$this->config->search->hosts->server)
                    ->build();
 
-        $bool =  $query['body']['query'];
+        $bool = $query['body']['query'];
 
         $filter1 = [];
         $filter1['bool']['should'][]['term']['owner'] = (string)$this->user->getId();
@@ -650,7 +650,7 @@ 
      * @param   bool $deleted How to handle deleted node
      * @return  INode
      */
-    public function getNode($id=null, $path=null, $class=null, $multiple=false, $allow_root=false, $deleted=null)
+    public function getNode($id = null, $path = null, $class = null, $multiple = false, $allow_root = false, $deleted = null)
     {
         if (empty($id) && empty($path)) {
             if ($allow_root === true) {
@@ -766,21 +766,21 @@ 
      * @return  array
      */
     public function findNodeAttributesWithCustomFilter(
-        ?array $filter = null,
+        ? array $filter = null,
         array $attributes = ['_id'],
         ?int $limit = null,
         ?int &$cursor = null,
         ?bool &$has_more = null,
         ?INode $parent = null)
     {
-        $list   = [];
+        $list = [];
         
-	$result =$this->db->storage->find($filter, [
+	$result = $this->db->storage->find($filter, [
             'skip'      => $cursor,
             'limit'     => $limit,
         ]);
         
-        $left =$this->db->storage->count($filter, [
+        $left = $this->db->storage->count($filter, [
             'skip' => $cursor,
         ]);