kristuff / patabase

lib/Query/QueryFilter.php

Spacing +18 added lines, -18 removed lines

@@ -116,8 +116,8 @@ 
      */
     private function getArgumentName($column)
     {
-        $arg = ':__' . str_replace('.', '_', $column); 
-        return $this->topQuery->sqlParameterExists($arg) ? $arg . uniqid() : $arg;
+        $arg = ':__'.str_replace('.', '_', $column); 
+        return $this->topQuery->sqlParameterExists($arg) ? $arg.uniqid() : $arg;
     }
 
     /**
@@ -219,7 +219,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;
 
@@ -228,7 +228,7 @@ 
         }
         
         //build and return sql
-        return $item['sql']. '(' . implode(', ', $valueArgs) .')';
+        return $item['sql'].'('.implode(', ', $valueArgs).')';
     }
 
     /**
@@ -241,20 +241,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':
@@ -264,32 +264,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/Update.php

Spacing +5 added lines, -5 removed lines

@@ -63,15 +63,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);
     }
@@ -84,7 +84,7 @@ 
      */
     public function where()
     {
-        if (!isset($this->where)){
+        if (!isset($this->where)) {
             $this->where = new Query\Where($this, $this->driver);
         }
         return $this->where; 

lib/Datasource.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
      * @access protected
      * @var array               $settings   The driver settings
      */
-    protected $settings= null;
+    protected $settings = null;
 
     /**
      * Open a PDO connection
@@ -149,7 +149,7 @@ 
      */
     public function closeConnection()
     {
-        if ($this->driver){
+        if ($this->driver) {
             $this->driver->closeConnection();
             $this->driver = null;
         }

lib/Database.php

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
      */
     public function beginTransaction()
     {
-        if (! $this->inTransaction()) {
+        if (!$this->inTransaction()) {
             $this->getConnection()->beginTransaction();
         }
     }

lib/Driver/Postgres/PostgresDriver.php

Spacing +7 added lines, -7 removed lines

@@ -100,9 +100,9 @@ 
      */
     public function createConnection(array $settings)
     {
-        $port    = !empty($settings['port'])     ?  ';port='.$settings['port']        : '';
-        $dbname  = !empty($settings['database']) ?  ';dbname='.$settings['database']  : '';
-        $dsn     = 'pgsql:host='.$settings['hostname'] .$port .$dbname ;
+        $port    = !empty($settings['port']) ? ';port='.$settings['port'] : '';
+        $dbname  = !empty($settings['database']) ? ';dbname='.$settings['database'] : '';
+        $dsn     = 'pgsql:host='.$settings['hostname'].$port.$dbname;
 
         $this->pdo = new \PDO(
             $dsn,
@@ -208,7 +208,7 @@ 
     {
         $sql = 'SELECT COUNT(*) FROM pg_database WHERE datname = :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();
     }
@@ -227,7 +227,7 @@ 
     {
         $sql = trim(sprintf('CREATE DATABASE %s %s TEMPLATE %s', 
             $this->escape($databaseName),
-            isset($owner) ? 'OWNER '. $this->escape($owner) : '', 
+            isset($owner) ? 'OWNER '.$this->escape($owner) : '', 
             $template
         ));
         return $this->prepareAndExecuteSql($sql);
@@ -246,7 +246,7 @@ 
     {
         $sql = trim(sprintf('CREATE USER %s PASSWORD %s', 
                     $this->escape($userName), 
-                    "'" . $userPassword ."'"
+                    "'".$userPassword."'"
         ));
         return $this->prepareAndExecuteSql($sql);
     }
@@ -263,7 +263,7 @@ 
     public function dropUser($userName, $ifExists = false)
     {
         $sql = trim(sprintf('DROP USER %s %s', 
-                    $ifExists === true ? 'IF EXISTS': '',
+                    $ifExists === true ? 'IF EXISTS' : '',
                     $this->escape($userName)
         ));
         return $this->prepareAndExecuteSql($sql);

lib/Driver/DatabaseDriver.php

Spacing +6 added lines, -6 removed lines

@@ -164,15 +164,15 @@ 
     {
         // check for required attributes
         foreach ($this->dsnAttributes as $attribute) {
-            if (! array_key_exists($attribute, $settings)) {
+            if (!array_key_exists($attribute, $settings)) {
                 throw new Exception\MissingArgException('This configuration parameter is missing: "'.$attribute.'"');
             }
         }
 
         // defaut output format
-        if (array_key_exists('default_output_format', $settings)){
+        if (array_key_exists('default_output_format', $settings)) {
             $format = $settings['default_output_format'];
-            if (!in_array($format, $this->outputFormats)){
+            if (!in_array($format, $this->outputFormats)) {
                 throw new Exception\InvalidArgException('The default output format specified is invalid.');
             } 
             $this->defaultOutputFormat = $format;
@@ -180,7 +180,7 @@ 
 
         $this->createConnection($settings);
         $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-        $this->hostname = array_key_exists('hostname',$settings) && $settings['hostname'] ? $settings['hostname'] : '';
+        $this->hostname = array_key_exists('hostname', $settings) && $settings['hostname'] ? $settings['hostname'] : '';
         $this->driverName = $settings['driver'];
     }
 
@@ -214,7 +214,7 @@ 
      */
     public function errorCode()
     {
-        return !empty($this->error) ? $this->error['code']: '';
+        return !empty($this->error) ? $this->error['code'] : '';
     }
 
     /**
@@ -258,7 +258,7 @@ 
             return $pdoStatement->execute($parameters);
         } catch (\PDOException $e) {
             // register error
-            $this->error['code'] = (int)$e->getCode();
+            $this->error['code'] = (int) $e->getCode();
             $this->error['message'] = $e->getMessage();
             return false;
         }

lib/Driver/ServerDriver.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public function __construct(array $settings, $isServerConnection = false)
     {
         // remove database attribute for server connection
-        if ($isServerConnection){
+        if ($isServerConnection) {
             $dbKey = array_search('database', $this->dsnAttributes);
             if ($dbKey !== false) {
                 unset($this->dsnAttributes[$dbKey]);

lib/Driver/DriverFactory.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public static function getInstance(array $settings, $isServerConnection = false)
     {
-        if (! isset($settings['driver'])) {
+        if (!isset($settings['driver'])) {
             throw new Exception\MissingArgException('You must define a driver');
         }
 

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: