pedro151 / orm-generator

build/Classes/templates/zf1/dbtable.php

Spacing +16 added lines, -16 removed lines

@@ -3,21 +3,21 @@ 
 /**
  * Application Model DbTables
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * Tabela definida por 'tablename'
  *
  * @package   <?=$objTables->getNamespace()?><?="\n"?>
  * @subpackage DbTable
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
- * @version   <?=$this->config->version."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
+ * @version   <?=$this->config->version . "\n"?>
  */
 
-class <?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends <?=$this->config->namespace?$this->config->namespace."_":""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
+class <?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
 {
     /**
      * Nome da tabela do banco de dados
@@ -26,7 +26,7 @@ 
      * @access protected
      */
     protected $_name = '<?=$objTables->getName()?>';
-<?php if($objTables->hasSchema()): ?>
+<?php if ($objTables->hasSchema()): ?>
 
     /**
      * Schema da tabela do banco de dados
@@ -43,9 +43,9 @@ 
      * @var string
      * @access protected
      */
-    protected $_rowClass = '<?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?>';
+    protected $_rowClass = '<?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?>';
 
-<?php if( $objTables->hasPrimaryKey() ):?>
+<?php if ($objTables->hasPrimaryKey()):?>
 	/**
      * Nome da Primary Key
      *
@@ -53,12 +53,12 @@ 
      * @access protected
      */
     protected $_primary = array(
-<?php foreach($objTables->getPrimaryKeys() as $pks):?>
+<?php foreach ($objTables->getPrimaryKeys() as $pks):?>
         '<?=$pks->getName()?>',
 <?php endforeach; ?>
     );
 <?php endif ?>
-<?php if($this->config->{'folder-name'}):?>
+<?php if ($this->config->{'folder-name'}):?>
     /**
     * Initialize database adapter.
     *
@@ -73,7 +73,7 @@ 
         parent::_setupDatabaseAdapter();
     }
 <?php endif ?>
-<?php if( $objTables->hasSequences() ) : ?>
+<?php if ($objTables->hasSequences()) : ?>
 
 	/**
      * Definir a lógica para os novos valores na chave primária.
@@ -81,9 +81,9 @@ 
      *
      * @var mixed
      */
-<?php if ( 1 ==  count($objTables->getSequences() ) ) : ?>
-<?php if(strpos($this->config->driver, 'pgsql')): ?>
-<?php $seqs = $objTables->getSequences();reset($seqs);$seq = current($seqs);?>
+<?php if (1 == count($objTables->getSequences())) : ?>
+<?php if (strpos($this->config->driver, 'pgsql')): ?>
+<?php $seqs = $objTables->getSequences(); reset($seqs); $seq = current($seqs); ?>
     protected $_sequence = '<?=$seq->getSequence() ?>';
 <?php else: ?>
     protected $_sequence = true;

build/Classes/AdapterMakerFile/Phalcon/Peer.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     protected $parentFileTpl = "peer_abstract.php";
     protected $fileTpl       = "peer.php";
 
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
-        return array ();
+        return array();
     }
 }

build/Classes/AdaptersDriver/AbsractAdapter.php

Doc Comments +3 added lines, -3 removed lines

@@ -200,7 +200,7 @@ 
     /**
      * Retorna o Nome da Sequence da tabela
      *
-     * @param $table
+     * @param string $table
      * @param $column
      *
      * @return string
@@ -249,7 +249,7 @@ 
      * @param     $nameTable
      * @param int $schema
      *
-     * @return \Classes\Db\DbTable
+     * @return AbsractAdapter
      */
     public function createTable ( $nameTable, $schema = 0 )
     {
@@ -303,7 +303,7 @@ 
 
     /**
      * @param string     $nameTable
-     * @param int|string $schema
+     * @param integer $schema
      *
      * @return bool
      */

Indentation +36 added lines, -36 removed lines

@@ -115,32 +115,32 @@ 
             if ( $table->hasColumn ( $constrant[ "column_name" ] ) )
             {
                 $objConstrant = Constrant::getInstance ()
-                                         ->populate (
-                                             array (
-                                                 'constrant' => $constrant[ 'constraint_name' ] ,
-                                                 'schema'    => $constrant[ 'foreign_schema' ] ,
-                                                 'table'     => $constrant[ 'foreign_table' ] ,
-                                                 'column'    => $constrant[ 'foreign_column' ] ,
-                                                 'database'  => $this->database
-                                             )
-                                         );
+                                            ->populate (
+                                                array (
+                                                    'constrant' => $constrant[ 'constraint_name' ] ,
+                                                    'schema'    => $constrant[ 'foreign_schema' ] ,
+                                                    'table'     => $constrant[ 'foreign_table' ] ,
+                                                    'column'    => $constrant[ 'foreign_column' ] ,
+                                                    'database'  => $this->database
+                                                )
+                                            );
 
                 switch ( $constrant[ 'constraint_type' ] )
                 {
                     case "FOREIGN KEY":
                         $table->getColumn ( $constrant[ "column_name" ] )
-                              ->addRefFk ( $objConstrant );
+                                ->addRefFk ( $objConstrant );
                         break;
                     case"PRIMARY KEY":
                         $table->getColumn ( $constrant[ "column_name" ] )
-                              ->setPrimaryKey ( $objConstrant )
-                              ->setSequence (
-                                  $this->getSequence (
-                                      $table_name ,
-                                      $constrant[ "column_name" ] ,
-                                      $schema
-                                  )
-                              );
+                                ->setPrimaryKey ( $objConstrant )
+                                ->setSequence (
+                                    $this->getSequence (
+                                        $table_name ,
+                                        $constrant[ "column_name" ] ,
+                                        $schema
+                                    )
+                                );
                         break;
                 }
             }
@@ -160,13 +160,13 @@ 
             if ( $table->hasColumn ( $constrant[ "foreign_column" ] ) )
             {
                 $table->getColumn ( $constrant[ "foreign_column" ] )
-                      ->createDependece (
-                          $constrant[ 'constraint_name' ] ,
-                          $constrant[ 'table_name' ] ,
-                          $constrant[ 'column_name' ] ,
-                          $this->database ,
-                          $constrant[ 'table_schema' ]
-                      );
+                        ->createDependece (
+                            $constrant[ 'constraint_name' ] ,
+                            $constrant[ 'table_name' ] ,
+                            $constrant[ 'column_name' ] ,
+                            $this->database ,
+                            $constrant[ 'table_schema' ]
+                        );
             }
         }
     }
@@ -201,10 +201,10 @@ 
                             );
 
             $this->getTable ( $key , $schema )
-                 ->addColumn ( $column )
-                 ->setNamespace (
-                     $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
-                 );
+                    ->addColumn ( $column )
+                    ->setNamespace (
+                        $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
+                    );
         }
     }
 
@@ -279,13 +279,13 @@ 
         }
 
         $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
-                                                                              'table'    => $nameTable ,
-                                                                              'schema'   => $schema ,
-                                                                              'database' => $this->database
-                                                                          )
-                                                                      );
+                                                                        ->populate (
+                                                                            array (
+                                                                                'table'    => $nameTable ,
+                                                                                'schema'   => $schema ,
+                                                                                'database' => $this->database
+                                                                            )
+                                                                        );
 
         return $this;
     }

Spacing +115 added lines, -115 removed lines

@@ -67,7 +67,7 @@ 
     /**
      * @type \Classes\Db\Iterators\DbTables[]
      */
-    private $objDbTables = array ();
+    private $objDbTables = array();
 
     /**
      * @var AbstractAdapter
@@ -82,22 +82,22 @@ 
     /**
      * analisa e popula as Foreing keys, Primary keys e dependencias do banco nos objetos
      */
-    protected function parseConstrants ()
+    protected function parseConstrants()
     {
-        foreach ( $this->getListConstrant () as $constrant )
+        foreach ($this->getListConstrant() as $constrant)
         {
 
-            $schema = $constrant[ 'table_schema' ];
-            $table_name = $constrant [ 'table_name' ];
-            $this->populateForeignAndPrimaryKeys ( $constrant , $table_name , $schema );
-            unset( $table_name , $schema );
+            $schema = $constrant['table_schema'];
+            $table_name = $constrant ['table_name'];
+            $this->populateForeignAndPrimaryKeys($constrant, $table_name, $schema);
+            unset($table_name, $schema);
 
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY" )
+            if ($constrant['constraint_type'] == "FOREIGN KEY")
             {
-                $schema = $constrant[ 'foreign_schema' ];
-                $table_name = $constrant [ 'foreign_table' ];
-                $this->populateDependece ( $constrant , $table_name , $schema );
-                unset( $table_name , $schema );
+                $schema = $constrant['foreign_schema'];
+                $table_name = $constrant ['foreign_table'];
+                $this->populateDependece($constrant, $table_name, $schema);
+                unset($table_name, $schema);
             }
         }
     }
@@ -107,37 +107,37 @@ 
      * @param string $table_name
      * @param int    $schema
      */
-    private function populateForeignAndPrimaryKeys ( $constrant , $table_name , $schema = 0 )
+    private function populateForeignAndPrimaryKeys($constrant, $table_name, $schema = 0)
     {
-        if ( $this->hasTable ( $table_name , $schema ) )
+        if ($this->hasTable($table_name, $schema))
         {
-            $table = $this->getTable ( $table_name , $schema );
-            if ( $table->hasColumn ( $constrant[ "column_name" ] ) )
+            $table = $this->getTable($table_name, $schema);
+            if ($table->hasColumn($constrant["column_name"]))
             {
-                $objConstrant = Constrant::getInstance ()
-                                         ->populate (
-                                             array (
-                                                 'constrant' => $constrant[ 'constraint_name' ] ,
-                                                 'schema'    => $constrant[ 'foreign_schema' ] ,
-                                                 'table'     => $constrant[ 'foreign_table' ] ,
-                                                 'column'    => $constrant[ 'foreign_column' ] ,
+                $objConstrant = Constrant::getInstance()
+                                         ->populate(
+                                             array(
+                                                 'constrant' => $constrant['constraint_name'],
+                                                 'schema'    => $constrant['foreign_schema'],
+                                                 'table'     => $constrant['foreign_table'],
+                                                 'column'    => $constrant['foreign_column'],
                                                  'database'  => $this->database
                                              )
                                          );
 
-                switch ( $constrant[ 'constraint_type' ] )
+                switch ($constrant['constraint_type'])
                 {
                     case "FOREIGN KEY":
-                        $table->getColumn ( $constrant[ "column_name" ] )
-                              ->addRefFk ( $objConstrant );
+                        $table->getColumn($constrant["column_name"])
+                              ->addRefFk($objConstrant);
                         break;
                     case"PRIMARY KEY":
-                        $table->getColumn ( $constrant[ "column_name" ] )
-                              ->setPrimaryKey ( $objConstrant )
-                              ->setSequence (
-                                  $this->getSequence (
-                                      $table_name ,
-                                      $constrant[ "column_name" ] ,
+                        $table->getColumn($constrant["column_name"])
+                              ->setPrimaryKey($objConstrant)
+                              ->setSequence(
+                                  $this->getSequence(
+                                      $table_name,
+                                      $constrant["column_name"],
                                       $schema
                                   )
                               );
@@ -152,20 +152,20 @@ 
      * @param string $table_name
      * @param int    $schema
      */
-    private function populateDependece ( $constrant , $table_name , $schema = 0 )
+    private function populateDependece($constrant, $table_name, $schema = 0)
     {
-        if ( $this->hasTable ( $table_name , $schema ) )
+        if ($this->hasTable($table_name, $schema))
         {
-            $table = $this->getTable ( $table_name , $schema );
-            if ( $table->hasColumn ( $constrant[ "foreign_column" ] ) )
+            $table = $this->getTable($table_name, $schema);
+            if ($table->hasColumn($constrant["foreign_column"]))
             {
-                $table->getColumn ( $constrant[ "foreign_column" ] )
-                      ->createDependece (
-                          $constrant[ 'constraint_name' ] ,
-                          $constrant[ 'table_name' ] ,
-                          $constrant[ 'column_name' ] ,
-                          $this->database ,
-                          $constrant[ 'table_schema' ]
+                $table->getColumn($constrant["foreign_column"])
+                      ->createDependece(
+                          $constrant['constraint_name'],
+                          $constrant['table_name'],
+                          $constrant['column_name'],
+                          $this->database,
+                          $constrant['table_schema']
                       );
             }
         }
@@ -174,36 +174,36 @@ 
     /**
      * cria um Array com nome das tabelas
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( $this->hasTables () )
+        if ($this->hasTables())
         {
-            return $this->getAllTables ();
+            return $this->getAllTables();
         }
 
-        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);
             }
 
-            $column = Column::getInstance ()
-                            ->populate (
-                                array (
-                                    'name'       => $table [ 'column_name' ] ,
-                                    'type'       => $this->convertTypeToSimple ( $table[ 'data_type' ] ) ,
-                                    'nullable'   => (is_string($table[ 'is_nullable' ]) && strtolower($table[ 'is_nullable' ]) != 'no' ) ,
-                                    'max_length' => $table[ 'max_length' ]
+            $column = Column::getInstance()
+                            ->populate(
+                                array(
+                                    'name'       => $table ['column_name'],
+                                    'type'       => $this->convertTypeToSimple($table['data_type']),
+                                    'nullable'   => (is_string($table['is_nullable']) && strtolower($table['is_nullable']) != 'no'),
+                                    'max_length' => $table['max_length']
                                 )
                             );
 
-            $this->getTable ( $key , $schema )
-                 ->addColumn ( $column )
-                 ->setNamespace (
-                     $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
+            $this->getTable($key, $schema)
+                 ->addColumn($column)
+                 ->setNamespace(
+                     $this->config->createClassNamespace($this->getTable($key, $schema))
                  );
         }
     }
@@ -213,7 +213,7 @@ 
      *
      * @return int
      */
-    abstract public function getTotalTables ();
+    abstract public function getTotalTables();
 
     /**
      * Retorna o Nome da Sequence da tabela
@@ -223,33 +223,33 @@ 
      *
      * @return string
      */
-    abstract public function getSequence ( $table , $column , $schema = 0 );
+    abstract public function getSequence($table, $column, $schema = 0);
 
     /**
      * @return array
      */
-    abstract public function getListConstrant ();
+    abstract public function getListConstrant();
 
     /**
      * @param string $str
      *
      * @return string
      */
-    protected function convertTypeToPhp ( $str )
+    protected function convertTypeToPhp($str)
     {
-        if ( isset( $this->dataTypesToPhp[ $str ] ) )
+        if (isset($this->dataTypesToPhp[$str]))
         {
-            return $this->dataTypesToPhp[ $str ];
+            return $this->dataTypesToPhp[$str];
         }
 
         return 'string';
     }
 
-    protected function convertTypeToSimple ( $str )
+    protected function convertTypeToSimple($str)
     {
-        if ( isset( $this->dataTypesToSimple[ $str ] ) )
+        if (isset($this->dataTypesToSimple[$str]))
         {
-            return $this->dataTypesToSimple[ $str ];
+            return $this->dataTypesToSimple[$str];
         }
 
         return 'string';
@@ -258,12 +258,12 @@ 
     /**
      * @return string
      */
-    abstract public function getPDOString ();
+    abstract public function getPDOString();
 
     /**
      * @return string
      */
-    abstract public function getPDOSocketString ();
+    abstract public function getPDOSocketString();
 
     /**
      * @param     $nameTable
@@ -271,18 +271,18 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function createTable ( $nameTable , $schema = 0 )
+    public function createTable($nameTable, $schema = 0)
     {
-        if ( ! isset( $this->objDbTables[ $schema ] ) )
+        if ( ! isset($this->objDbTables[$schema]))
         {
-            $this->objDbTables[ $schema ] = new DbTables();
+            $this->objDbTables[$schema] = new DbTables();
         }
 
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
-                                                                              'table'    => $nameTable ,
-                                                                              'schema'   => $schema ,
+        $this->objDbTables[$schema][trim($nameTable)] = DbTable::getInstance()
+                                                                      ->populate(
+                                                                          array(
+                                                                              'table'    => $nameTable,
+                                                                              'schema'   => $schema,
                                                                               'database' => $this->database
                                                                           )
                                                                       );
@@ -295,24 +295,24 @@ 
      *
      * @return \Classes\Db\Iterators\DbTables
      */
-    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];
     }
 
-    public function getAllTables ()
+    public function getAllTables()
     {
         return $this->objDbTables;
     }
 
-    public function hasTables ()
+    public function hasTables()
     {
-        return ! empty( $this->objDbTables );
+        return ! empty($this->objDbTables);
     }
 
     /**
@@ -322,9 +322,9 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function getTable ( $nameTable , $schema = 0 )
+    public function getTable($nameTable, $schema = 0)
     {
-        return $this->objDbTables[ $schema ][ trim ( $nameTable ) ];
+        return $this->objDbTables[$schema][trim($nameTable)];
     }
 
     /**
@@ -333,9 +333,9 @@ 
      *
      * @return bool
      */
-    public function hasTable ( $nameTable , $schema = 0 )
+    public function hasTable($nameTable, $schema = 0)
     {
-        return isset( $this->objDbTables[ $schema ][ trim ( $nameTable ) ] );
+        return isset($this->objDbTables[$schema][trim($nameTable)]);
     }
 
     /**
@@ -343,66 +343,66 @@ 
      *
      * @return array[]
      */
-    abstract public function getListColumns ();
+    abstract public function getListColumns();
 
     /**
      * Retorna um Array com nome das tabelas
      *
      * @return string[]
      */
-    abstract public function getListNameTable ();
+    abstract public 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->tablesName = $adapterConfig->hasTablesName ()
-            ? $adapterConfig->getListTablesName () : '';
+        $this->username = $adapterConfig->getUser();
+        $this->password = $adapterConfig->getPassword();
+        $this->socket = $adapterConfig->getSocket();
+        $this->tablesName = $adapterConfig->hasTablesName()
+            ? $adapterConfig->getListTablesName() : '';
 
     }
 
     /**
      * Executa as consultas do banco de dados
      */
-    public function runDatabase ()
+    public function runDatabase()
     {
-        $this->parseTables ();
-        $this->parseConstrants ();
+        $this->parseTables();
+        $this->parseConstrants();
     }
 
     /**
      *
      * @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 ( "\033[0;31mPDO error: " . $e->getMessage () . "\033[0m\n" );
+                die ("\033[0;31mPDO error: " . $e->getMessage() . "\033[0m\n");
             }
         }
 

build/Classes/Db/Column.php

Doc Comments +2 added lines, -1 removed lines

@@ -150,7 +150,7 @@ 
     /**
      * @param AbstractAdapter $type
      *
-     * @return mixed
+     * @return string
      */
     public function getTypeByConfig ( AbstractAdapter $type )
     {
@@ -199,6 +199,7 @@ 
      * @param $constraint_name
      * @param $table_name
      * @param $column_name
+     * @param string $database
      *
      * @return $this
      */

Indentation +9 added lines, -9 removed lines

@@ -205,15 +205,15 @@
     public function createDependece ( $constraint_name, $table_name, $column_name, $database, $schema = null )
     {
         $objConstrantDependence = Constrant::getInstance ()
-                                           ->populate (
-                                               array (
-                                                   'constrant' => $constraint_name,
-                                                   'schema'    => $schema,
-                                                   'table'     => $table_name,
-                                                   'column'    => $column_name,
-                                                   'database'  => $database
-                                               )
-                                           );
+                                            ->populate (
+                                                array (
+                                                    'constrant' => $constraint_name,
+                                                    'schema'    => $schema,
+                                                    'table'     => $table_name,
+                                                    'column'    => $column_name,
+                                                    'database'  => $database
+                                                )
+                                            );
 
         $this->addDependece ( $objConstrantDependence );
 

Spacing +41 added lines, -41 removed lines

@@ -18,7 +18,7 @@ 
      *
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    final private function __construct ()
+    final private function __construct()
     {
     }
 
@@ -27,7 +27,7 @@ 
      *
      * @return \Classes\Db\Column
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
         return new Column();
     }
@@ -80,7 +80,7 @@ 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
@@ -90,12 +90,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;
     }
@@ -103,37 +103,37 @@ 
     /**
      * @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 ( $inPHP = true )
+    public function getType($inPHP = true)
     {
-        if ( !$inPHP ) {
+        if ( ! $inPHP) {
             return $this->type;
         }
 
-        return AbstractAdapter::convertTypeToPHP ( $this->type );
+        return AbstractAdapter::convertTypeToPHP($this->type);
     }
 
     /**
@@ -142,9 +142,9 @@ 
      *
      * @return bool
      */
-    public function equalType ( $type, $inPHP = true )
+    public function equalType($type, $inPHP = true)
     {
-        return $this->getType ( $inPHP ) === $type;
+        return $this->getType($inPHP) === $type;
     }
 
     /**
@@ -152,15 +152,15 @@ 
      *
      * @return mixed
      */
-    public function getTypeByConfig ( AbstractAdapter $type )
+    public function getTypeByConfig(AbstractAdapter $type)
     {
-        return $type->convertTypeToTypeFramework ( $this->getType ( false ) );
+        return $type->convertTypeToTypeFramework($this->getType(false));
     }
 
     /**
      * @return string
      */
-    public function getComment ()
+    public function getComment()
     {
         return $this->comment;
     }
@@ -168,7 +168,7 @@ 
     /**
      * @param string $comment
      */
-    public function setComment ( $comment )
+    public function setComment($comment)
     {
         $this->comment = $comment;
 
@@ -178,7 +178,7 @@ 
     /**
      * @param \Classes\Db\Constrant $primarykey
      */
-    public function setPrimaryKey ( Constrant $primarykey )
+    public function setPrimaryKey(Constrant $primarykey)
     {
         $this->primarykey = $primarykey;
 
@@ -188,7 +188,7 @@ 
     /**
      * @param \Classes\Db\Constrant $dependece
      */
-    public function addDependece ( Constrant $dependece )
+    public function addDependece(Constrant $dependece)
     {
         $this->dependences[] = $dependece;
 
@@ -202,11 +202,11 @@ 
      *
      * @return $this
      */
-    public function createDependece ( $constraint_name, $table_name, $column_name, $database, $schema = null )
+    public function createDependece($constraint_name, $table_name, $column_name, $database, $schema = null)
     {
-        $objConstrantDependence = Constrant::getInstance ()
-                                           ->populate (
-                                               array (
+        $objConstrantDependence = Constrant::getInstance()
+                                           ->populate(
+                                               array(
                                                    'constrant' => $constraint_name,
                                                    'schema'    => $schema,
                                                    'table'     => $table_name,
@@ -215,7 +215,7 @@ 
                                                )
                                            );
 
-        $this->addDependece ( $objConstrantDependence );
+        $this->addDependece($objConstrantDependence);
 
         return $this;
     }
@@ -223,7 +223,7 @@ 
     /**
      * @param \Classes\Db\Constrant $reference
      */
-    public function addRefFk ( Constrant $reference )
+    public function addRefFk(Constrant $reference)
     {
         $this->refForeingkey = $reference;
 
@@ -235,7 +235,7 @@ 
      *
      * @return \Classes\Db\Constrant
      */
-    public function getFks ()
+    public function getFks()
     {
         return $this->refForeingkey;
     }
@@ -245,7 +245,7 @@ 
      *
      * @return \Classes\Db\Constrant[]
      */
-    public function getDependences ()
+    public function getDependences()
     {
         return $this->dependences;
     }
@@ -253,9 +253,9 @@ 
     /**
      * @return bool
      */
-    public function hasDependences ()
+    public function hasDependences()
     {
-        return (bool) count ( $this->dependences );
+        return (bool) count($this->dependences);
     }
 
     /**
@@ -263,7 +263,7 @@ 
      *
      * @return \Classes\Db\Constrant[]
      */
-    public function getPrimaryKey ()
+    public function getPrimaryKey()
     {
         return $this->primarykey;
     }
@@ -271,7 +271,7 @@ 
     /**
      *
      */
-    public function getMaxLength ()
+    public function getMaxLength()
     {
         return $this->max_length;
     }
@@ -279,7 +279,7 @@ 
     /**
      * @return bool
      */
-    public function hasSequence ()
+    public function hasSequence()
     {
         return (bool) $this->sequence;
     }
@@ -287,7 +287,7 @@ 
     /**
      * @return string
      */
-    public function getSequence ()
+    public function getSequence()
     {
         return $this->sequence;
     }
@@ -295,7 +295,7 @@ 
     /**
      * @param string $sequence
      */
-    public function setSequence ( $sequence )
+    public function setSequence($sequence)
     {
         $this->sequence = $sequence;
     }
@@ -303,7 +303,7 @@ 
     /**
      * @return boolean
      */
-    public function isNullable ()
+    public function isNullable()
     {
         return $this->nullable;
     }

build/Classes/templates/phalcon/entity_abstract.php

Spacing +7 added lines, -7 removed lines

@@ -3,19 +3,19 @@
 /**
  * Mvc Model
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * @package   <?=$this->config->namespace?>\Models
  * @subpackage Model
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
- * @version   <?=$this->config->version."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
+ * @version   <?=$this->config->version . "\n"?>
  */
 
-namespace  <?=$this->config->namespace?$this->config->namespace."\\":""?>Models;
+namespace  <?=$this->config->namespace ? $this->config->namespace . "\\" : ""?>Models;
 
 abstract class AbstractPeer
 {

build/Classes/templates/phalcon/entity.php

Spacing +27 added lines, -27 removed lines

@@ -3,43 +3,43 @@ 
 /**
  * Mvc Model
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * @package   <?=$objTables->getNamespace()?>\Entity
  * @subpackage Model
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
- * @version   <?=$this->config->version."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
+ * @version   <?=$this->config->version . "\n"?>
  */
 
 namespace  <?=$objTables->getNamespace()?>\Entity;
 
 use Phalcon\Validation;
 
-abstract class <?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends \<?=$this->config->namespace?$this->config->namespace."\\":""?>Models\<?=$objMakeFile->getParentClass() . "\n"?>
+abstract class <?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends \<?=$this->config->namespace ? $this->config->namespace . "\\" : ""?>Models\<?=$objMakeFile->getParentClass() . "\n"?>
 {
 
 <?php foreach ($objTables->getColumns() as $column): ?>
     /**
-    * column <?=$column->getName()."\n"?>
+    * column <?=$column->getName() . "\n"?>
     *
-<?php if($column->isPrimaryKey()):?>
+<?php if ($column->isPrimaryKey()):?>
     * @Primary
 <?php endif ?>
-<?php if($column->hasSequence()):?>
+<?php if ($column->hasSequence()):?>
     * @Identity
 <?php endif ?>
-    * @Column(type="<?=$column->getTypeByConfig( $this->config )?>", nullable=<?=$column->isNullable () ? "true" : "false"?><?php
-if ( $column->getMaxLength () ): ?>
-, length=<?=$column->getMaxLength ()?>
+    * @Column(type="<?=$column->getTypeByConfig($this->config)?>", nullable=<?=$column->isNullable() ? "true" : "false"?><?php
+if ($column->getMaxLength()): ?>
+, length=<?=$column->getMaxLength()?>
 <?php endif ?>, column="<?=$column->getName()?>" )
     */
     protected $<?=$column->getName()?>;
 
-<?php endforeach;?>
+<?php endforeach; ?>
     /**
      * Validations and business logic
      *
@@ -50,14 +50,14 @@ 
         $validator = new Validation();
 
 <?php foreach ($objTables->getColumns() as $column): ?>
-<?php if(strtolower($column->getName()) == 'email'):?>
+<?php if (strtolower($column->getName()) == 'email'):?>
         $validator->add(
             'email',
             new \Phalcon\Validation\Validator\Email()
         );
 
 <?php endif ?>
-<?php endforeach;?>
+<?php endforeach; ?>
         return $this->validate($validator);
     }
 
@@ -66,11 +66,11 @@ 
      */
     public function initialize()
     {
-        <?=$mapDependents."\n"?>
-        <?=$mapParents."\n"?>
+        <?=$mapDependents . "\n"?>
+        <?=$mapParents . "\n"?>
     }
 
-<?php if($objTables->hasSchema()): ?>
+<?php if ($objTables->hasSchema()): ?>
     /**
      * Returns schema name where table mapped is located
      *
@@ -92,28 +92,28 @@ 
         return '<?=$objTables->getName()?>';
     }
 
-<?php if( $objTables->hasSequences() ) : ?>
+<?php if ($objTables->hasSequences()) : ?>
     public function getSequenceName()
     {
-<?php if ( 1 ==  count($objTables->getSequences() ) ) : ?>
-    <?php $seqs = $objTables->getSequences();reset($seqs);$seq = current($seqs);?>
+<?php if (1 == count($objTables->getSequences())) : ?>
+    <?php $seqs = $objTables->getSequences(); reset($seqs); $seq = current($seqs); ?>
         return "<?=$seq->getSequence() ?>";
 <?php endif ?>
     }
 
 <?php endif ?>
 <?php foreach ($objTables->getColumns() as $column): ?>
-    public function set<?=$this->getClassName ( $column->getName () )?>( $<?=$column->getName()?> )
+    public function set<?=$this->getClassName($column->getName())?>( $<?=$column->getName()?> )
     {
         $this-><?=$column->getName()?> = $<?=$column->getName()?>;
     }
 
     /**
-    * @return <?=$column->getType ()."\n" ?>
+    * @return <?=$column->getType() . "\n" ?>
     **/
-    public function get<?=$this->getClassName ( $column->getName () )?>()
+    public function get<?=$this->getClassName($column->getName())?>()
     {
-        return (<?=$column->getType () ?>) $this-><?=$column->getName()?>;
+        return (<?=$column->getType() ?>) $this-><?=$column->getName()?>;
     }
-<?php endforeach;?>
+<?php endforeach; ?>
 }
\ No newline at end of file

build/Classes/AdaptersDriver/Mysql.php

Braces +7 added lines, -14 removed lines

@@ -35,26 +35,19 @@
         $res = '';
         if ( preg_match ( '/(tinyint\(1\)|bit)/', $str ) ) {
             $res = 'boolean';
-        }
-        elseif ( preg_match ( '/(timestamp|blob|char|enum)/', $str ) ) {
+        } elseif ( preg_match ( '/(timestamp|blob|char|enum)/', $str ) ) {
             $res = 'string';
-        }
-        elseif ( preg_match ( '/(text)/', $str ) ) {
+        } elseif ( preg_match ( '/(text)/', $str ) ) {
             $res = 'text';
-        }
-        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 ];
-        }
-        elseif ( preg_match ( '/(date)/', $str ) ) {
+        } elseif ( preg_match ( '/(date)/', $str ) ) {
             $res = 'date';
-        }
-        elseif ( preg_match ( '/(datetime)/', $str ) ) {
+        } elseif ( preg_match ( '/(datetime)/', $str ) ) {
             $res = 'datetime';
-        }
-        else {
+        } else {
             print "Can't convert column type to Simple - Unrecognized type: $str";
         }
 

Indentation +8 added lines, -8 removed lines

@@ -174,10 +174,10 @@ 
             $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
 
             $this->totalTables = $this->getPDO ()
-                                      ->query (
-                                          "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}' $sqlTables"
-                                      )
-                                      ->fetchColumn ();
+                                        ->query (
+                                            "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}' $sqlTables"
+                                        )
+                                        ->fetchColumn ();
         }
 
         return (int) $this->totalTables;
@@ -194,10 +194,10 @@ 
     public function getSequence ( $table, $column, $schema = 0 )
     {
         $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 ) {
             return;

Spacing +39 added lines, -39 removed lines

@@ -30,28 +30,28 @@ 
      *
      * @return string
      */
-    protected function convertTypeToSimple ( $str )
+    protected function convertTypeToSimple($str)
     {
         $res = '';
-        if ( preg_match ( '/(tinyint\(1\)|bit)/', $str ) ) {
+        if (preg_match('/(tinyint\(1\)|bit)/', $str)) {
             $res = 'boolean';
         }
-        elseif ( preg_match ( '/(timestamp|blob|char|enum)/', $str ) ) {
+        elseif (preg_match('/(timestamp|blob|char|enum)/', $str)) {
             $res = 'string';
         }
-        elseif ( preg_match ( '/(text)/', $str ) ) {
+        elseif (preg_match('/(text)/', $str)) {
             $res = 'text';
         }
-        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 ) ) {
-            $res = $matches[ 1 ];
+        elseif (preg_match('#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#', $str, $matches)) {
+            $res = $matches[1];
         }
-        elseif ( preg_match ( '/(date)/', $str ) ) {
+        elseif (preg_match('/(date)/', $str)) {
             $res = 'date';
         }
-        elseif ( preg_match ( '/(datetime)/', $str ) ) {
+        elseif (preg_match('/(datetime)/', $str)) {
             $res = 'datetime';
         }
         else {
@@ -65,9 +65,9 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
+        return sprintf(
             "mysql:host=%s;port=%s;dbname=%s",
             $this->host,
             $this->port,
@@ -80,9 +80,9 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
+        return sprintf(
             "mysql:unix_socket=%s;dbname=%s",
             $this->socket,
             $this->database
@@ -94,14 +94,14 @@ 
      * @inheritDoc
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) ) {
-            $this->tableList = $this->getPDO ()
-                                    ->query (
+        if (empty($this->tableList)) {
+            $this->tableList = $this->getPDO()
+                                    ->query(
                                         "show tables"
                                     )
-                                    ->fetchAll ();
+                                    ->fetchAll();
         }
 
         return $this->tableList;
@@ -112,12 +112,12 @@ 
      *
      * @return array[]
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
-        $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
+        $sqlTables = ! empty($this->tablesName) ? "AND table_name IN ( $this->tablesName )" : '';
 
-        return $this->getPDO ()
-                    ->query (
+        return $this->getPDO()
+                    ->query(
                         "select
                 0 AS table_schema,
                 table_name,
@@ -129,18 +129,18 @@ 
             where table_schema IN ('{$this->database}') $sqlTables
             order by table_name,ordinal_position"
                     )
-                    ->fetchAll ( \PDO::FETCH_ASSOC );
+                    ->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
      * @return array
      */
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        $sqlTables = !empty($this->tablesName)?"AND k.table_name IN ( $this->tablesName )":'';
+        $sqlTables = ! empty($this->tablesName) ? "AND k.table_name IN ( $this->tablesName )" : '';
 
-        return $this->getPDO ()
-                    ->query (
+        return $this->getPDO()
+                    ->query(
                         "SELECT distinct
      i.constraint_type,
      k.constraint_name,
@@ -159,7 +159,7 @@ 
 i.TABLE_SCHEMA IN ('{$this->database}') AND i.CONSTRAINT_TYPE IN ('FOREIGN KEY', 'PRIMARY KEY' ) $sqlTables
 order by k.table_schema, k.table_name;"
                     )
-                    ->fetchAll ( \PDO::FETCH_ASSOC );
+                    ->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
@@ -167,17 +167,17 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) ) {
+        if (empty($this->totalTables)) {
 
-            $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
+            $sqlTables = ! empty($this->tablesName) ? "AND table_name IN ( $this->tablesName )" : '';
 
-            $this->totalTables = $this->getPDO ()
-                                      ->query (
+            $this->totalTables = $this->getPDO()
+                                      ->query(
                                           "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}' $sqlTables"
                                       )
-                                      ->fetchColumn ();
+                                      ->fetchColumn();
         }
 
         return (int) $this->totalTables;
@@ -191,15 +191,15 @@ 
      *
      * @return string
      */
-    public function getSequence ( $table, $column, $schema = 0 )
+    public function getSequence($table, $column, $schema = 0)
     {
-        $return = $this->getPDO ()
-                       ->query (
+        $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 );
+                       ->fetch(\PDO::FETCH_ASSOC);
 
-        if ( !$return ) {
+        if ( ! $return) {
             return;
         }
 

build/Classes/MakerFile.php

Indentation +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
     {
         foreach ( $arrFoldersName as $index => $folderName ) {
             $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+                                                ->replaceReservedWord ( $folderName );
         }
 
         return implode ( DIRECTORY_SEPARATOR, array_filter ( $arrFoldersName ) );
@@ -141,7 +141,7 @@ 
                 $folderName,
                 $this->getClassName (
                     $this->getConfig ()
-                         ->getDatabase ()
+                            ->getDatabase ()
                 )
             );
             $this->location = array ( $this->filterLocation ( $url ) );
@@ -273,7 +273,7 @@ 
      * @return String
      */
     protected function getParsedTplContents ( $tplFile, $vars = array (), \Classes\Db\DbTable $objTables = null,
-                                              $objMakeFile = null )
+                                                $objMakeFile = null )
     {
 
         $arrUrl = array (

Doc Comments +5 added lines

@@ -99,6 +99,7 @@ 
 
     /**
      * Analisa os caminhos das pastas base
+     * @param string $basePath
      */
     public function parseLocation ( $basePath )
     {
@@ -227,6 +228,9 @@ 
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }
 
+    /**
+     * @param integer $cur
+     */
     private function waitOfDatabase ( &$cur )
     {
         printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
@@ -293,6 +297,7 @@ 
      * parse a tpl file and return the result
      *
      * @param String $tplFile
+     * @param AbstractAdapter $objMakeFile
      *
      * @return String
      */

Braces +2 added lines, -4 removed lines

@@ -136,8 +136,7 @@ 
                 unset( $arrUrl );
             }
 
-        }
-        else {
+        } else {
             $url            = array (
                 $this->baseLocation,
                 $driverBase,
@@ -213,8 +212,7 @@ 
                     );
                     if ( self::makeSourcer ( $file, $tpl, $objMakeFile->isOverwrite () ) ) {
                         ++$numFilesCreated;
-                    }
-                    else {
+                    } else {
                         ++$numFilesIgnored;
                     }
 

Spacing +106 added lines, -106 removed lines

@@ -19,7 +19,7 @@ 
     /**
      * @type string[]
      */
-    public $location = array ();
+    public $location = array();
 
     /**
      * caminho de pastas Base
@@ -43,42 +43,42 @@ 
 
     private $msgReservedWord = "\033[0mPlease enter the value for reserved word \033[0;31m'%index%' \033[1;33m[%config%]:\033[0m ";
 
-    public function __construct ( Config $config )
+    public function __construct(Config $config)
     {
-        $this->config = $config->getAdapterConfig ();
-        $this->parseReservedWord ( $this->getConfig () );
-        $this->driver = $config->getAdapterDriver ( $this->getConfig () );
-        $this->parseLocation ( $config->_basePath );
+        $this->config = $config->getAdapterConfig();
+        $this->parseReservedWord($this->getConfig());
+        $this->driver = $config->getAdapterDriver($this->getConfig());
+        $this->parseLocation($config->_basePath);
     }
 
     /**
      * @param AdapterConfig\AbstractAdapter $config
      */
-    public function parseReservedWord ( AdapterConfig\AbstractAdapter $config )
+    public function parseReservedWord(AdapterConfig\AbstractAdapter $config)
     {
         $palavrasReservadas = $config->reservedWord;
-        if ( !$palavrasReservadas ) {
+        if ( ! $palavrasReservadas) {
             return;
         }
 
-        $schema      = $config->getSchemas ();
-        $db          = $config->getDatabase ();
-        $hasSchema   = array_intersect ( $schema, array_flip ( $palavrasReservadas ) );
-        $hasDatabase = in_array ( $db, $palavrasReservadas );
-        if ( !( $hasSchema or $hasDatabase ) ) {
+        $schema      = $config->getSchemas();
+        $db          = $config->getDatabase();
+        $hasSchema   = array_intersect($schema, array_flip($palavrasReservadas));
+        $hasDatabase = in_array($db, $palavrasReservadas);
+        if ( ! ($hasSchema or $hasDatabase)) {
             return;
         }
 
         echo "- database has reserved words\n";
-        foreach ( $palavrasReservadas as $index => $config ) {
-            $attribs = array (
+        foreach ($palavrasReservadas as $index => $config) {
+            $attribs = array(
                 "%index%"  => $index,
                 "%config%" => $config
             );
-            echo strtr ( $this->msgReservedWord, $attribs );
-            $line = trim ( fgets ( STDIN ) );
-            if ( !empty( $line ) ) {
-                $this->getConfig ()->reservedWord[ $index ] = $line;
+            echo strtr($this->msgReservedWord, $attribs);
+            $line = trim(fgets(STDIN));
+            if ( ! empty($line)) {
+                $this->getConfig()->reservedWord[$index] = $line;
             }
         }
     }
@@ -88,179 +88,179 @@ 
      *
      * @return string
      */
-    private function filterLocation ( $arrFoldersName )
+    private function filterLocation($arrFoldersName)
     {
-        foreach ( $arrFoldersName as $index => $folderName ) {
-            $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+        foreach ($arrFoldersName as $index => $folderName) {
+            $arrFoldersName[$index] = $this->getConfig()
+                                             ->replaceReservedWord($folderName);
         }
 
-        return implode ( DIRECTORY_SEPARATOR, array_filter ( $arrFoldersName ) );
+        return implode(DIRECTORY_SEPARATOR, array_filter($arrFoldersName));
     }
 
     /**
      * Analisa os caminhos das pastas base
      */
-    public function parseLocation ( $basePath )
+    public function parseLocation($basePath)
     {
 
-        $arrBase = array (
+        $arrBase = array(
             $basePath,
             $this->config->path
         );
 
-        $this->baseLocation = $this->filterLocation ( $arrBase );
+        $this->baseLocation = $this->filterLocation($arrBase);
 
         # pasta com nome do driver do banco
         $driverBase = '';
-        if ( (bool) @$this->config->{"folder-database"} ) {
-            $classDriver = explode ( '\\', get_class ( $this->driver ) );
-            $driverBase  = end ( $classDriver );
+        if ((bool) @$this->config->{"folder-database"} ) {
+            $classDriver = explode('\\', get_class($this->driver));
+            $driverBase  = end($classDriver);
         }
         $folderName = '';
-        if ( (bool) @$this->config->{"folder-name"} ) {
-            $folderName = $this->getClassName ( trim ( $this->config->{"folder-name"} ) );
+        if ((bool) @$this->config->{"folder-name"} ) {
+            $folderName = $this->getClassName(trim($this->config->{"folder-name"} ));
         }
 
-        if ( $this->config->hasSchemas () ) {
+        if ($this->config->hasSchemas()) {
 
-            $schemas = $this->config->getSchemas ();
-            foreach ( $schemas as $schema ) {
-                $arrUrl = array (
+            $schemas = $this->config->getSchemas();
+            foreach ($schemas as $schema) {
+                $arrUrl = array(
                     $this->baseLocation,
                     $driverBase,
                     $folderName,
-                    $this->getClassName ( $schema )
+                    $this->getClassName($schema)
                 );
 
-                $this->location[ $schema ] = $this->filterLocation ( $arrUrl );
-                unset( $arrUrl );
+                $this->location[$schema] = $this->filterLocation($arrUrl);
+                unset($arrUrl);
             }
 
         }
         else {
-            $url            = array (
+            $url = array(
                 $this->baseLocation,
                 $driverBase,
                 $folderName,
-                $this->getClassName (
-                    $this->getConfig ()
-                         ->getDatabase ()
+                $this->getClassName(
+                    $this->getConfig()
+                         ->getDatabase()
                 )
             );
-            $this->location = array ( $this->filterLocation ( $url ) );
-            unset( $url );
+            $this->location = array($this->filterLocation($url));
+            unset($url);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getConfig ()
+    public function getConfig()
     {
         return $this->config;
     }
 
     /* Get current time */
-    public function startTime ()
+    public function startTime()
     {
         echo "\033[1;32mStarting..\033[0m\n";
-        $this->startTime = microtime ( true );
+        $this->startTime = microtime(true);
     }
 
-    private function getRunTime ()
+    private function getRunTime()
     {
-        return round ( ( microtime ( true ) - $this->startTime ), 3 );
+        return round((microtime(true) - $this->startTime), 3);
     }
 
     /**
      * Executa o Make, criando arquivos e Diretorios
      */
-    public function run ()
+    public function run()
     {
         $cur             = 0;
         $numFilesCreated = 0;
         $numFilesIgnored = 0;
 
-        $this->startTime ();
+        $this->startTime();
         $this->waitOfDatabase($cur);
 
-        $this->max       = $this->driver->getTotalTables () * $this->countDiretory ();
+        $this->max = $this->driver->getTotalTables() * $this->countDiretory();
 
-        foreach ( $this->location as $schema => $location ) {
-            foreach ( $this->factoryMakerFile () as $objMakeFile ) {
-                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName ();
-                if($this->config->isCleanTrash()){
-                    CleanTrash::getInstance ()->run ( $path , $this->driver, $schema );
+        foreach ($this->location as $schema => $location) {
+            foreach ($this->factoryMakerFile() as $objMakeFile) {
+                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName();
+                if ($this->config->isCleanTrash()) {
+                    CleanTrash::getInstance()->run($path, $this->driver, $schema);
                 }
-                self::makeDir ( $path );
-                if ( $objMakeFile->getParentFileTpl () != '' ) {
+                self::makeDir($path);
+                if ($objMakeFile->getParentFileTpl() != '') {
                     $fileAbstract = $this->baseLocation
                                     . DIRECTORY_SEPARATOR
-                                    . $objMakeFile->getParentClass ()
+                                    . $objMakeFile->getParentClass()
                                     . '.php';
 
-                    $tplAbstract = $this->getParsedTplContents ( $objMakeFile->getParentFileTpl () );
-                    self::makeSourcer ( $fileAbstract, $tplAbstract, true );
-                    unset( $fileAbstract, $tplAbstract );
+                    $tplAbstract = $this->getParsedTplContents($objMakeFile->getParentFileTpl());
+                    self::makeSourcer($fileAbstract, $tplAbstract, true);
+                    unset($fileAbstract, $tplAbstract);
                 }
 
-                foreach ( $this->driver->getTables ( $schema ) as $key => $objTables ) {
-                    $file = $path . DIRECTORY_SEPARATOR . self::getClassName ( $objTables->getName () ) . '.php';
+                foreach ($this->driver->getTables($schema) as $key => $objTables) {
+                    $file = $path . DIRECTORY_SEPARATOR . self::getClassName($objTables->getName()) . '.php';
 
-                    $tpl = $this->getParsedTplContents (
-                        $objMakeFile->getFileTpl (),
-                        $objMakeFile->parseRelation ( $this, $objTables ),
+                    $tpl = $this->getParsedTplContents(
+                        $objMakeFile->getFileTpl(),
+                        $objMakeFile->parseRelation($this, $objTables),
                         $objTables,
                         $objMakeFile
 
                     );
-                    if ( self::makeSourcer ( $file, $tpl, $objMakeFile->isOverwrite () ) ) {
+                    if (self::makeSourcer($file, $tpl, $objMakeFile->isOverwrite())) {
                         ++$numFilesCreated;
                     }
                     else {
                         ++$numFilesIgnored;
                     }
 
-                    $this->countCreatedFiles ( $cur );
+                    $this->countCreatedFiles($cur);
                 }
             }
         }
 
-        $this->reportProcess ( $numFilesCreated, $numFilesIgnored );
+        $this->reportProcess($numFilesCreated, $numFilesIgnored);
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }
 
-    private function waitOfDatabase ( &$cur )
+    private function waitOfDatabase(&$cur)
     {
-        printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
-        $this->driver->runDatabase ();
-        printf ( "\r Creating: \033[1;32m%6.2f%%\033[0m", $cur );
+        printf("\033[1;33mWait, the database is being analyzed..\033[0m\n");
+        $this->driver->runDatabase();
+        printf("\r Creating: \033[1;32m%6.2f%%\033[0m", $cur);
     }
 
-    private function countCreatedFiles ( &$cur )
+    private function countCreatedFiles(&$cur)
     {
         ++$cur;
-        $total = ( $cur / $this->max ) * 100;
-        printf ( "\r Creating: \033[1;32m%6.2f%%\033[0m", $total );
+        $total = ($cur / $this->max) * 100;
+        printf("\r Creating: \033[1;32m%6.2f%%\033[0m", $total);
     }
 
-    private function reportProcess ( $numFilesCreated = 0, $numFilesIgnored = 0 )
+    private function reportProcess($numFilesCreated = 0, $numFilesIgnored = 0)
     {
-        if ( $this->config->isStatusEnabled () ) {
-            $databases  = count ( $this->location );
-            $countDir   = $this->countDiretory ();
-            $totalTable = $this->driver->getTotalTables ();
+        if ($this->config->isStatusEnabled()) {
+            $databases  = count($this->location);
+            $countDir   = $this->countDiretory();
+            $totalTable = $this->driver->getTotalTables();
             $totalFiles = $numFilesIgnored + $numFilesCreated;
-            $totalFilesDeleted = CleanTrash::getInstance ()->getNumFilesDeleted();
+            $totalFilesDeleted = CleanTrash::getInstance()->getNumFilesDeleted();
             echo "\n------";
-            printf ( "\n\r-Files generated/updated: \033[1;33m%s\033[0m" , $numFilesCreated );
-            printf ( "\n\r-Files not upgradeable: \033[1;33m%s\033[0m" , $numFilesIgnored );
-            printf ( "\n\r-Files deleted: \033[1;33m%s\033[0m" , $totalFilesDeleted );
-            printf ( "\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m" , $totalFiles , $this->max );
-            printf ( "\n\r-Diretories: \033[1;33m%s\033[0m" , $databases * $countDir );
-            printf ( "\n\r-Scanned tables: \033[1;33m%s\033[0m" , $totalTable );
-            printf ( "\n\r-Execution time: \033[1;33m%ssec\033[0m" , $this->getRunTime () );
+            printf("\n\r-Files generated/updated: \033[1;33m%s\033[0m", $numFilesCreated);
+            printf("\n\r-Files not upgradeable: \033[1;33m%s\033[0m", $numFilesIgnored);
+            printf("\n\r-Files deleted: \033[1;33m%s\033[0m", $totalFilesDeleted);
+            printf("\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m", $totalFiles, $this->max);
+            printf("\n\r-Diretories: \033[1;33m%s\033[0m", $databases * $countDir);
+            printf("\n\r-Scanned tables: \033[1;33m%s\033[0m", $totalTable);
+            printf("\n\r-Execution time: \033[1;33m%ssec\033[0m", $this->getRunTime());
             echo "\n------";
         }
     }
@@ -270,9 +270,9 @@ 
      *
      * @return AbstractAdapter[]
      */
-    public function factoryMakerFile ()
+    public function factoryMakerFile()
     {
-        return $this->config->getMakeFileInstances ();
+        return $this->config->getMakeFileInstances();
     }
 
     /**
@@ -280,12 +280,12 @@ 
      *
      * @return int
      */
-    public function countDiretory ()
+    public function countDiretory()
     {
-        if ( null === $this->countDir ) {
+        if (null === $this->countDir) {
             $this->countDir = 1;
-            foreach ( $this->factoryMakerFile () as $abstractAdapter ) {
-                if ( $abstractAdapter->hasDiretory () ) {
+            foreach ($this->factoryMakerFile() as $abstractAdapter) {
+                if ($abstractAdapter->hasDiretory()) {
                     ++$this->countDir;
                 }
             }
@@ -302,24 +302,24 @@ 
      *
      * @return String
      */
-    protected function getParsedTplContents ( $tplFile, $vars = array (), \Classes\Db\DbTable $objTables = null,
-                                              $objMakeFile = null )
+    protected function getParsedTplContents($tplFile, $vars = array(), \Classes\Db\DbTable $objTables = null,
+                                              $objMakeFile = null)
     {
 
-        $arrUrl = array (
+        $arrUrl = array(
             __DIR__,
             'templates',
             $this->config->framework,
             $tplFile
         );
 
-        $filePath = implode ( DIRECTORY_SEPARATOR, filter_var_array ( $arrUrl ) );
+        $filePath = implode(DIRECTORY_SEPARATOR, filter_var_array($arrUrl));
 
-        extract ( $vars );
-        ob_start ();
+        extract($vars);
+        ob_start();
         require $filePath;
-        $data = ob_get_contents ();
-        ob_end_clean ();
+        $data = ob_get_contents();
+        ob_end_clean();
 
         return $data;
     }

build/Classes/AdapterConfig/Phalcon.php

Spacing +13 added lines, -13 removed lines

@@ -22,16 +22,16 @@ 
      * @var string
      */
     protected $framework    = "phalcon";
-    public    $reservedWord = array ( 'public' => 'Main' );
+    public    $reservedWord = array('public' => 'Main');
 
-    protected $dataTypes = array (
+    protected $dataTypes = array(
         'int'    => 'integer',
         'float'  => 'decimal'
     );
 
     const SEPARETOR = "\\";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -40,12 +40,12 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
 
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
         // TODO: Implement parseFrameworkConfig() method.
     }
@@ -53,10 +53,10 @@ 
     /**
      * @inheritdoc
      */
-    protected function getBaseNamespace ()
+    protected function getBaseNamespace()
     {
-        return array (
-            $this->arrConfig[ 'namespace' ],
+        return array(
+            $this->arrConfig['namespace'],
             'Models'
         );
     }
@@ -66,12 +66,12 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
-        return array (
-            Entity::getInstance (),
-            Model::getInstance (),
-            Peer::getInstance ()
+        return array(
+            Entity::getInstance(),
+            Model::getInstance(),
+            Peer::getInstance()
         );
     }