kristuff / patabase

lib/Database.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      * @param string    $tableName      The name of the table
      * 
      * @return bool     True if the table has been dropped, otherwise false
-      */
+     */
     public function dropTable(string $tableName): bool
     {
         $sql = trim(sprintf('DROP TABLE %s', $tableName));

Spacing +1 added lines, -1 removed lines

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

lib/Driver/DatabaseDriver.php

Indentation +2 added lines, -2 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -162,15 +162,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;
@@ -178,7 +178,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'];
     }
 
@@ -212,7 +212,7 @@ 
      */
     public function errorCode(): int
     {
-        return !empty($this->error) ? $this->error['code']: '';
+        return !empty($this->error) ? $this->error['code'] : '';
     }
 
     /**
@@ -256,7 +256,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/Postgres/PostgresDriver.php

Indentation +11 added lines, -12 removed lines

@@ -122,9 +122,9 @@ 
      */
     public function lastInsertedId(): string
     {
-       // Postgres does not set pdo->lastInsertedId
-       // use sequence
-       try {
+        // Postgres does not set pdo->lastInsertedId
+        // use sequence
+        try {
             $rq = $this->pdo->prepare('SELECT LASTVAL()');
             $rq->execute();
             // return string 
@@ -158,7 +158,6 @@ 
     /**
      * Get whether foreign keys are enabled or not
      * For compatibility with Sqlite, not implemented in that driver, return false 
-
      * @access public
      * @return bool     true if foreign keys are enabled, otherwise false
      */
@@ -182,11 +181,11 @@ 
     public function addForeignKey(string $fkName, string $srcTable, string $srcColumn, string $refTable, string $refColumn): bool
     {
         $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);
     }
@@ -203,9 +202,9 @@ 
     public function dropForeignKey(string $fkName, string $tableName, bool $ifExists = false): bool
     {
         $sql = sprintf('ALTER TABLE %s DROP CONSTRAINT %s %s',
-                       $this->escape($tableName),
-                       $ifExists ? 'IF EXISTS' : '',
-                       $fkName
+                        $this->escape($tableName),
+                        $ifExists ? 'IF EXISTS' : '',
+                        $fkName
         );
         return $this->prepareAndExecuteSql($sql);
     }

Spacing +8 added lines, -8 removed lines

@@ -98,9 +98,9 @@ 
      */
     public function createConnection(array $settings): void
     {
-        $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,
@@ -222,7 +222,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();
     }
@@ -237,11 +237,11 @@ 
      *
      * @return bool     True if the database has been created, otherwise false.
      */
-    public function createDatabase(string $databaseName, ?string $owner= null, ?string $template = 'template0'): bool
+    public function createDatabase(string $databaseName, ?string $owner = null, ?string $template = 'template0'): bool
     {
         $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);
@@ -260,7 +260,7 @@ 
     {
         $sql = trim(sprintf('CREATE USER %s PASSWORD %s', 
                     $this->escape($userName), 
-                    "'" . $userPassword ."'"
+                    "'".$userPassword."'"
         ));
         return $this->prepareAndExecuteSql($sql);
     }
@@ -277,7 +277,7 @@ 
     public function dropUser(string $userName, bool $ifExists = false): bool
     {
         $sql = trim(sprintf('DROP USER %s %s', 
-                    $ifExists === true ? 'IF EXISTS': '',
+                    $ifExists === true ? 'IF EXISTS' : '',
                     $this->escape($userName)
         ));
         return $this->prepareAndExecuteSql($sql);

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
             $rq->execute();
             // return string 
             return strval($rq->fetchColumn());
-        }
-        catch (\PDOException $e) {
+        } catch (\PDOException $e) {
             return 0;
         }
     }

lib/Driver/ServerDriver.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     public function __construct(array $settings, bool $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]);
@@ -66,7 +66,7 @@ 
      *
      * @return bool     True if the database has been created, otherwise false.
      */
-    abstract public function createDatabase(string $databaseName, ?string $owner= null, ?string $template = null): bool;
+    abstract public function createDatabase(string $databaseName, ?string $owner = null, ?string $template = null): bool;
 
     /**
      * Create a user

lib/Driver/Mysql/MysqlDriver.php

Indentation +10 added lines, -11 removed lines

@@ -86,7 +86,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(
@@ -138,7 +138,6 @@ 
     /**
      * Get whether foreign keys are enabled or not
      * For compatibility with Sqlite, not implemented in that driver, return false 
-
      * @access public
      * @return bool     true if foreign keys are enabled, otherwise false
      */
@@ -162,11 +161,11 @@ 
     public function addForeignKey(string $fkName, string $srcTable, string $srcColumn, string $refTable, string $refColumn): bool
     {
         $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);
     }
@@ -183,8 +182,8 @@ 
     public function dropForeignKey(string $fkName, string $tableName): bool
     {
         $sql = sprintf('ALTER TABLE %s DROP FOREIGN KEY %s',
-                       $this->escape($tableName),
-                       $fkName
+                        $this->escape($tableName),
+                        $fkName
         );
         return $this->prepareAndExecuteSql($sql);
     }
@@ -239,7 +238,7 @@ 
                     "'" . $userPassword ."'"
         ));
         return $this->prepareAndExecuteSql($sql);
-   }
+    }
 
     /**
      * Drop a user
@@ -269,7 +268,7 @@ 
      *
      * @return bool     True if the user has been granted, otherwise false. 
      */
-     public function grantUser(string $databaseName, string $userName): bool
+        public function grantUser(string $databaseName, string $userName): bool
     {
         $sql = trim(sprintf('GRANT ALL ON %s.* TO %s@%s; FLUSH PRIVILEGES;', 
             $this->escape($databaseName),

Spacing +11 added lines, -11 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function escapeIdentifier(string $identifier): string
     {
-        return '`' . $identifier .'`';
+        return '`'.$identifier.'`';
     }
 
     /**
@@ -82,15 +82,15 @@ 
      */
     public function createConnection(array $settings): void
     {
-        $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
@@ -201,7 +201,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();
     }
@@ -218,7 +218,7 @@ 
      */
     public function createDatabase(string $databaseName, ?string $owner = null, ?string $template = null): bool
     {
-        $sql = trim(sprintf('CREATE DATABASE %s',  $this->escape($databaseName)));
+        $sql = trim(sprintf('CREATE DATABASE %s', $this->escape($databaseName)));
         return $this->prepareAndExecuteSql($sql);
     }
     
@@ -236,7 +236,7 @@ 
         $sql = trim(sprintf('CREATE USER %s@%s IDENTIFIED BY %s', 
                     $this->escape($userName),
                     $this->escape($this->getHostName()),
-                    "'" . $userPassword ."'"
+                    "'".$userPassword."'"
         ));
         return $this->prepareAndExecuteSql($sql);
    }
@@ -253,7 +253,7 @@ 
     public function dropUser(string $userName, bool $ifExists = false): bool
     {
         $sql = trim(sprintf('DROP USER %s %s@%s', 
-                    $ifExists === true ? 'IF EXISTS': '',
+                    $ifExists === true ? 'IF EXISTS' : '',
                     $this->escape($userName),
                     $this->escape($this->getHostName())
         ));
@@ -320,7 +320,7 @@ 
      */
     public function sqlCreateTableOptions(): string 
     {
-        $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);
@@ -349,7 +349,7 @@ 
      */
     public function sqlColumnAutoIncrement(string $type): string
     {
-        return $type .' AUTO_INCREMENT';
+        return $type.' AUTO_INCREMENT';
     }
     
 }

lib/Query/InsertBase.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      */
     protected function getArgName(string $column): string
     {
-         return '_' . str_replace('.', '_', $column);
+            return '_' . str_replace('.', '_', $column);
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     protected function getArgName(string $column): string
     {
-         return '_' . str_replace('.', '_', $column);
+         return '_'.str_replace('.', '_', $column);
     }
 
     /**
@@ -76,7 +76,7 @@ 
     {
         // Define column parameters
         $columns = func_get_args();
-        if (!empty($columns)){
+        if (!empty($columns)) {
 
             // clear current parameters
             unset($this->parameters);

lib/Query/Having.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function fn(string $function, string $column, string $operator, $value)
     {
-        $sql = $function .'('. ($column ? $this->query->escape($column): '') . ') ' . $operator . ' ';
+        $sql = $function.'('.($column ? $this->query->escape($column) : '').') '.$operator.' ';
         $this->addCondition($function, $sql, $column, $value);
         return $this->returnFunction();
     }
@@ -64,7 +64,7 @@ 
      */
     public function count(string $operator, $value)
     {
-        $sql = 'COUNT(*) '. $operator. ' ';
+        $sql = 'COUNT(*) '.$operator.' ';
         $this->addCondition('COUNT', $sql, 'COUNT', $value);
         return $this->returnFunction();
     }

lib/Query/Delete.php

Indentation +5 added lines, -5 removed lines

@@ -90,12 +90,12 @@
      */
     public function sql(): string
     {
-       // Build sql where and escape table name
-       $sqlWhere = (isset($this->where)) ? $this->where->sql() : '';
-       $sqlTableName = $this->escape($this->tableName);
+        // Build sql where and escape table name
+        $sqlWhere = (isset($this->where)) ? $this->where->sql() : '';
+        $sqlTableName = $this->escape($this->tableName);
        
-       // DELETE query
-       return trim(sprintf('DELETE FROM %s %s', 
+        // DELETE query
+        return trim(sprintf('DELETE FROM %s %s', 
                             $sqlTableName, 
                             $sqlWhere));
     }

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

Indentation +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
      * @access protected
      * @var QueryBuilder
      */
-     protected $topQuery = null;
+        protected $topQuery = null;
 
     /**
      * Constructor
@@ -121,7 +121,7 @@ 
         }
     }
 
-   /**
+    /**
      * Parse the columns arguments for the select query
      *
      * @access protected
@@ -199,7 +199,7 @@ 
      */
     public function count(string $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'count',
             'alias' => $alias
         );
@@ -216,7 +216,7 @@ 
      */
     public function sum(string $column, string $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'sum',
             'name'  => $column,
             'alias' => $alias
@@ -234,7 +234,7 @@ 
      */
     public function min(string $column, string $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'min',
             'name'  => $column,
             'alias' => $alias
@@ -252,7 +252,7 @@ 
      */
     public function max(string $column, string $alias)
     {
-         $this->columns[] = array(
+            $this->columns[] = array(
             'type'  => 'max',
             'name'  => $column,
             'alias' => $alias

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;