kristuff / patabase

lib/Query/SelectBase.php

Indentation +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
      * @access protected
      * @var    QueryBuilder
      */
-     protected $topQuery = null;
+        protected $topQuery = null;
 
     /**
      * Constructor
@@ -122,7 +122,7 @@ 
         }
     }
 
-   /**
+    /**
      * Parse the columns arguments for the select query
      *
      * @access protected
@@ -200,7 +200,7 @@ 
      */
     public function count($alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'count',
             'alias' => $alias
         );
@@ -217,7 +217,7 @@ 
      */
     public function sum($column, $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'sum',
             'name'  => $column,
             'alias' => $alias
@@ -235,7 +235,7 @@ 
      */
     public function min($column, $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'min',
             'name'  => $column,
             'alias' => $alias
@@ -253,7 +253,7 @@ 
      */
     public function max($column, $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'max',
             'name'  => $column,
             'alias' => $alias

lib/Query/QueryBuilder.php

Spacing +14 added lines, -14 removed lines

@@ -138,7 +138,7 @@ 
      *
      * @return string
      */
-    public function __construct( $driver)
+    public function __construct($driver)
     {
         $this->driver = $driver;
     }
@@ -202,7 +202,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -226,13 +226,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
@@ -251,8 +251,8 @@ 
     {
         try {
             // prepare bind execute
-            if (!isset($this->pdoStatement)){
-               if (!$this->prepare()){
+            if (!isset($this->pdoStatement)) {
+               if (!$this->prepare()) {
                    return false;
                }
             }
@@ -267,7 +267,7 @@ 
             }
 
             // register error 
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }
@@ -297,23 +297,23 @@ 
      */
     protected static function fetchOutput(QueryBuilder $query, $executed, $outputFormat)
     {
-        switch (strtoupper($outputFormat)){
+        switch (strtoupper($outputFormat)) {
 
             case Output::ASSOC:    
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
 
             case Output::OBJ:    
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_OBJ) :    array();
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_OBJ) : array();
 
             case Output::COLUMN:    
-                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) :  array();
+                return $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_COLUMN) : array();
 
             case Output::JSON:
-                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_NUMERIC_CHECK);   
 
             case Output::JSON_PRETTY_PRINT:    
-                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) :  array();
+                $results = $executed ? $query->pdoStatement->fetchAll(\PDO::FETCH_ASSOC) : array();
                 return json_encode($results, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK);   
                 
             default:

lib/Query/Select.php

Spacing +26 added lines, -26 removed lines

@@ -57,8 +57,8 @@ 
     protected function getArgumentName($column)
     {
         $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;
     }
     
     /**
@@ -70,22 +70,22 @@ 
     private function sqlColumns()
     {
         // 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;  
                    
@@ -97,31 +97,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);
     }
     
     /**
@@ -133,26 +133,26 @@ 
     public function sql()
     {
         $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;
@@ -160,10 +160,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', 
@@ -223,7 +223,7 @@ 
     public function getColumn()
     {
         $this->limit(1);
-        return $this->execute() ? $this->pdoStatement->fetchColumn() : NULL ;
+        return $this->execute() ? $this->pdoStatement->fetchColumn() : NULL;
     }
 
 }
\ No newline at end of file

lib/Driver/DatabaseDriver.php

Indentation +2 added lines, -2 removed lines

@@ -135,8 +135,8 @@
      */
     public function escape($str)
     {
-       $list = explode('.', $str);
-       return implode('.', $this->escapeList($list));
+        $list = explode('.', $str);
+        return implode('.', $this->escapeList($list));
     }
 
     /**

lib/Driver/Mysql/MysqlDriver.php

Indentation +10 added lines, -10 removed lines

@@ -89,7 +89,7 @@ 
         $port    = !empty($settings['port'])     ?  ';port='.$settings['port']        : '';
         $dbname  = !empty($settings['database']) ?  ';dbname='.$settings['database']  : '';
         $options = [
-          //  \PDO::ATTR_EMULATE_PREPARES => false,
+            //  \PDO::ATTR_EMULATE_PREPARES => false,
         ];
 
         $this->pdo = new \PDO(
@@ -153,11 +153,11 @@ 
     public function addForeignKey($fkName, $srcTable, $srcColumn, $refTable, $refColumn)
     {
         $sql = sprintf('ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)',
-                       $this->escape($srcTable),
-                       $fkName,
-                       $this->escape($srcColumn),
-                       $this->escape($refTable),
-                       $this->escape($refColumn)
+                        $this->escape($srcTable),
+                        $fkName,
+                        $this->escape($srcColumn),
+                        $this->escape($refTable),
+                        $this->escape($refColumn)
         );
         return $this->prepareAndExecuteSql($sql);
     }
@@ -174,8 +174,8 @@ 
     public function dropForeignKey($fkName, $tableName)
     {
         $sql = sprintf('ALTER TABLE %s DROP FOREIGN KEY %s',
-                       $this->escape($tableName),
-                       $fkName
+                        $this->escape($tableName),
+                        $fkName
         );
         return $this->prepareAndExecuteSql($sql);
     }
@@ -230,7 +230,7 @@ 
                     "'" . $userPassword ."'"
         ));
         return $this->prepareAndExecuteSql($sql);
-   }
+    }
 
     /**
      * Drop a user
@@ -260,7 +260,7 @@ 
      *
      * @return bool     True if the user has been granted, otherwise false. 
      */
-     public function grantUser($databaseName, $userName)
+        public function grantUser($databaseName, $userName)
     {
         $sql = trim(sprintf('GRANT ALL ON %s.* TO %s@%s; FLUSH PRIVILEGES;', 
             $this->escape($databaseName),

Spacing +11 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
      */
     public function escapeIdentifier($identifier)
     {
-        return '`' . $identifier .'`';
+        return '`'.$identifier.'`';
     }
 
     /**
@@ -85,15 +85,15 @@ 
      */
     public function createConnection(array $settings)
     {
-        $charset = !empty($settings['charset'])  ?  ';charset='.$settings['charset']  : ';charset=utf8';
-        $port    = !empty($settings['port'])     ?  ';port='.$settings['port']        : '';
-        $dbname  = !empty($settings['database']) ?  ';dbname='.$settings['database']  : '';
+        $charset = !empty($settings['charset']) ? ';charset='.$settings['charset'] : ';charset=utf8';
+        $port    = !empty($settings['port']) ? ';port='.$settings['port'] : '';
+        $dbname  = !empty($settings['database']) ? ';dbname='.$settings['database'] : '';
         $options = [
           //  \PDO::ATTR_EMULATE_PREPARES => false,
         ];
 
         $this->pdo = new \PDO(
-            'mysql:host='.$settings['hostname'] .$port .$dbname .$charset,
+            'mysql:host='.$settings['hostname'].$port.$dbname.$charset,
             $settings['username'],
             $settings['password'],
             $options
@@ -192,7 +192,7 @@ 
     {
         $sql = 'SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = :dbName'; 
         $query = $this->pdo->prepare($sql);
-        $query->bindValue(':dbName',  $databaseName, \PDO::PARAM_STR);
+        $query->bindValue(':dbName', $databaseName, \PDO::PARAM_STR);
         $query->execute();
         return (bool) $query->fetchColumn();
     }
@@ -209,7 +209,7 @@ 
      */
     public function createDatabase($databaseName, $owner)
     {
-        $sql = trim(sprintf('CREATE DATABASE %s',  $this->escape($databaseName)));
+        $sql = trim(sprintf('CREATE DATABASE %s', $this->escape($databaseName)));
         return $this->prepareAndExecuteSql($sql);
     }
     
@@ -227,7 +227,7 @@ 
         $sql = trim(sprintf('CREATE USER %s@%s IDENTIFIED BY %s', 
                     $this->escape($userName),
                     $this->escape($this->getHostName()),
-                    "'" . $userPassword ."'"
+                    "'".$userPassword."'"
         ));
         return $this->prepareAndExecuteSql($sql);
    }
@@ -244,7 +244,7 @@ 
     public function dropUser($userName, $ifExists = false)
     {
         $sql = trim(sprintf('DROP USER %s %s@%s', 
-                    $ifExists === true ? 'IF EXISTS': '',
+                    $ifExists === true ? 'IF EXISTS' : '',
                     $this->escape($userName),
                     $this->escape($this->getHostName())
         ));
@@ -311,7 +311,7 @@ 
      */
     public function sqlCreateTableOptions() 
     {
-        $engine =  !empty($settings['engine'])  ? $settings['engine']  : 'InnoDB';
+        $engine = !empty($settings['engine']) ? $settings['engine'] : 'InnoDB';
         $charset = !empty($settings['charset']) ? $settings['charset'] : 'utf8';
         $collate = !empty($settings['collate']) ? $settings['collate'] : 'utf8_unicode_ci';
         return sprintf('ENGINE=%s DEFAULT CHARSET=%s COLLATE=%s;', $engine, $charset, $collate);
@@ -340,7 +340,7 @@ 
      */
     public function sqlColumnAutoIncrement($type)
     {
-        return $type .' AUTO_INCREMENT';
+        return $type.' AUTO_INCREMENT';
     }
     
 }