pedro151 / orm-generator

build/Classes/AdaptersDriver/AbsractAdapter.php

Spacing +47 added lines, -47 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @type \Classes\Db\DbTable[][]
      */
-    protected $objDbTables = array ();
+    protected $objDbTables = array();
 
     /**
      * @var AbstractAdapter
@@ -72,19 +72,19 @@ 
     /**
      * Popula as ForeingKeys do banco nos objetos
      */
-    protected abstract function parseForeignKeys ();
+    protected abstract function parseForeignKeys();
 
     /**
      * cria um Array com nome das tabelas
      */
-    protected abstract function parseTables ();
+    protected abstract function parseTables();
 
     /**
      * retorna o numero total de tabelas
      *
      * @return int
      */
-    public abstract function getTotalTables ();
+    public abstract function getTotalTables();
 
     /**
      * Retorna o Nome da Sequence da tabela
@@ -94,23 +94,23 @@ 
      *
      * @return string
      */
-    public abstract function getSequence ( $table , $column );
+    public abstract function getSequence($table, $column);
 
     /**
      * @return array
      */
-    public abstract function getListConstrant ();
+    public abstract function getListConstrant();
 
     /**
      * @param string $str
      *
      * @return string
      */
-    protected function convertTypeToPhp ( $str )
+    protected function convertTypeToPhp($str)
     {
-        if ( isset( $this->dataTypes[ $str ] ) )
+        if (isset($this->dataTypes[$str]))
         {
-            return $this->dataTypes[ $str ];
+            return $this->dataTypes[$str];
         }
 
         return 'string';
@@ -119,12 +119,12 @@ 
     /**
      * @return string
      */
-    public abstract function getPDOString ();
+    public abstract function getPDOString();
 
     /**
      * @return string
      */
-    public abstract function getPDOSocketString ();
+    public abstract function getPDOSocketString();
 
     /**
      * @param     $nameTable
@@ -132,13 +132,13 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function createTable ( $nameTable , $schema = 0 )
+    public function createTable($nameTable, $schema = 0)
     {
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = new DbTable();
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ]->populate (
-            array (
-                'table'    => $nameTable ,
-                'schema'   => $schema ,
+        $this->objDbTables[$schema][trim($nameTable)] = new DbTable();
+        $this->objDbTables[$schema][trim($nameTable)]->populate(
+            array(
+                'table'    => $nameTable,
+                'schema'   => $schema,
                 'database' => $this->database
             )
         );
@@ -151,14 +151,14 @@ 
      *
      * @return \Classes\Db\DbTable[]
      */
-    public function getTables ( $schema = 0 )
+    public function getTables($schema = 0)
     {
-        if ( ! isset( $this->objDbTables[ $schema ] ) )
+        if ( ! isset($this->objDbTables[$schema]))
         {
-            return array ();
+            return array();
         }
 
-        return $this->objDbTables[ $schema ];
+        return $this->objDbTables[$schema];
     }
 
     /**
@@ -168,11 +168,11 @@ 
      *
      * @return \Classes\Db\DbTable|null
      */
-    public function getTable ( $nameTable , $schema = 0 )
+    public function getTable($nameTable, $schema = 0)
     {
-        if ( isset( $this->objDbTables[ $schema ][ trim ( $nameTable ) ] ) )
+        if (isset($this->objDbTables[$schema][trim($nameTable)]))
         {
-            return $this->objDbTables[ $schema ][ trim ( $nameTable ) ];
+            return $this->objDbTables[$schema][trim($nameTable)];
         }
 
         return null;
@@ -184,9 +184,9 @@ 
      *
      * @return bool
      */
-    public function hasTable ( $nameTable , $schema = 0 )
+    public function hasTable($nameTable, $schema = 0)
     {
-        if ( isset( $this->objDbTables[ $schema ][ trim ( $nameTable ) ] ) )
+        if (isset($this->objDbTables[$schema][trim($nameTable)]))
         {
             return true;
         }
@@ -199,64 +199,64 @@ 
      *
      * @return array[]
      */
-    public abstract function getListColumns ();
+    public abstract function getListColumns();
 
     /**
      * Retorna um Array com nome das tabelas
      *
      * @return string[]
      */
-    public abstract function getListNameTable ();
+    public abstract function getListNameTable();
 
     /**
      * @param \Classes\AdapterConfig\AbstractAdapter $adapterConfig
      */
-    public function __construct ( AbstractAdapter $adapterConfig )
+    public function __construct(AbstractAdapter $adapterConfig)
     {
         $this->config = $adapterConfig;
-        $this->host = $adapterConfig->getHost ();
-        $this->database = $adapterConfig->getDatabase ();
-        $this->port = $adapterConfig->hasPort () ? $adapterConfig->getPort ()
+        $this->host = $adapterConfig->getHost();
+        $this->database = $adapterConfig->getDatabase();
+        $this->port = $adapterConfig->hasPort() ? $adapterConfig->getPort()
             : $this->port;
-        $this->username = $adapterConfig->getUser ();
-        $this->password = $adapterConfig->getPassword ();
-        $this->socket = $adapterConfig->getSocket ();
+        $this->username = $adapterConfig->getUser();
+        $this->password = $adapterConfig->getPassword();
+        $this->socket = $adapterConfig->getSocket();
 
     }
 
     /**
      * Executa as consultas do banco de dados
      */
-    public function runDatabase ()
+    public function runDatabase()
     {
-        $this->parseTables ();
-        $this->parseForeignKeys ();
+        $this->parseTables();
+        $this->parseForeignKeys();
     }
 
     /**
      *
      * @return \PDO
      */
-    public function getPDO ()
+    public function getPDO()
     {
-        if ( is_null ( $this->_pdo ) )
+        if (is_null($this->_pdo))
         {
-            if ( ! empty( $this->socket ) )
+            if ( ! empty($this->socket))
             {
-                $pdoString = $this->getPDOSocketString ();
+                $pdoString = $this->getPDOSocketString();
             } else
             {
-                $pdoString = $this->getPDOString ();
+                $pdoString = $this->getPDOString();
             }
 
             try
             {
-                $this->_pdo = new \PDO (
-                    $pdoString , $this->username , $this->password
+                $this->_pdo = new \PDO(
+                    $pdoString, $this->username, $this->password
                 );
-            } catch ( \Exception $e )
+            } catch (\Exception $e)
             {
-                die ( "pdo error: " . $e->getMessage () . "\n" );
+                die ("pdo error: " . $e->getMessage() . "\n");
             }
         }
 

build/Classes/AdaptersDriver/Pgsql.php

Indentation +13 added lines, -13 removed lines

@@ -166,7 +166,7 @@ 
                 if ( $this->hasTable ( $key , $schema ) )
                 {
                     $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "column_name" ] );
+                                    ->getColumn ( $constrant[ "column_name" ] );
                     if ( $column )
                     {
                         $objConstrant = new Constrant();
@@ -208,7 +208,7 @@ 
                 if ( $this->hasTable ( $key , $schema ) )
                 {
                     $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "foreign_column" ] );
+                                    ->getColumn ( $constrant[ "foreign_column" ] );
 
                     if ( $column )
                     {
@@ -239,7 +239,7 @@ 
     {
         $pdo = $this->getPDO ();
         $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$table', '$column');" )
-                       ->fetchColumn ();
+                        ->fetchColumn ();
 
         if ( $return1 )
         {
@@ -294,16 +294,16 @@ 
             }
 
             $this->getTable ( $key , $schema )
-                 ->createColumn ( $table [ 'column_name' ] )
-                 ->getColumn ( $table [ 'column_name' ] )
-                 ->populate (
-                     array (
-                         'name'       => $table [ 'column_name' ] ,
-                         'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
-                         'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
-                         'max_length' => $table[ 'max_length' ]
-                     )
-                 );
+                    ->createColumn ( $table [ 'column_name' ] )
+                    ->getColumn ( $table [ 'column_name' ] )
+                    ->populate (
+                        array (
+                            'name'       => $table [ 'column_name' ] ,
+                            'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
+                            'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
+                            'max_length' => $table[ 'max_length' ]
+                        )
+                    );
 
             $this->getTable ( $key , $schema )->setNamespace (
                 $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )

Spacing +123 added lines, -123 removed lines

@@ -27,43 +27,43 @@ 
     /**
      * @type array|\string[]
      */
-    protected $schema = array ( 'public' );
+    protected $schema = array('public');
 
-    protected $dataTypes = array (
+    protected $dataTypes = array(
         /* Numeric Types */
-        'smallint'         => 'int' ,
-        'integer'          => 'int' ,
-        'bigint'           => 'float' ,
-        'decimal'          => 'float' ,
-        'numeric'          => 'float' ,
-        'real'             => 'float' ,
-        'double precision' => 'float' ,
-        'serial'           => 'int' ,
-        'bigserial'        => 'float' ,
+        'smallint'         => 'int',
+        'integer'          => 'int',
+        'bigint'           => 'float',
+        'decimal'          => 'float',
+        'numeric'          => 'float',
+        'real'             => 'float',
+        'double precision' => 'float',
+        'serial'           => 'int',
+        'bigserial'        => 'float',
         /* Monetary Types */
-        'money'            => 'float' ,
+        'money'            => 'float',
         /* Character Types */
-        'character varyin' => 'string' ,
-        'varchar'          => 'string' ,
-        'character'        => 'string' ,
-        'char'             => 'string' ,
-        'text'             => 'string' ,
+        'character varyin' => 'string',
+        'varchar'          => 'string',
+        'character'        => 'string',
+        'char'             => 'string',
+        'text'             => 'string',
         /* Binary Data Types */
-        'bytea'            => 'string' ,
+        'bytea'            => 'string',
         /* Date/Time Types */
-        'datatime'         => 'date' ,
-        'date'             => 'date' ,
+        'datatime'         => 'date',
+        'date'             => 'date',
 
         /* Boolean Type */
         'boolean'          => 'boolean'
     );
 
-    public function __construct ( AbstractAdapter $adapterConfig )
+    public function __construct(AbstractAdapter $adapterConfig)
     {
-        parent::__construct ( $adapterConfig );
-        if ( $adapterConfig->hasSchemas () )
+        parent::__construct($adapterConfig);
+        if ($adapterConfig->hasSchemas())
         {
-            $this->schema = $adapterConfig->getSchemas ();
+            $this->schema = $adapterConfig->getSchemas();
         }
 
     }
@@ -75,13 +75,13 @@ 
      *
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) )
+        if (empty($this->tableList))
         {
-            $strSchema = implode ( "', '" , $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->tableList = $this->getPDO ()->query (
+            $this->tableList = $this->getPDO()->query(
                 "SELECT table_schema,  table_name
              FROM information_schema.tables
              WHERE
@@ -91,7 +91,7 @@ 
                table_schema,
                table_name
               ASC"
-            )->fetchAll ();
+            )->fetchAll();
         }
 
         return $this->tableList;
@@ -102,11 +102,11 @@ 
      *
      * @return array
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
-        $strSchema = implode ( "', '" , $this->schema );
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
 	c.table_schema,
 	c.table_name,
@@ -120,14 +120,14 @@ 
 		ON st.table_name=c.table_name and st.table_type = 'BASE TABLE'
 		and  c.table_schema IN ('$strSchema')
 		order by c.table_name asc"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        $strSchema = implode ( "', '" , $this->schema );
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
                 tc.constraint_type,
                 tc.constraint_name,
@@ -147,50 +147,50 @@ 
                       ON tc.constraint_name  = ccu.constraint_name
                         AND tc.constraint_schema = ccu.constraint_schema
                     ORDER by tc.table_schema"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
      * @inheritDoc
      */
-    public function parseForeignKeys ()
+    public function parseForeignKeys()
     {
-        foreach ( $this->getListConstrant () as $constrant )
+        foreach ($this->getListConstrant() as $constrant)
         {
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY"
-                 || $constrant[ 'constraint_type' ] == "PRIMARY KEY"
+            if ($constrant['constraint_type'] == "FOREIGN KEY"
+                 || $constrant['constraint_type'] == "PRIMARY KEY"
             )
             {
-                $schema = $constrant[ 'table_schema' ];
-                $key = $constrant [ 'table_name' ];
-                if ( $this->hasTable ( $key , $schema ) )
+                $schema = $constrant['table_schema'];
+                $key = $constrant ['table_name'];
+                if ($this->hasTable($key, $schema))
                 {
-                    $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "column_name" ] );
-                    if ( $column )
+                    $column = $this->getTable($key, $schema)
+                                   ->getColumn($constrant["column_name"]);
+                    if ($column)
                     {
                         $objConstrant = new Constrant();
-                        $objConstrant->populate (
-                            array (
-                                'constrant' => $constrant[ 'constraint_name' ] ,
-                                'schema'    => $constrant[ 'foreign_schema' ] ,
-                                'table'     => $constrant[ 'foreign_table' ] ,
-                                'column'    => $constrant[ 'foreign_column' ]
+                        $objConstrant->populate(
+                            array(
+                                'constrant' => $constrant['constraint_name'],
+                                'schema'    => $constrant['foreign_schema'],
+                                'table'     => $constrant['foreign_table'],
+                                'column'    => $constrant['foreign_column']
                             )
                         );
 
 
-                        switch ( $constrant[ 'constraint_type' ] )
+                        switch ($constrant['constraint_type'])
                         {
                             case "FOREIGN KEY":
-                                $column->addRefFk ( $objConstrant );
+                                $column->addRefFk($objConstrant);
                                 break;
                             case"PRIMARY KEY":
-                                $column->setPrimaryKey ( $objConstrant );
-                                $column->setSequence (
-                                    $this->getSequence (
-                                        $schema . '.' . $key ,
-                                        $constrant[ "column_name" ]
+                                $column->setPrimaryKey($objConstrant);
+                                $column->setSequence(
+                                    $this->getSequence(
+                                        $schema . '.' . $key,
+                                        $constrant["column_name"]
                                     )
                                 );
 
@@ -198,29 +198,29 @@ 
                         }
                     }
                 }
-                unset( $key , $column );
+                unset($key, $column);
             }
 
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY" )
+            if ($constrant['constraint_type'] == "FOREIGN KEY")
             {
-                $schema = $constrant[ 'foreign_schema' ];
-                $key = $constrant [ 'foreign_table' ];
-                if ( $this->hasTable ( $key , $schema ) )
+                $schema = $constrant['foreign_schema'];
+                $key = $constrant ['foreign_table'];
+                if ($this->hasTable($key, $schema))
                 {
-                    $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "foreign_column" ] );
+                    $column = $this->getTable($key, $schema)
+                                   ->getColumn($constrant["foreign_column"]);
 
-                    if ( $column )
+                    if ($column)
                     {
-                        $column->createDependece (
-                            $constrant[ 'constraint_name' ] ,
-                            $constrant[ 'table_name' ] ,
-                            $constrant[ 'column_name' ] ,
-                            $constrant[ 'table_schema' ]
+                        $column->createDependece(
+                            $constrant['constraint_name'],
+                            $constrant['table_name'],
+                            $constrant['column_name'],
+                            $constrant['table_schema']
                         );
                     }
                 }
-                unset( $key , $column );
+                unset($key, $column);
             }
 
 
@@ -235,20 +235,20 @@ 
      *
      * @return string
      */
-    public function getSequence ( $table , $column )
+    public function getSequence($table, $column)
     {
-        $pdo = $this->getPDO ();
-        $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$table', '$column');" )
-                       ->fetchColumn ();
+        $pdo = $this->getPDO();
+        $return1 = $pdo->query("SELECT pg_get_serial_sequence('$table', '$column');")
+                       ->fetchColumn();
 
-        if ( $return1 )
+        if ($return1)
         {
             return $return1;
         }
 
-        $dtbase = explode ( '.' , $table );;
+        $dtbase = explode('.', $table); ;
 
-        $stmt = $pdo->prepare (
+        $stmt = $pdo->prepare(
             "SELECT adsrc FROM pg_attrdef AS att
             INNER JOIN pg_class AS c
               ON adrelid = c.oid AND att.adnum=1 AND c.relname = ?
@@ -256,19 +256,19 @@ 
               ON n.oid = c.relnamespace and n.nspname=?"
         );
 
-        $schema = isset( $dtbase[ 1 ] ) ? $dtbase[ 1 ] : 'public';
+        $schema = isset($dtbase[1]) ? $dtbase[1] : 'public';
 
-        $stmt->bindParam ( 1 , $schema );
-        $stmt->bindParam ( 2 , $dtbase[ 0 ] );
-        $stmt->execute ();
-        $return2 = $stmt->fetchColumn ();
-        if ( $return2 )
+        $stmt->bindParam(1, $schema);
+        $stmt->bindParam(2, $dtbase[0]);
+        $stmt->execute();
+        $return2 = $stmt->fetchColumn();
+        if ($return2)
         {
-            return preg_filter (
-                array (
-                    '/nextval\(\'/' ,
+            return preg_filter(
+                array(
+                    '/nextval\(\'/',
                     '/\'::regclass\)/'
-                ) , '' , $return2
+                ), '', $return2
             );
         }
 
@@ -277,36 +277,36 @@ 
     /**
      * @inheritDoc
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( ! empty( $this->objDbTables ) )
+        if ( ! empty($this->objDbTables))
         {
             return $this->objDbTables;
         }
 
-        foreach ( $this->getListColumns () as $table )
+        foreach ($this->getListColumns() as $table)
         {
-            $schema = $table[ 'table_schema' ];
-            $key = $table [ 'table_name' ];
-            if ( ! $this->hasTable ( $key , $schema ) )
+            $schema = $table['table_schema'];
+            $key = $table ['table_name'];
+            if ( ! $this->hasTable($key, $schema))
             {
-                $this->createTable ( $key , $schema );
+                $this->createTable($key, $schema);
             }
 
-            $this->getTable ( $key , $schema )
-                 ->createColumn ( $table [ 'column_name' ] )
-                 ->getColumn ( $table [ 'column_name' ] )
-                 ->populate (
-                     array (
-                         'name'       => $table [ 'column_name' ] ,
-                         'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
-                         'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
-                         'max_length' => $table[ 'max_length' ]
+            $this->getTable($key, $schema)
+                 ->createColumn($table ['column_name'])
+                 ->getColumn($table ['column_name'])
+                 ->populate(
+                     array(
+                         'name'       => $table ['column_name'],
+                         'type'       => $this->convertTypeToPhp($table['data_type']),
+                         'nullable'   => ($table['is_nullable'] == 'YES'),
+                         'max_length' => $table['max_length']
                      )
                  );
 
-            $this->getTable ( $key , $schema )->setNamespace (
-                $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
+            $this->getTable($key, $schema)->setNamespace(
+                $this->config->createClassNamespace($this->getTable($key, $schema))
             );
         }
 
@@ -316,12 +316,12 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
-            "pgsql:host=%s;port=%s;dbname=%s" ,
-            $this->host ,
-            $this->port ,
+        return sprintf(
+            "pgsql:host=%s;port=%s;dbname=%s",
+            $this->host,
+            $this->port,
             $this->database
 
         );
@@ -331,11 +331,11 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
-            "pgsql:unix_socket=%s;dbname=%s" ,
-            $this->socket ,
+        return sprintf(
+            "pgsql:unix_socket=%s;dbname=%s",
+            $this->socket,
             $this->database
 
         );
@@ -346,19 +346,19 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) )
+        if (empty($this->totalTables))
         {
-            $strSchema = implode ( "', '" , $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->totalTables = $this->getPDO ()->query (
+            $this->totalTables = $this->getPDO()->query(
                 "SELECT COUNT(table_name)  AS total
              FROM information_schema.tables
              WHERE
               table_type = 'BASE TABLE'
               AND table_schema IN ( '" . $strSchema . "' )"
-            )->fetchColumn ();
+            )->fetchColumn();
         }
 
         return (int) $this->totalTables;

build/Classes/AdaptersDriver/Mysql.php

Indentation +14 added lines, -14 removed lines

@@ -69,7 +69,7 @@ 
                 if ( $this->hasTable ( $key , $schema ) )
                 {
                     $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "column_name" ] );
+                                    ->getColumn ( $constrant[ "column_name" ] );
                     if ( $column )
                     {
                         $objConstrant = new Constrant();
@@ -109,7 +109,7 @@ 
                 if ( $this->hasTable ( $key , $schema ) )
                 {
                     $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "foreign_column" ] );
+                                    ->getColumn ( $constrant[ "foreign_column" ] );
 
                     if ( $column )
                     {
@@ -151,16 +151,16 @@ 
             }
 
             $this->getTable ( $key , $schema )
-                 ->createColumn ( $table [ 'column_name' ] )
-                 ->getColumn ( $table [ 'column_name' ] )
-                 ->populate (
-                     array (
-                         'name'       => $table [ 'column_name' ] ,
-                         'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
-                         'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
-                         'max_length' => $table[ 'max_length' ]
-                     )
-                 );
+                    ->createColumn ( $table [ 'column_name' ] )
+                    ->getColumn ( $table [ 'column_name' ] )
+                    ->populate (
+                        array (
+                            'name'       => $table [ 'column_name' ] ,
+                            'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
+                            'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
+                            'max_length' => $table[ 'max_length' ]
+                        )
+                    );
 
             $this->getTable ( $key , $schema )->setNamespace (
                 $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
@@ -286,8 +286,8 @@ 
     public function getSequence ( $table , $column )
     {
         $return = $this->getPDO ()
-                       ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
-                       ->fetch ( \PDO::FETCH_ASSOC );
+                        ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
+                        ->fetch ( \PDO::FETCH_ASSOC );
 
         if ( ! $return )
         {

Spacing +85 added lines, -85 removed lines

@@ -30,20 +30,20 @@ 
      *
      * @return string
      */
-    protected function convertTypeToPhp ( $str )
+    protected function convertTypeToPhp($str)
     {
-        if ( preg_match ( '/(tinyint\(1\)|bit)/' , $str ) )
+        if (preg_match('/(tinyint\(1\)|bit)/', $str))
         {
             $res = 'boolean';
-        } elseif ( preg_match ( '/(datetime|timestamp|blob|char|enum|text|date)/' , $str ) )
+        } elseif (preg_match('/(datetime|timestamp|blob|char|enum|text|date)/', $str))
         {
             $res = 'string';
-        } elseif ( preg_match ( '/(decimal|numeric|float|double)/' , $str ) )
+        } elseif (preg_match('/(decimal|numeric|float|double)/', $str))
         {
             $res = 'float';
-        } elseif ( preg_match ( '#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#' , $str , $matches ) )
+        } elseif (preg_match('#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#', $str, $matches))
         {
-            $res = $matches[ 1 ];
+            $res = $matches[1];
         } else
         {
             print "Can't convert column type to PHP - Unrecognized type: $str";
@@ -55,44 +55,44 @@ 
     /**
      * @inheritDoc
      */
-    protected function parseForeignKeys ()
+    protected function parseForeignKeys()
     {
         $schema = 0;
-        foreach ( $this->getListConstrant () as $constrant )
+        foreach ($this->getListConstrant() as $constrant)
         {
 
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY"
-                 || $constrant[ 'constraint_type' ] == "PRIMARY KEY"
+            if ($constrant['constraint_type'] == "FOREIGN KEY"
+                 || $constrant['constraint_type'] == "PRIMARY KEY"
             )
             {
-                $key = $constrant [ 'table_name' ];
-                if ( $this->hasTable ( $key , $schema ) )
+                $key = $constrant ['table_name'];
+                if ($this->hasTable($key, $schema))
                 {
-                    $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "column_name" ] );
-                    if ( $column )
+                    $column = $this->getTable($key, $schema)
+                                   ->getColumn($constrant["column_name"]);
+                    if ($column)
                     {
                         $objConstrant = new Constrant();
-                        $objConstrant->populate (
-                            array (
-                                'constrant' => $constrant[ 'constraint_name' ] ,
-                                'table'     => $constrant[ 'foreign_table' ] ,
-                                'column'    => $constrant[ 'foreign_column' ]
+                        $objConstrant->populate(
+                            array(
+                                'constrant' => $constrant['constraint_name'],
+                                'table'     => $constrant['foreign_table'],
+                                'column'    => $constrant['foreign_column']
                             )
                         );
 
 
-                        switch ( $constrant[ 'constraint_type' ] )
+                        switch ($constrant['constraint_type'])
                         {
                             case "FOREIGN KEY":
-                                $column->addRefFk ( $objConstrant );
+                                $column->addRefFk($objConstrant);
                                 break;
                             case"PRIMARY KEY":
-                                $column->setPrimaryKey ( $objConstrant );
-                                $column->setSequence (
-                                    $this->getSequence (
-                                        $key ,
-                                        $constrant[ "column_name" ]
+                                $column->setPrimaryKey($objConstrant);
+                                $column->setSequence(
+                                    $this->getSequence(
+                                        $key,
+                                        $constrant["column_name"]
                                     )
                                 );
 
@@ -100,28 +100,28 @@ 
                         }
                     }
                 }
-                unset( $key , $column );
+                unset($key, $column);
             }
 
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY" )
+            if ($constrant['constraint_type'] == "FOREIGN KEY")
             {
-                $key = $constrant [ 'foreign_table' ];
-                if ( $this->hasTable ( $key , $schema ) )
+                $key = $constrant ['foreign_table'];
+                if ($this->hasTable($key, $schema))
                 {
-                    $column = $this->getTable ( $key , $schema )
-                                   ->getColumn ( $constrant[ "foreign_column" ] );
+                    $column = $this->getTable($key, $schema)
+                                   ->getColumn($constrant["foreign_column"]);
 
-                    if ( $column )
+                    if ($column)
                     {
-                        $column->createDependece (
-                            $constrant[ 'constraint_name' ] ,
-                            $constrant[ 'table_name' ] ,
-                            $constrant[ 'column_name' ] ,
-                            $constrant[ 'table_schema' ]
+                        $column->createDependece(
+                            $constrant['constraint_name'],
+                            $constrant['table_name'],
+                            $constrant['column_name'],
+                            $constrant['table_schema']
                         );
                     }
                 }
-                unset( $key , $column );
+                unset($key, $column);
             }
 
 
@@ -134,36 +134,36 @@ 
     /**
      * @inheritDoc
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( ! empty( $this->objDbTables ) )
+        if ( ! empty($this->objDbTables))
         {
             return $this->objDbTables;
         }
 
         $schema = 0;
-        foreach ( $this->getListColumns () as $table )
+        foreach ($this->getListColumns() as $table)
         {
-            $key = $table [ 'table_name' ];
-            if ( ! $this->hasTable ( $key , $schema ) )
+            $key = $table ['table_name'];
+            if ( ! $this->hasTable($key, $schema))
             {
-                $this->createTable ( $key , $schema );
+                $this->createTable($key, $schema);
             }
 
-            $this->getTable ( $key , $schema )
-                 ->createColumn ( $table [ 'column_name' ] )
-                 ->getColumn ( $table [ 'column_name' ] )
-                 ->populate (
-                     array (
-                         'name'       => $table [ 'column_name' ] ,
-                         'type'       => $this->convertTypeToPhp ( $table[ 'data_type' ] ) ,
-                         'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ) ,
-                         'max_length' => $table[ 'max_length' ]
+            $this->getTable($key, $schema)
+                 ->createColumn($table ['column_name'])
+                 ->getColumn($table ['column_name'])
+                 ->populate(
+                     array(
+                         'name'       => $table ['column_name'],
+                         'type'       => $this->convertTypeToPhp($table['data_type']),
+                         'nullable'   => ($table['is_nullable'] == 'YES'),
+                         'max_length' => $table['max_length']
                      )
                  );
 
-            $this->getTable ( $key , $schema )->setNamespace (
-                $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
+            $this->getTable($key, $schema)->setNamespace(
+                $this->config->createClassNamespace($this->getTable($key, $schema))
             );
         }
     }
@@ -172,12 +172,12 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
-            "mysql:host=%s;port=%s;dbname=%s" ,
-            $this->host ,
-            $this->port ,
+        return sprintf(
+            "mysql:host=%s;port=%s;dbname=%s",
+            $this->host,
+            $this->port,
             $this->database
 
         );
@@ -187,11 +187,11 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
-            "mysql:unix_socket=%s;dbname=%s" ,
-            $this->socket ,
+        return sprintf(
+            "mysql:unix_socket=%s;dbname=%s",
+            $this->socket,
             $this->database
 
         );
@@ -201,13 +201,13 @@ 
      * @inheritDoc
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) )
+        if (empty($this->tableList))
         {
-            $this->tableList = $this->getPDO ()->query (
+            $this->tableList = $this->getPDO()->query(
                 "show tables"
-            )->fetchAll ();
+            )->fetchAll();
         }
 
         return $this->tableList;
@@ -218,10 +218,10 @@ 
      *
      * @return array[]
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "select
                 table_schema,
                 table_name,
@@ -232,15 +232,15 @@ 
             from information_schema.columns
             where table_schema IN ('{$this->database}')
             order by table_name,ordinal_position"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
      * @return array
      */
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
      i.constraint_type,
      k.constraint_name,
@@ -256,7 +256,7 @@ 
 WHERE
 i.TABLE_SCHEMA IN ('{$this->database}') AND i.CONSTRAINT_TYPE IN ('FOREIGN KEY', 'PRIMARY KEY' )
 order by k.table_schema, k.table_name;"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
@@ -264,14 +264,14 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) )
+        if (empty($this->totalTables))
         {
 
-            $this->totalTables = $this->getPDO ()->query (
+            $this->totalTables = $this->getPDO()->query(
                 "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}'"
-            )->fetchColumn ();
+            )->fetchColumn();
         }
 
         return (int) $this->totalTables;
@@ -283,13 +283,13 @@ 
      * @param $table
      * @param $column
      */
-    public function getSequence ( $table , $column )
+    public function getSequence($table, $column)
     {
-        $return = $this->getPDO ()
-                       ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
-                       ->fetch ( \PDO::FETCH_ASSOC );
+        $return = $this->getPDO()
+                       ->query("select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';")
+                       ->fetch(\PDO::FETCH_ASSOC);
 
-        if ( ! $return )
+        if ( ! $return)
         {
             return;
         }

build/Classes/Db/DbTable.php

Spacing +44 added lines, -44 removed lines

@@ -11,7 +11,7 @@ 
     /**
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    public function __construct ()
+    public function __construct()
     {
     }
 
@@ -33,7 +33,7 @@ 
     /**
      * @var \Classes\Db\Column[]
      */
-    private $columns = array ();
+    private $columns = array();
 
     /**
      * @var string
@@ -43,25 +43,25 @@ 
     /**
      * @type \Classes\Db\Column[]
      */
-    private $primarykeys = array ();
+    private $primarykeys = array();
 
     /**
      * @type \Classes\Db\Column[]
      */
-    private $foreingkeys = array ();
+    private $foreingkeys = array();
 
-    private $dependence = array ();
+    private $dependence = array();
 
     /**
      * @type string[]
      */
-    private $sequence = array ();
+    private $sequence = array();
 
-    public function populate ( $array )
+    public function populate($array)
     {
-        $this->name = $array[ 'table' ];
-        $this->schema = isset( $array[ 'schema' ] ) ? $array[ 'schema' ] : null;
-        $this->database = $array[ 'database' ];
+        $this->name = $array['table'];
+        $this->schema = isset($array['schema']) ? $array['schema'] : null;
+        $this->database = $array['database'];
 
         return $this;
     }
@@ -69,9 +69,9 @@ 
     /**
      * @param \Classes\Db\Column $column
      */
-    public function addColumn ( Column $column )
+    public function addColumn(Column $column)
     {
-        $this->columns[ $column->getName () ] = $column;
+        $this->columns[$column->getName()] = $column;
 
         return $this;
     }
@@ -81,9 +81,9 @@ 
      *
      * @return $this
      */
-    public function createColumn ( $columnName )
+    public function createColumn($columnName)
     {
-        $this->columns[ $columnName ] = new Column();
+        $this->columns[$columnName] = new Column();
 
         return $this;
     }
@@ -93,11 +93,11 @@ 
      *
      * @return \Classes\Db\Column
      */
-    public function getColumn ( $columnName )
+    public function getColumn($columnName)
     {
-        if ( isset( $this->columns[ $columnName ] ) )
+        if (isset($this->columns[$columnName]))
         {
-            return $this->columns[ $columnName ];
+            return $this->columns[$columnName];
         }
 
         return;
@@ -106,11 +106,11 @@ 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getPrimaryKeys ()
+    public function getPrimaryKeys()
     {
-        if ( empty ( $this->primarykeys ) )
+        if (empty ($this->primarykeys))
         {
-            $this->primarykeys = array_filter ( $this->columns , function ( $column ){ return $column->isPrimaryKey (); } );
+            $this->primarykeys = array_filter($this->columns, function($column) { return $column->isPrimaryKey(); } );
         }
 
         return $this->primarykeys;
@@ -119,25 +119,25 @@ 
     /**
      * @return bool
      */
-    public function hasPrimaryKey ()
+    public function hasPrimaryKey()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->getPrimaryKeys ();
+            $this->getPrimaryKeys();
         }
 
-        return ! empty ( $this->sequence );
+        return ! empty ($this->sequence);
     }
 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getForeingkeys ()
+    public function getForeingkeys()
     {
 
-        if ( empty ( $this->foreingkeys ) )
+        if (empty ($this->foreingkeys))
         {
-            $this->foreingkeys = array_filter ( $this->columns , function ( $column ){ return $column->isForeingkey (); } );
+            $this->foreingkeys = array_filter($this->columns, function($column) { return $column->isForeingkey(); } );
         }
 
         return $this->foreingkeys;
@@ -147,11 +147,11 @@ 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getDependences ()
+    public function getDependences()
     {
-        if ( empty ( $this->dependence ) )
+        if (empty ($this->dependence))
         {
-            $this->dependence = array_filter ( $this->columns , function ( $column ){ return $column->hasDependence (); } );
+            $this->dependence = array_filter($this->columns, function($column) { return $column->hasDependence(); } );
         }
 
         return $this->dependence;
@@ -160,11 +160,11 @@ 
     /**
      * @return string[]
      */
-    public function getSequences ()
+    public function getSequences()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->sequence = array_filter ( $this->columns , function ( $column ){ return $column->hasSequence (); } );
+            $this->sequence = array_filter($this->columns, function($column) { return $column->hasSequence(); } );
         }
 
         return $this->sequence;
@@ -173,20 +173,20 @@ 
     /**
      * @return bool
      */
-    public function hasSequences ()
+    public function hasSequences()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->getSequences ();
+            $this->getSequences();
         }
 
-        return ! empty ( $this->sequence );
+        return ! empty ($this->sequence);
     }
 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getColumns ()
+    public function getColumns()
     {
         return $this->columns;
     }
@@ -194,7 +194,7 @@ 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
@@ -202,7 +202,7 @@ 
     /**
      * @return string
      */
-    public function getSchema ()
+    public function getSchema()
     {
         return $this->schema;
     }
@@ -210,7 +210,7 @@ 
     /**
      * @return bool
      */
-    public function hasSchema ()
+    public function hasSchema()
     {
         return (bool) $this->schema;
     }
@@ -218,7 +218,7 @@ 
     /**
      * @return string
      */
-    public function getDatabase ()
+    public function getDatabase()
     {
         return $this->database;
     }
@@ -226,7 +226,7 @@ 
     /**
      * @return string
      */
-    public function getNamespace ()
+    public function getNamespace()
     {
         return $this->namespace;
     }
@@ -234,7 +234,7 @@ 
     /**
      * @param string $Namespace
      */
-    public function setNamespace ( $namespace )
+    public function setNamespace($namespace)
     {
         $this->namespace = $namespace;
     }

build/Classes/Db/Column.php

Spacing +36 added lines, -36 removed lines

@@ -16,7 +16,7 @@ 
      *
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    public function __construct ()
+    public function __construct()
     {
     }
 
@@ -68,7 +68,7 @@ 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
@@ -78,12 +78,12 @@ 
      *
      * @param $array
      */
-    public function populate ( $array )
+    public function populate($array)
     {
-        $this->name = $array[ 'name' ];
-        $this->type = $array[ 'type' ];
-        $this->nullable = $array[ 'nullable' ];
-        $this->max_length = $array[ 'max_length' ];
+        $this->name = $array['name'];
+        $this->type = $array['type'];
+        $this->nullable = $array['nullable'];
+        $this->max_length = $array['max_length'];
 
         return $this;
     }
@@ -91,31 +91,31 @@ 
     /**
      * @return boolean
      */
-    public function isPrimaryKey ()
+    public function isPrimaryKey()
     {
-        return ! empty( $this->primarykey );
+        return ! empty($this->primarykey);
     }
 
     /**
      * @return boolean
      */
-    public function isForeingkey ()
+    public function isForeingkey()
     {
-        return ! empty( $this->refForeingkey );
+        return ! empty($this->refForeingkey);
     }
 
     /**
      * @return boolean
      */
-    public function hasDependence ()
+    public function hasDependence()
     {
-        return ! empty( $this->dependences );
+        return ! empty($this->dependences);
     }
 
     /**
      * @return string
      */
-    public function getType ()
+    public function getType()
     {
         return $this->type;
     }
@@ -123,7 +123,7 @@ 
     /**
      * @return string
      */
-    public function getComment ()
+    public function getComment()
     {
         return $this->comment;
     }
@@ -131,7 +131,7 @@ 
     /**
      * @param string $comment
      */
-    public function setComment ( $comment )
+    public function setComment($comment)
     {
         $this->comment = $comment;
 
@@ -141,7 +141,7 @@ 
     /**
      * @param \Classes\Db\Constrant $primarykey
      */
-    public function setPrimaryKey ( Constrant $primarykey )
+    public function setPrimaryKey(Constrant $primarykey)
     {
         $this->primarykey = $primarykey;
 
@@ -151,7 +151,7 @@ 
     /**
      * @param \Classes\Db\Constrant $dependece
      */
-    public function addDependece ( Constrant $dependece )
+    public function addDependece(Constrant $dependece)
     {
         $this->dependences[] = $dependece;
 
@@ -165,19 +165,19 @@ 
      *
      * @return $this
      */
-    public function createDependece ( $constraint_name , $table_name , $column_name , $schema = null )
+    public function createDependece($constraint_name, $table_name, $column_name, $schema = null)
     {
         $objConstrantDependence = new Constrant();
-        $objConstrantDependence->populate (
-            array (
-                'constrant' => $constraint_name ,
-                'schema'    => $schema ,
-                'table'     => $table_name ,
+        $objConstrantDependence->populate(
+            array(
+                'constrant' => $constraint_name,
+                'schema'    => $schema,
+                'table'     => $table_name,
                 'column'    => $column_name
             )
         );
 
-        $this->addDependece ( $objConstrantDependence );
+        $this->addDependece($objConstrantDependence);
 
         return $this;
     }
@@ -185,7 +185,7 @@ 
     /**
      * @param \Classes\Db\Constrant $reference
      */
-    public function addRefFk ( Constrant $reference )
+    public function addRefFk(Constrant $reference)
     {
         $this->refForeingkey = $reference;
 
@@ -197,7 +197,7 @@ 
      *
      * @return \Classes\Db\Constrant
      */
-    public function getFks ()
+    public function getFks()
     {
         return $this->refForeingkey;
     }
@@ -207,7 +207,7 @@ 
      *
      * @return \Classes\Db\Constrant[]
      */
-    public function getDependences ()
+    public function getDependences()
     {
         return $this->dependences;
     }
@@ -215,9 +215,9 @@ 
     /**
      * @return bool
      */
-    public function hasDependences ()
+    public function hasDependences()
     {
-        return (bool) count ( $this->dependences );
+        return (bool) count($this->dependences);
     }
 
     /**
@@ -225,7 +225,7 @@ 
      *
      * @return \Classes\Db\Constrant[]
      */
-    public function getPrimaryKey ()
+    public function getPrimaryKey()
     {
         return $this->primarykey;
     }
@@ -233,7 +233,7 @@ 
     /**
      *
      */
-    public function getMaxLength ()
+    public function getMaxLength()
     {
         return $this->max_length;
     }
@@ -241,7 +241,7 @@ 
     /**
      * @return bool
      */
-    public function hasSequence ()
+    public function hasSequence()
     {
         return (bool) $this->sequence;
     }
@@ -249,7 +249,7 @@ 
     /**
      * @return string
      */
-    public function getSequence ()
+    public function getSequence()
     {
         return $this->sequence;
     }
@@ -257,7 +257,7 @@ 
     /**
      * @param string $sequence
      */
-    public function setSequence ( $sequence )
+    public function setSequence($sequence)
     {
         $this->sequence = $sequence;
     }
@@ -265,7 +265,7 @@ 
     /**
      * @return boolean
      */
-    public function isNullable ()
+    public function isNullable()
     {
         return $this->nullable;
     }