kristuff / patabase

lib/Query/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      */
     public function where(): Where
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver);
         }
         return $this->where; 

lib/Query/SelectBase.php

Spacing +6 added lines, -6 removed lines

@@ -116,7 +116,7 @@ 
         $this->topQuery = $query;
 
         // columns arguments
-        if (! empty($args)) {
+        if (!empty($args)) {
             $this->parseColumnsArguments($args);
         }
     }
@@ -135,7 +135,7 @@ 
         $cols = (count($args) === 1 && is_array($args[0])) ? $args[0] : $args;
 
         // parse column
-        foreach ($cols as $key => $value){
+        foreach ($cols as $key => $value) {
             
             // Each arg could be a non indexed array of name, or 
             // an indexed array name => alias
@@ -405,7 +405,7 @@ 
      */
     public function where(): Where
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver, $this->topQuery);
         }
         return $this->where; 
@@ -435,7 +435,7 @@ 
      */
     public function having(): Having
     {
-        if (!isset($this->having)){
+        if (!isset($this->having)) {
             $this->having = new Query\Having($this, $this->driver, $this->topQuery);
         }
         return $this->having; 
@@ -522,7 +522,7 @@ 
      */
     public function limit($value)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->limit = (int) $value;
         }
         return $this;
@@ -538,7 +538,7 @@ 
      */
     public function offset($value)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->offset = (int) $value;
         }
         return $this;

lib/Query/Select.php

Spacing +25 added lines, -25 removed lines

@@ -48,8 +48,8 @@ 
     protected function getArgumentName(string $column): string
     {
         $topQuery = $this->topQuery ?: $this;  
-        $arg = ':_' . str_replace('.', '_', $column); 
-        return $topQuery->sqlParameterExists($arg) ? $arg . uniqid() : $arg;
+        $arg = ':_'.str_replace('.', '_', $column); 
+        return $topQuery->sqlParameterExists($arg) ? $arg.uniqid() : $arg;
     }
     
     /**
@@ -61,22 +61,22 @@ 
     private function sqlColumns(): string
     {
         // no columns givens select all (SELECT *)
-        if (!count($this->columns) > 0 ) {
+        if (!count($this->columns) > 0) {
             return '*';   
         }
 
         // use DISTINCT ?
-        $sqlDistinct    = $this->distinct ? 'DISTINCT ': '';
+        $sqlDistinct = $this->distinct ? 'DISTINCT ' : '';
 
         // parse columns
         $colsList = array();
-        foreach ($this->columns as $val){
-            switch ($val['type']){
+        foreach ($this->columns as $val) {
+            switch ($val['type']) {
                    
                 // 'classic' column
                 case 'column':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? 'AS '. $this->escape($val['alias']) : '';
+                    $alias      = isset($val['alias']) ? 'AS '.$this->escape($val['alias']) : '';
                     $colsList[] = trim(sprintf('%s %s', $name, $alias));
                     break;  
                    
@@ -88,31 +88,31 @@ 
                 // SUM() column
                 case 'sum':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? ' AS '. $this->escape($val['alias']) : '';
-                    $colsList[] = sprintf('SUM(%s)', $name) . $alias;
+                    $alias      = isset($val['alias']) ? ' AS '.$this->escape($val['alias']) : '';
+                    $colsList[] = sprintf('SUM(%s)', $name).$alias;
                     break;  
 
                 // MIN() column
                 case 'min':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? ' AS '. $this->escape($val['alias']) : '';
-                    $colsList[] = sprintf('MIN(%s)', $name) . $alias;
+                    $alias      = isset($val['alias']) ? ' AS '.$this->escape($val['alias']) : '';
+                    $colsList[] = sprintf('MIN(%s)', $name).$alias;
                     break;   
                     
                 // max() column
                 case 'max':
                     $name       = $this->escape($val['name']);
-                    $alias      = isset($val['alias']) ? ' AS '. $this->escape($val['alias']) : '';
-                    $colsList[] = sprintf('MAX(%s)', $name) . $alias;
+                    $alias      = isset($val['alias']) ? ' AS '.$this->escape($val['alias']) : '';
+                    $colsList[] = sprintf('MAX(%s)', $name).$alias;
                     break;        
 
                 // sub query
                 case 'sub_query':
-                    $colsList[] = '('. $val['query']->sql() .') AS '. $this->escape($val['alias']);
+                    $colsList[] = '('.$val['query']->sql().') AS '.$this->escape($val['alias']);
                     break;
            }
         }
-        return $sqlDistinct . implode(', ', $colsList);
+        return $sqlDistinct.implode(', ', $colsList);
     }
     
     /**
@@ -124,26 +124,26 @@ 
     public function sql(): string
     {
         $topQuery = $this->topQuery ?: $this;  
-        $sqlJoins = empty($this->joins) ? '' : implode(' ', $this->joins) ; 
-        $sqlFromTable =  'FROM '. $this->escape($this->fromTable);
+        $sqlJoins = empty($this->joins) ? '' : implode(' ', $this->joins); 
+        $sqlFromTable = 'FROM '.$this->escape($this->fromTable);
         $sqlWhere = isset($this->where) ? $this->where->sql() : '';
         $sqlGroupBy = empty($this->groupBy) ? '' : 'GROUP BY '.implode(', ', $this->escapeList($this->groupBy));
         $sqlHaving = isset($this->having) ? $this->having->sql() : '';
 
         // order by
         $sqlOrderBy = '';
-        if (! empty($this->orderBy)){
+        if (!empty($this->orderBy)) {
             $sortArgs = [];
-            foreach ($this->orderBy as $item){
-                $sql = $item['column'] ? $this->escape($item['column']) . ' ' : '';
-                $sortArgs[] = $sql . $item['order'];
+            foreach ($this->orderBy as $item) {
+                $sql = $item['column'] ? $this->escape($item['column']).' ' : '';
+                $sortArgs[] = $sql.$item['order'];
             }
-            $sqlOrderBy = 'ORDER BY ' . implode(', ', $sortArgs);
+            $sqlOrderBy = 'ORDER BY '.implode(', ', $sortArgs);
         }
 
         // limit
         $sqlLimit = '';
-        if ($this->limit > 0){
+        if ($this->limit > 0) {
             $argName = $this->getArgumentName('LIMIT');   
             $topQuery->setSqlParameter($argName, $this->limit); 
             $sqlLimit = 'LIMIT '.$argName;
@@ -151,10 +151,10 @@ 
 
         // offset
         $sqlOffset = '';
-        if ($this->offset > 0){
+        if ($this->offset > 0) {
             $argName = $this->getArgumentName('OFFSET');   
             $topQuery->setSqlParameter($argName, $this->offset); 
-            $sqlOffset = 'OFFSET ' . $argName;
+            $sqlOffset = 'OFFSET '.$argName;
         }
 
         return trim(implode(' ', ['SELECT', 

lib/Query/Update.php

Spacing +5 added lines, -5 removed lines

@@ -58,15 +58,15 @@ 
     {
         $columns = array();
         foreach ($this->parameters as $key => $val) {
-            $arg       = ':_' . str_replace('.', '_', $key); 
-            $columns[] = $this->escape($key) . ' =' .$arg; 
+            $arg       = ':_'.str_replace('.', '_', $key); 
+            $columns[] = $this->escape($key).' ='.$arg; 
             $this->pdoParameters[$arg] = $val; 
         }
         foreach ($this->incrementColumns as $key => $val) {
-            $columns[] = $this->escape($key) . ' =' . $this->escape($key) . '+' .$val ; 
+            $columns[] = $this->escape($key).' ='.$this->escape($key).'+'.$val; 
         }
         foreach ($this->decrementColumns as $key => $val) {
-            $columns[] = $this->escape($key) . ' =' . $this->escape($key) . '-' .$val ; 
+            $columns[] = $this->escape($key).' ='.$this->escape($key).'-'.$val; 
         }
         return implode(', ', $columns);
     }
@@ -79,7 +79,7 @@ 
      */
     public function where(): Where
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver);
         }
         return $this->where; 

lib/Query/Where.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
      */
     public function in(string $column, array $values)
     {
-        if (! empty($values)) {
+        if (!empty($values)) {
             $this->addCondition('IN', $this->query->escape($column).' IN ', $column, $values);
         }
         return $this->returnFunction();
@@ -181,7 +181,7 @@ 
      */
     public function notIn(string $column, array $values)
     {
-        if (! empty($values)) {
+        if (!empty($values)) {
             $this->addCondition('NOT_IN', $this->query->escape($column).' NOT IN ', $column, $values);
         }
         return $this->returnFunction();

lib/Query/QueryBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -203,7 +203,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -227,13 +227,13 @@ 
                 $paramType = \PDO::PARAM_STR; // default
 
                 if (!isset($val)) {
-                    $paramType =  \PDO::PARAM_NULL;
+                    $paramType = \PDO::PARAM_NULL;
                 
                 } elseif (is_int($val)) {
-                    $paramType =  \PDO::PARAM_INT;
+                    $paramType = \PDO::PARAM_INT;
                 
                 } elseif (is_bool($val)) {
-                    $paramType =  \PDO::PARAM_BOOL;
+                    $paramType = \PDO::PARAM_BOOL;
                 } 
                 
                 // bind value
@@ -252,8 +252,8 @@ 
     {
         try {
             // prepare bind execute
-            if (!isset($this->pdoStatement)){
-               if (!$this->prepare()){
+            if (!isset($this->pdoStatement)) {
+               if (!$this->prepare()) {
                    return false;
                }
             }
@@ -268,7 +268,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -296,23 +296,23 @@ 
      */
     protected function fetchOutput(bool $executed, string $outputFormat)
     {
-        switch (strtoupper($outputFormat)){
+        switch (strtoupper($outputFormat)) {
 
             case Output::ASSOC:    
-                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
 
             case Output::OBJ:    
-                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_OBJ) :    array();
+                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_OBJ) : array();
 
             case Output::COLUMN:    
-                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) :  array();
+                return $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) : array();
 
             case Output::JSON:
-                $results = $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_NUMERIC_CHECK);   
 
             case Output::JSON_PRETTY_PRINT:    
-                $results = $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $this->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK);   
                 
             default:

lib/Query/QueryFilter.php

Spacing +18 added lines, -18 removed lines

@@ -112,8 +112,8 @@ 
      */
     private function getArgumentName(string $column): string
     {
-        $arg = ':__' . str_replace('.', '_', $column); 
-        return $this->topQuery->sqlParameterExists($arg) ? $arg . uniqid() : $arg;
+        $arg = ':__'.str_replace('.', '_', $column); 
+        return $this->topQuery->sqlParameterExists($arg) ? $arg.uniqid() : $arg;
     }
 
     /**
@@ -215,7 +215,7 @@ 
     {
         // define argument for each values
         $valueArgs = array();
-        foreach($item['value'] as $value){
+        foreach ($item['value'] as $value) {
             $arg = $this->getArgumentName($item['column']); 
             $valueArgs[] = $arg;
 
@@ -224,7 +224,7 @@ 
         }
         
         //build and return sql
-        return $item['sql']. '(' . implode(', ', $valueArgs) .')';
+        return $item['sql'].'('.implode(', ', $valueArgs).')';
     }
 
     /**
@@ -237,20 +237,20 @@ 
     {
         $sql = '';
         if (!empty($this->conditions)) {
-            $sql = ' '. $this->sqlBase  .' ';  // start the SQL WHERE or HAVING clause
-            $currentOperator = 'AND';          // current condition operator
+            $sql = ' '.$this->sqlBase.' '; // start the SQL WHERE or HAVING clause
+            $currentOperator = 'AND'; // current condition operator
             
             foreach ($this->conditions as $key => $item) {
 
                 // need operator AND or OR, except for the first or if 
                 // previous item is a begin group item
-                $isSqlNeedOperator = $key > 0  && $this->conditions[$key -1]['type'] != 'group_start';
+                $isSqlNeedOperator = $key > 0 && $this->conditions[$key-1]['type'] != 'group_start';
 
                 switch ($item['type']) {
                     
                     case'group_start':
                         $currentOperator = $item['operator']; // register operator
-                        $sql .= '(' ;
+                        $sql .= '(';
                         break;
                     
                     case'group_end':
@@ -260,32 +260,32 @@ 
 
                    case 'NULL':
                    case 'NOT_NULL':
-                        $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                        $sql .=  $item['sql'];
+                        $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                        $sql .= $item['sql'];
                         break;
 
                     case 'IN':
                     case 'NOT_IN':
-                        $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                        $sql .=  $this->getSqlInOrNotIn($item);
+                        $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                        $sql .= $this->getSqlInOrNotIn($item);
                         break;
 
                     default:
                         // support for column literral 
                         if (is_string($item['value']) && 
-                            strlen($item['value']) >  strlen(Patabase\Constants::COLUMN_LITERALL) &&
+                            strlen($item['value']) > strlen(Patabase\Constants::COLUMN_LITERALL) &&
                             substr($item['value'], 0, strlen(Patabase\Constants::COLUMN_LITERALL)) === 
                                                              Patabase\Constants::COLUMN_LITERALL) {
 
                             $arg = substr($item['value'], strlen(Patabase\Constants::COLUMN_LITERALL));
-                            $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                            $sql .=  $item['sql'] . $this->query->escape($arg);
+                            $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                            $sql .= $item['sql'].$this->query->escape($arg);
 
-                        }   else {
+                        } else {
                                 // *normal* value 
                                 $arg = $this->getArgumentName($item['column']);
-                                $sql .=  $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
-                                $sql .=  $item['sql'] . $arg;
+                                $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : '';
+                                $sql .= $item['sql'].$arg;
                                
                                 // set parameters
                                 $this->topQuery->setSqlParameter($arg, $item['value']); 

lib/Query/CreateTable.php

Spacing +23 added lines, -23 removed lines

@@ -142,50 +142,50 @@ 
     private function sqlColumns(): string
     {
         $result = array();
-        foreach ($this->columns as $col){
+        foreach ($this->columns as $col) {
 
             // Parse arguments. First item is NAME and second is TYPE
             $sqlName   = $this->escape($col[0]);
-            $sqlType   = $col[1];  //TODO check type
+            $sqlType   = $col[1]; //TODO check type
             
             // following arguments
-            $args       = array_slice($col, 2);
+            $args = array_slice($col, 2);
             $currentIndex       = 0;
             $defaultValueIndex  = -1;
 
-            $sqlConstraintUnique    = '';       // UNIQUE ?, not by default
-            $sqlConstraintNullable  = 'NULL';   // allow null value by default
-            $isPk                   = false;    // PRIMARY KEY?
-            $sqlDefault             = '';       // DEFAULT VALUE?
+            $sqlConstraintUnique    = ''; // UNIQUE ?, not by default
+            $sqlConstraintNullable  = 'NULL'; // allow null value by default
+            $isPk                   = false; // PRIMARY KEY?
+            $sqlDefault             = ''; // DEFAULT VALUE?
 
-            foreach ($args as $arg){
+            foreach ($args as $arg) {
 
                 // last index was DEFAULT, so the current argument 
                 // is the value for default contsaint
-                if ($currentIndex === $defaultValueIndex){
+                if ($currentIndex === $defaultValueIndex) {
                     
                     // string
-                    if (is_string($arg)){
+                    if (is_string($arg)) {
                             
                         // escape everything except constants
-                        if (in_array(strtoupper($arg), $this->supportedDefaults)){
-                            $sqlDefault = 'DEFAULT ' . $arg;
+                        if (in_array(strtoupper($arg), $this->supportedDefaults)) {
+                            $sqlDefault = 'DEFAULT '.$arg;
                         } else {
-                            $sqlDefault = 'DEFAULT ' . $this->driver->escapeValue($arg);
+                            $sqlDefault = 'DEFAULT '.$this->driver->escapeValue($arg);
                         }
                         
                     // int/float are not escaped
-                    } elseif (is_int($arg) || is_float($arg)){
-                        $sqlDefault = 'DEFAULT ' . $arg;
+                    } elseif (is_int($arg) || is_float($arg)) {
+                        $sqlDefault = 'DEFAULT '.$arg;
 
                     // bool Type
-                    } elseif (is_bool($arg)){
-                        $sqlDefault = 'DEFAULT ' . ($arg ? 'TRUE' : 'FALSE');                            
+                    } elseif (is_bool($arg)) {
+                        $sqlDefault = 'DEFAULT '.($arg ? 'TRUE' : 'FALSE');                            
                     }
 
 
                 } else {
-                    switch (strtoupper($arg)){
+                    switch (strtoupper($arg)) {
                         
                         // NULL  /NOT NULL 
                         case 'NULL':
@@ -219,14 +219,14 @@ 
                         // DEFAULT
                         case 'DEFAULT':
                             // define next index as the DefaultValue index
-                            $defaultValueIndex = $currentIndex +1;
+                            $defaultValueIndex = $currentIndex+1;
                             break;
                     
                     }
                 }
 
                 // update  current index
-                $currentIndex ++;
+                $currentIndex++;
             }
 
             // set optional params
@@ -241,8 +241,8 @@ 
         }
 
         // FK CONSTRANT
-        foreach ($this->foreignKeys as $foreignKey){
-            $result[] =  trim(sprintf('CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', 
+        foreach ($this->foreignKeys as $foreignKey) {
+            $result[] = trim(sprintf('CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', 
                             $foreignKey['name'], 
                             $this->driver->escapeIdentifier($foreignKey['src_column']), 
                             $this->driver->escapeIdentifier($foreignKey['ref_table']),
@@ -262,7 +262,7 @@ 
     public function sql(): string
     {
         $sqlTableName = $this->driver->escape($this->tableName);
-        $sqlIfNotExists =  $this->isNotExists === true ? 'IF NOT EXISTS' : '';
+        $sqlIfNotExists = $this->isNotExists === true ? 'IF NOT EXISTS' : '';
 
         return trim(sprintf(
             'CREATE TABLE %s %s (%s) %s',

lib/Table.php

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
     {
         $query = new Query\Update($this->database->getDriver(), $this->name);
         foreach ($parameters as $key => $val) {
-            $query->setValue($key,  $val);
+            $query->setValue($key, $val);
         }
         return $query;
     }
@@ -122,7 +122,7 @@ 
     {
         $query = new Query\Insert($this->database->getDriver(), $this->name);
         foreach ($parameters as $key => $val) {
-            $query->setValue($key,  $val);
+            $query->setValue($key, $val);
         }
         return $query;
     }
@@ -171,7 +171,7 @@ 
     public function rename(string $newName): bool
     {
        $result = $this->database->renameTable($this->name, $newName);
-       if ($result){
+       if ($result) {
             $this->name = $newName;
         }
         return $result;