Ariadne-CMS / arc-store

src/store/PSQLStore.php

Spacing +13 added lines, -13 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function cd($path)
     {
-        return new self( $this->db, $this->queryParser, $this->resultHandler, \arc\path::collapse($path, $this->path) );
+        return new self($this->db, $this->queryParser, $this->resultHandler, \arc\path::collapse($path, $this->path));
     }
 
     /**
@@ -42,11 +42,11 @@ 
      * @param string $path
      * @return mixed
      */
-    public function find($query, $path='')
+    public function find($query, $path = '')
     {
         $path = \arc\path::collapse($path, $this->path);
         $sql  = $this->queryParser->parse($query, $path);
-        return ($this->resultHandler)( $sql, [] );
+        return ($this->resultHandler)($sql, []);
     }
 
     /**
@@ -54,7 +54,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function get($path='')
+    public function get($path = '')
     {
         $path   = \arc\path::collapse($path, $this->path);
         $parent = ($path=='/' ? '' : \arc\path::parent($path));
@@ -75,9 +75,9 @@ 
      * @param string $top
      * @return mixed
      */
-    public function parents($path='', $top='/')
+    public function parents($path = '', $top = '/')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return ($this->resultHandler)(
             /** @lang sql */
             'lower(path)=lower(substring(:path,1,length(path))) '
@@ -91,9 +91,9 @@ 
      * @param string $path
      * @return mixed
      */
-    public function ls($path='')
+    public function ls($path = '')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return ($this->resultHandler)('parent=:path', [':path' => $path]);
     }
 
@@ -102,7 +102,7 @@ 
      * @param string $path
      * @return bool
      */
-    public function exists($path='')
+    public function exists($path = '')
     {
         $path   = \arc\path::collapse($path, $this->path);
         $query  = $this->db->prepare('select count(*) from nodes where path=:path');
@@ -116,7 +116,7 @@ 
      */
     public function initialize() {
         try {
-            if ($result=$this->exists('/')) {
+            if ($result = $this->exists('/')) {
                 return false;
             }
         } catch (\PDOException $e) {
@@ -151,7 +151,7 @@ 
 SQL;
         $queries[] = "create index link_from on links(from_id);";
         $queries[] = "create index link_to on links(to_id);";
-        foreach ( $queries as $query ) {
+        foreach ($queries as $query) {
             $result = $this->db->exec($query);
             if ($result===false) {
                 $this->db->exec('rollback;');
@@ -162,7 +162,7 @@ 
 
         return $this->save(\arc\prototype::create([
             'name' => 'Root'
-        ]),'/');
+        ]), '/');
     }
 
     /**
@@ -171,7 +171,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function save($data, $path='') {
+    public function save($data, $path = '') {
         $path   = \arc\path::collapse($path, $this->path);
         $parent = ($path=='/' ? '' : \arc\path::parent($path));
         if ($path!='/' && !$this->exists($parent)) {

src/store/PSQLQueryParser.php

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 
 final class PSQLQueryParser {
 	
-	private $tokenizer;
+    private $tokenizer;
 
-	public function __construct($tokenizer) {
-		$this->tokenizer = $tokenizer;
-	}
+    public function __construct($tokenizer) {
+        $this->tokenizer = $tokenizer;
+    }
 
     /**
      * @param string $query

Spacing +15 added lines, -15 removed lines

@@ -21,14 +21,14 @@ 
         $sql      = [];
         $position = 0;
         $expect   = 'name|parenthesis_open|not';
-        foreach( call_user_func($this->tokenizer, $query) as $token ) {
+        foreach (call_user_func($this->tokenizer, $query) as $token) {
             $tokenType = key($token);
-            list($tokenValue, $offset)=$token[$tokenType];
-            if ( !preg_match("/^$expect$/",$tokenType) ) {
+            list($tokenValue, $offset) = $token[$tokenType];
+            if (!preg_match("/^$expect$/", $tokenType)) {
                 throw new \LogicException('Parse error at '.$position.': expected '.$expect.', got '.$tokenType.': '
-                    .(substr($query,0, $position)." --> ".substr($query,$position)) );
+                    .(substr($query, 0, $position)." --> ".substr($query, $position)));
             }
-            switch($tokenType) {
+            switch ($tokenType) {
                 case 'number':
                 case 'string':
                     $sql[]  = $tokenValue;
@@ -44,13 +44,13 @@ 
                             $sql[] = $tokenValue;
                         break;
                         default:
-                            $sql[] = "nodes.data #>> '{".str_replace('.',',',$tokenValue)."}'";
+                            $sql[] = "nodes.data #>> '{".str_replace('.', ',', $tokenValue)."}'";
                         break;
                     }
                     $expect = 'compare';
                 break;
                 case 'compare':
-                    switch( $tokenValue ) {
+                    switch ($tokenValue) {
                         case '>':
                         case '>=':
                         case '<':
@@ -61,9 +61,9 @@ 
                             $sql[] = $tokenValue;
                         break;
                         case '?':
-                            $part  = $sql[count($sql)-1];
+                            $part  = $sql[count($sql) - 1];
                             $part  = str_replace('#>>', '#>', $part);
-                            $sql[count($sql)-1] = $part;
+                            $sql[count($sql) - 1] = $part;
                             $sql[] = $tokenValue;                            
                         break;
                         case '~=':
@@ -91,7 +91,7 @@ 
                 case 'parenthesis_close':
                     $sql[]  = $tokenValue;
                     $indent--;
-                    if ( $indent>0 ) {
+                    if ($indent>0) {
                         $expect = 'operator|parenthesis_close';
                     } else {
                         $expect = 'operator';
@@ -100,21 +100,21 @@ 
             }
             $position += $offset + strlen($tokenValue);
         }
-        if ( $indent!=0 ) {
+        if ($indent!=0) {
             throw new \LogicException('unbalanced parenthesis');
         }
         if ($position<strlen($query)) {
             throw new \LogicException('Parse error at '.$position.': unrecognized token: '
-            .(substr($query,0, $position)." --> ".substr($query,$position)) );
+            .(substr($query, 0, $position)." --> ".substr($query, $position)));
         }
-        foreach(['number','string','compare'] as $tokenType) {
+        foreach (['number', 'string', 'compare'] as $tokenType) {
             if (strpos($expect, $tokenType)!==false) {
                 throw new \LogicException('Parse error at '.$position.': expected '.$expect.': '
-                .(substr($query,0, $position)." --> ".substr($query,$position)) );
+                .(substr($query, 0, $position)." --> ".substr($query, $position)));
 
             }
         }
-        return implode(' ',$sql);
+        return implode(' ', $sql);
     }
 
 }

src/store/MySQLQueryParser.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 
     private $tokenizer;
 
-	public function __construct($tokenizer) {
-		$this->tokenizer = $tokenizer;
-	}
+    public function __construct($tokenizer) {
+        $this->tokenizer = $tokenizer;
+    }
 
     /**
      * @param string $query

Spacing +15 added lines, -15 removed lines

@@ -22,14 +22,14 @@ 
         $position = 0;
         $expect   = 'name|parenthesis_open|not';
         
-        foreach( call_user_func($this->tokenizer, $query) as $token ) {
+        foreach (call_user_func($this->tokenizer, $query) as $token) {
             $tokenType = key($token);
-            list($tokenValue, $offset)=$token[$tokenType];
-            if ( !preg_match("/^$expect$/",$tokenType) ) {
+            list($tokenValue, $offset) = $token[$tokenType];
+            if (!preg_match("/^$expect$/", $tokenType)) {
                 throw new \LogicException('Parse error at '.$position.': expected '.$expect.', got '.$tokenType.': '
-                    .(substr($query,0, $position)." --> ".substr($query,$position)) );
+                    .(substr($query, 0, $position)." --> ".substr($query, $position)));
             }
-            switch($tokenType) {
+            switch ($tokenType) {
                 case 'number':
                 case 'string':
                     $sql[]  = $tokenValue;
@@ -51,7 +51,7 @@ 
                     $expect = 'compare';
                 break;
                 case 'compare':
-                    switch( $tokenValue ) {
+                    switch ($tokenValue) {
                         case '>':
                         case '>=':
                         case '<':
@@ -59,12 +59,12 @@ 
                         case '=':
                         case '<>':
                         case '!=':
-                            $sql[] =$tokenValue;
+                            $sql[] = $tokenValue;
                         break;
                         case '?':
-                            $part  = $sql[count($sql)-1];
+                            $part  = $sql[count($sql) - 1];
                             $part  = str_replace('->>', '->', $part);
-                            $sql[count($sql)-1] = $part;
+                            $sql[count($sql) - 1] = $part;
                             $sql[] = 'IS NOT NULL';
                         break;
                         case '~=':
@@ -92,7 +92,7 @@ 
                 case 'parenthesis_close':
                     $sql[]  = $tokenValue;
                     $indent--;
-                    if ( $indent>0 ) {
+                    if ($indent>0) {
                         $expect = 'operator|parenthesis_close';
                     } else {
                         $expect = 'operator';
@@ -101,21 +101,21 @@ 
             }
             $position += $offset + strlen($tokenValue);
         }
-        if ( $indent!=0 ) {
+        if ($indent!=0) {
             throw new \LogicException('unbalanced parenthesis');
         } 
         if ($position<strlen($query)) {
             throw new \LogicException('Parse error at '.$position.': unrecognized token: '
-            .(substr($query,0, $position)." --> ".substr($query,$position)) );
+            .(substr($query, 0, $position)." --> ".substr($query, $position)));
         }
-        foreach(['number','string','compare'] as $tokenType) {
+        foreach (['number', 'string', 'compare'] as $tokenType) {
             if (strpos($expect, $tokenType)!==false) {
                 throw new \LogicException('Parse error at '.$position.': expected '.$expect.': '
-                .(substr($query,0, $position)." --> ".substr($query,$position)) );
+                .(substr($query, 0, $position)." --> ".substr($query, $position)));
 
             }
         }
-        return implode(' ',$sql);
+        return implode(' ', $sql);
     }
 
 }

src/store/Store.php

Spacing +6 added lines, -6 removed lines

@@ -15,14 +15,14 @@ 
      * @param string $path
      * @return mixed
      */
-    public function find($query, $path='');
+    public function find($query, $path = '');
 
     /**
      * get a single object from the store by path
      * @param string $path
      * @return mixed
      */
-    public function get($path='');
+    public function get($path = '');
 
     /**
      * list all parents, including self, by path, starting from the root
@@ -30,21 +30,21 @@ 
      * @param string $top
      * @return mixed
      */
-    public function parents($path='', $top='/');
+    public function parents($path = '', $top = '/');
 
     /**
      * list all child objects by path
      * @param string $path
      * @return mixed
      */
-    public function ls($path='');
+    public function ls($path = '');
 
     /**
      * returns true if an object with the given path exists
      * @param string $path
      * @return bool
      */
-    public function exists($path='');
+    public function exists($path = '');
 
     /**
      * initialize the store, if it wasn't before
@@ -58,7 +58,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function save($data, $path='');
+    public function save($data, $path = '');
 
     /**
      * remove the object with the given path and all its children

src/store/ResultHandlers.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
                 $q = $db->prepare('select * from nodes where '.$query);
                 $result = $q->execute($args);
                 $dataset = [];
-                while ( $data = $q->fetch(\PDO::FETCH_ASSOC) ) {
+                while ($data = $q->fetch(\PDO::FETCH_ASSOC)) {
                     $value = (object) $data;
                     $value->data = json_decode($value->data);
                     $value->ctime = strtotime($value->ctime);

src/store/TreeQueryParser.php

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 
 final class TreeQueryParser {
 	
-	private $tokenizer;
+    private $tokenizer;
 
-	public function __construct($tokenizer) {
-		$this->tokenizer = $tokenizer;
-	}
+    public function __construct($tokenizer) {
+        $this->tokenizer = $tokenizer;
+    }
 
     /**
      * @param string $query

Spacing +17 added lines, -17 removed lines

@@ -24,14 +24,14 @@ 
         $position = 0;
         $expect   = 'name|parenthesis_open|not';
 
-        foreach( call_user_func($this->tokenizer, $query) as $token ) {
+        foreach (call_user_func($this->tokenizer, $query) as $token) {
             $type = key($token);
-            list($token, $offset)=$token[$type];
-            if ( !preg_match("/^$expect$/",$type) ) {
+            list($token, $offset) = $token[$type];
+            if (!preg_match("/^$expect$/", $type)) {
                 throw new \LogicException('Parse error at '.$position.': expected '.$expect.', got '.$type.': '
-                    .(substr($query,0, $position)." --> ".substr($query,$position)) );
+                    .(substr($query, 0, $position)." --> ".substr($query, $position)));
             }
-            switch($type) {
+            switch ($type) {
                 case 'number':
                 case 'string':
                     if (strpos($part, '{placeholder}')!==false) {
@@ -60,28 +60,28 @@ 
                             $part = '$node->nodeValue->ctime';
                         break;
                         default:
-                            $part = '$node->nodeValue->'.str_replace('.','->',$token);
+                            $part = '$node->nodeValue->'.str_replace('.', '->', $token);
                         break;
                     }
                     $expect = 'compare';
                 break;
                 case 'compare':
-                    switch( $token ) {
+                    switch ($token) {
                         case '>':
                         case '>=':
                         case '<':
                         case '<=':
                         case '!=':
-                            $part = '( '.$part. ' ?? null ) '.$token;
+                            $part = '( '.$part.' ?? null ) '.$token;
                         break;
                         case '<>':
-                            $part = '( '.$part. ' ?? null ) !=';
+                            $part = '( '.$part.' ?? null ) !=';
                         break;
                         case '=':
-                            $part = '( '.$part. ' ?? null ) ==';
+                            $part = '( '.$part.' ?? null ) ==';
                         break;
                         case '?':
-                            $part ='property_exists('.$part.' ?? null,{placeholder})';
+                            $part = 'property_exists('.$part.' ?? null,{placeholder})';
                         break;
                         case '~=':
                             $part = '$like('.$part.' ?? null,{placeholder})';
@@ -97,7 +97,7 @@ 
                     $expect = 'name|parenthesis_open';
                 break;
                 case 'operator':
-                    switch($token) {
+                    switch ($token) {
                         case 'and':
                             $fn[] = '&&';
                         break;
@@ -115,7 +115,7 @@ 
                 case 'parenthesis_close':
                     $fn[]   = $token;
                     $indent--;
-                    if ( $indent>0 ) {
+                    if ($indent>0) {
                         $expect = 'operator|parenthesis_close';
                     } else {
                         $expect = 'operator';
@@ -124,13 +124,13 @@ 
             }
             $position += $offset + strlen($token);
         }
-        if ( $indent!=0 ) {
+        if ($indent!=0) {
             throw new \LogicException('unbalanced parenthesis');
-        } else if ( trim($part) ) {
+        } else if (trim($part)) {
             $position -= strlen($token);
-            throw new \LogicException('parse error at '.$position.': '.(substr($query,0, $position)." --> ".substr($query,$position)));
+            throw new \LogicException('parse error at '.$position.': '.(substr($query, 0, $position)." --> ".substr($query, $position)));
         } else {
-            $fn = implode(' ',$fn);
+            $fn = implode(' ', $fn);
                 $like = function($haystack, $needle) {
                 $re = str_replace('%', '.*', $needle);
                 return preg_match('|'.$re.'|i', $haystack);

src/store/TreeStore.php

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function cd($path)
     {
-        return new self( $this->tree, $this->queryParser, $this->resultHandlerFactory, \arc\path::collapse($path, $this->path) );
+        return new self($this->tree, $this->queryParser, $this->resultHandlerFactory, \arc\path::collapse($path, $this->path));
     }
 
     /**
@@ -40,12 +40,12 @@ 
      * @param string $path
      * @return mixed
      */
-    public function find($query, $path='')
+    public function find($query, $path = '')
     {
         $path = \arc\path::collapse($path, $this->path);
         $root = $this->tree->cd($path);
         $f    = $this->queryParser->parse($query, $path);
-        return call_user_func($this->resultHandler, $f );
+        return call_user_func($this->resultHandler, $f);
     }
 
     /**
@@ -53,7 +53,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function get($path='')
+    public function get($path = '')
     {
         $path   = \arc\path::collapse($path, $this->path);
         $result = $this->tree->cd($path);
@@ -66,9 +66,9 @@ 
      * @param string $top
      * @return mixed
      */
-    public function parents($path='', $top='/')
+    public function parents($path = '', $top = '/')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return ($this->resultHandler)(
             'strtolower($node->path)==strtolower(substring("'
             .$path.'",1,'.sizeof($path)
@@ -81,11 +81,11 @@ 
      * @param string $path
      * @return mixed
      */
-    public function ls($path='')
+    public function ls($path = '')
     {
-        $path  = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return $this->tree->cd($path)->ls(function($node) {
-            return json_decode(json_encode($node->nodeValue),false);
+            return json_decode(json_encode($node->nodeValue), false);
         });
     }
 
@@ -94,9 +94,9 @@ 
      * @param string $path
      * @return bool
      */
-    public function exists($path='')
+    public function exists($path = '')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         if ($path!='/') {
             $parent = ($path=='/' ? '' : \arc\path::parent($path));
             $name   = basename($path);
@@ -112,7 +112,7 @@ 
     public function initialize() {
         return $this->save(\arc\prototype::create([
             'name' => 'Root'
-        ]),'/');
+        ]), '/');
     }
 
     /**
@@ -121,7 +121,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function save($data, $path='') {
+    public function save($data, $path = '') {
         $path   = \arc\path::collapse($path, $this->path);
         $parent = ($path=='/' ? '' : \arc\path::parent($path));
         if ($path!='/' && !$this->exists($parent)) {
@@ -156,8 +156,8 @@ 
     {
         return function($callback) use ($tree) {
             $dataset = \arc\tree::filter($tree, $callback);
-            foreach($dataset as $path => $node) {
-                $node = json_decode(json_encode($node),false);
+            foreach ($dataset as $path => $node) {
+                $node = json_decode(json_encode($node), false);
                 $dataset[$path] = $node;
             }
             return $dataset;

src/store.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
      * @param string $resultHandler handler that executes the sql query
      * @return store\Store the store
      */
-    public static function connect($dsn, $resultHandler=null)
+    public static function connect($dsn, $resultHandler = null)
     {
         $db = new \PDO($dsn);
         $db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
@@ -40,7 +40,7 @@ 
         $className = $storeType.'Store';
         $store = new $className(
             $db, 
-            new $queryParserClassName(array('\arc\store','tokenizer')), 
+            new $queryParserClassName(array('\arc\store', 'tokenizer')), 
             $resultHandler($db)
         );
 
@@ -184,8 +184,8 @@ 
                     ARRAY_FILTER_USE_BOTH
                 );
             }
-        } while($result);
-        if ( trim($query) ) {
+        } while ($result);
+        if (trim($query)) {
             throw new \LogicException('Could not parse '.$query);
         }
     }

src/store/MySQLStore.php

Spacing +14 added lines, -14 removed lines

@@ -20,7 +20,7 @@ 
      */
     public function __construct($db = null, $queryParser = null, $resultHandler = null, $path = '/')
     {
-        $this->db            = $db;
+        $this->db = $db;
         if ($this->db) {
             $this->db->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, false);
         }
@@ -36,7 +36,7 @@ 
      */
     public function cd($path)
     {
-        return new self( $this->db, $this->queryParser, $this->resultHandler, \arc\path::collapse($path, $this->path) );
+        return new self($this->db, $this->queryParser, $this->resultHandler, \arc\path::collapse($path, $this->path));
     }
 
     /**
@@ -45,11 +45,11 @@ 
      * @param string $path
      * @return mixed
      */
-    public function find($query, $path='')
+    public function find($query, $path = '')
     {
         $path = \arc\path::collapse($path, $this->path);
         $sql  = $this->queryParser->parse($query, $path);
-        return ($this->resultHandler)( $sql, [] );
+        return ($this->resultHandler)($sql, []);
     }
 
     /**
@@ -57,7 +57,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function get($path='')
+    public function get($path = '')
     {
         $path   = \arc\path::collapse($path, $this->path);
         $parent = ($path=='/' ? '' : \arc\path::parent($path));
@@ -78,9 +78,9 @@ 
      * @param string $top
      * @return mixed
      */
-    public function parents($path='', $top='/')
+    public function parents($path = '', $top = '/')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return ($this->resultHandler)(
             /** @lang sql */
             'path=substring(:path,1,length(path)) '
@@ -94,9 +94,9 @@ 
      * @param string $path
      * @return mixed
      */
-    public function ls($path='')
+    public function ls($path = '')
     {
-        $path   = \arc\path::collapse($path, $this->path);
+        $path = \arc\path::collapse($path, $this->path);
         return ($this->resultHandler)('parent=:path', [':path' => $path]);
     }
 
@@ -105,7 +105,7 @@ 
      * @param string $path
      * @return bool
      */
-    public function exists($path='')
+    public function exists($path = '')
     {
         $path   = \arc\path::collapse($path, $this->path);
         $query  = $this->db->prepare('select count(*) from nodes where path=:path');
@@ -119,7 +119,7 @@ 
      */
     public function initialize() {
         try {
-            if ($result=$this->exists('/')) {
+            if ($result = $this->exists('/')) {
                 return false;
             }
         } catch (\PDOException $e) {
@@ -143,7 +143,7 @@ 
 SQL;
 //        $queries[] = "create trigger before_insert_node before insert on nodes for each row set new.id = UUID_TO_BIN(uuid());";
         $queries[] = "create unique index path on nodes ( path(255) );";
-        foreach ( $queries as $query ) {
+        foreach ($queries as $query) {
             $result = $this->db->exec($query);
             if ($result===false) {
                 $this->db->exec('rollback;');
@@ -154,7 +154,7 @@ 
 
         return $this->save(\arc\prototype::create([
             'name' => 'Root'
-        ]),'/');
+        ]), '/');
     }
 
     /**
@@ -163,7 +163,7 @@ 
      * @param string $path
      * @return mixed
      */
-    public function save($data, $path='') {
+    public function save($data, $path = '') {
         $path   = \arc\path::collapse($path, $this->path);
         $parent = ($path=='/' ? '' : \arc\path::parent($path));
         if ($path!='/' && !$this->exists($parent)) {