pedro151 / orm-generator

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

@@ -103,31 +103,31 @@ 
             $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' ],
-                                                 '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;
                 }
             }
@@ -145,13 +145,13 @@ 
             $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' ]
-                      );
+                        ->createDependece (
+                            $constrant[ 'constraint_name' ],
+                            $constrant[ 'table_name' ],
+                            $constrant[ 'column_name' ],
+                            $this->database,
+                            $constrant[ 'table_schema' ]
+                        );
             }
         }
     }
@@ -183,10 +183,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 ) )
+                    );
         }
     }
 
@@ -254,13 +254,13 @@ 
     public function createTable ( $nameTable, $schema = 0 )
     {
         $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 +108 added lines, -108 removed lines

@@ -59,7 +59,7 @@ 
     /**
      * @type \Classes\Db\DbTable[][]
      */
-    private $objDbTables = array ();
+    private $objDbTables = array();
 
     /**
      * @var AbstractAdapter
@@ -74,20 +74,20 @@ 
     /**
      * 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 ) {
-
-            $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" ) {
-                $schema     = $constrant[ 'foreign_schema' ];
-                $table_name = $constrant [ 'foreign_table' ];
-                $this->populateDependece ( $constrant, $table_name, $schema );
-                unset( $table_name, $schema );
+        foreach ($this->getListConstrant() as $constrant) {
+
+            $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") {
+                $schema     = $constrant['foreign_schema'];
+                $table_name = $constrant ['foreign_table'];
+                $this->populateDependece($constrant, $table_name, $schema);
+                unset($table_name, $schema);
             }
         }
     }
@@ -97,34 +97,34 @@ 
      * @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 ) ) {
-            $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' ],
+        if ($this->hasTable($table_name, $schema)) {
+            $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'],
                                                  '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->getColumn($constrant["column_name"])
+                              ->setPrimaryKey($objConstrant)
+                              ->setSequence(
+                                  $this->getSequence(
                                       $table_name,
-                                      $constrant[ "column_name" ],
+                                      $constrant["column_name"],
                                       $schema
                                   )
                               );
@@ -139,18 +139,18 @@ 
      * @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 ) ) {
-            $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' ],
+        if ($this->hasTable($table_name, $schema)) {
+            $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' ]
+                          $constrant['table_schema']
                       );
             }
         }
@@ -159,33 +159,33 @@ 
     /**
      * cria um Array com nome das tabelas
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( $this->hasTables () ) {
-            return $this->getAllTables ();
+        if ($this->hasTables()) {
+            return $this->getAllTables();
         }
 
-        foreach ( $this->getListColumns () as $table ) {
-            $schema = $table[ 'table_schema' ];
-            $key    = $table [ 'table_name' ];
-            if ( !$this->hasTable ( $key, $schema ) ) {
-                $this->createTable ( $key, $schema );
+        foreach ($this->getListColumns() as $table) {
+            $schema = $table['table_schema'];
+            $key    = $table ['table_name'];
+            if ( ! $this->hasTable($key, $schema)) {
+                $this->createTable($key, $schema);
             }
 
-            $column = Column::getInstance ()
-                            ->populate (
-                                array (
-                                    'name'       => $table [ 'column_name' ],
-                                    'type'       => $this->convertTypeToSimple ( $table[ 'data_type' ] ),
-                                    'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ),
-                                    'max_length' => $table[ 'max_length' ]
+            $column = Column::getInstance()
+                            ->populate(
+                                array(
+                                    'name'       => $table ['column_name'],
+                                    'type'       => $this->convertTypeToSimple($table['data_type']),
+                                    'nullable'   => ($table['is_nullable'] == 'YES'),
+                                    '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))
                  );
         }
     }
@@ -195,7 +195,7 @@ 
      *
      * @return int
      */
-    abstract public function getTotalTables ();
+    abstract public function getTotalTables();
 
     /**
      * Retorna o Nome da Sequence da tabela
@@ -205,31 +205,31 @@ 
      *
      * @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 ] ) ) {
-            return $this->dataTypesToPhp[ $str ];
+        if (isset($this->dataTypesToPhp[$str])) {
+            return $this->dataTypesToPhp[$str];
         }
 
         return 'string';
     }
 
-    protected function convertTypeToSimple ( $str )
+    protected function convertTypeToSimple($str)
     {
-        if ( isset( $this->dataTypesToSimple[ $str ] ) ) {
-            return $this->dataTypesToSimple[ $str ];
+        if (isset($this->dataTypesToSimple[$str])) {
+            return $this->dataTypesToSimple[$str];
         }
 
         return 'string';
@@ -238,12 +238,12 @@ 
     /**
      * @return string
      */
-    abstract public function getPDOString ();
+    abstract public function getPDOString();
 
     /**
      * @return string
      */
-    abstract public function getPDOSocketString ();
+    abstract public function getPDOSocketString();
 
     /**
      * @param     $nameTable
@@ -251,11 +251,11 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function createTable ( $nameTable, $schema = 0 )
+    public function createTable($nameTable, $schema = 0)
     {
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
+        $this->objDbTables[$schema][trim($nameTable)] = DbTable::getInstance()
+                                                                      ->populate(
+                                                                          array(
                                                                               'table'    => $nameTable,
                                                                               'schema'   => $schema,
                                                                               'database' => $this->database
@@ -270,23 +270,23 @@ 
      *
      * @return \Classes\Db\DbTable[]
      */
-    public function getTables ( $schema = 0 )
+    public function getTables($schema = 0)
     {
-        if ( !isset( $this->objDbTables[ $schema ] ) ) {
-            return array ();
+        if ( ! isset($this->objDbTables[$schema])) {
+            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);
     }
 
     /**
@@ -296,9 +296,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)];
     }
 
     /**
@@ -307,9 +307,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)]);
     }
 
     /**
@@ -317,59 +317,59 @@ 
      *
      * @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->port;
-        $this->username = $adapterConfig->getUser ();
-        $this->password = $adapterConfig->getPassword ();
-        $this->socket   = $adapterConfig->getSocket ();
+        $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();
 
     }
 
     /**
      * 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 ( !empty( $this->socket ) ) {
-                $pdoString = $this->getPDOSocketString ();
+        if (is_null($this->_pdo)) {
+            if ( ! empty($this->socket)) {
+                $pdoString = $this->getPDOSocketString();
             }
             else {
-                $pdoString = $this->getPDOString ();
+                $pdoString = $this->getPDOString();
             }
 
             try {
-                $this->_pdo = new \PDO (
+                $this->_pdo = new \PDO(
                     $pdoString, $this->username, $this->password
                 );
-            } catch ( \Exception $e ) {
-                die ( "pdo error: " . $e->getMessage () . "\n" );
+            } catch (\Exception $e) {
+                die ("pdo error: " . $e->getMessage() . "\n");
             }
         }
 

Braces +1 added lines, -2 removed lines

@@ -359,8 +359,7 @@
         if ( is_null ( $this->_pdo ) ) {
             if ( !empty( $this->socket ) ) {
                 $pdoString = $this->getPDOSocketString ();
-            }
-            else {
+            } else {
                 $pdoString = $this->getPDOString ();
             }
 

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/zf1/entity.php

Spacing +84 added lines, -84 removed lines

@@ -1,6 +1,6 @@ 
 <?= "<?php\n" ?>
-<?php $className = $objTables->getNamespace () . '_Entity_' . \Classes\Maker\AbstractMaker::getClassName (
-        $objTables->getName ()
+<?php $className = $objTables->getNamespace() . '_Entity_' . \Classes\Maker\AbstractMaker::getClassName(
+        $objTables->getName()
     ) ?>
 
 /**
@@ -8,7 +8,7 @@ 
 *
 * <?= $this->config->last_modify . "\n" ?>
 *
-* @package <?= $objTables->getNamespace () . "\n" ?>
+* @package <?= $objTables->getNamespace() . "\n" ?>
 * @subpackage Entity
 *
 * @author    <?= $this->config->author . "\n" ?>
@@ -24,16 +24,16 @@ 
 */
 
 abstract class <?= $className ?> extends <?= $this->config->namespace ? $this->config->namespace
-                                                                        . "_" : "" ?>Model_<?= $objMakeFile->getParentClass (
+                                                                        . "_" : "" ?>Model_<?= $objMakeFile->getParentClass(
 ) . "\n" ?>
 {
 
-<?php foreach ( $objTables->getColumns () as $column ): ?>
+<?php foreach ($objTables->getColumns() as $column): ?>
     /**
-    * Database constraint in the column <?= $column->getName () . "\n" ?>
+    * Database constraint in the column <?= $column->getName() . "\n" ?>
     *
     */
-    const <?= strtoupper ( $column->getName () ) ?> = '<?= $objTables->getName () ?>.<?= $column->getName () ?>';
+    const <?= strtoupper($column->getName()) ?> = '<?= $objTables->getName() ?>.<?= $column->getName() ?>';
 <?php endforeach; ?>
 
 /**
@@ -42,17 +42,17 @@ 
 * @var string
 * @access protected
 */
-protected $_tableClass = '<?= $objTables->getNamespace () ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName (
-    $objTables->getName ()
+protected $_tableClass = '<?= $objTables->getNamespace() ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName(
+    $objTables->getName()
 ) ?>';
 
 /**
 * @see <?= $this->config->namespace ?>Model_EntityAbstract::$_columnsList
 */
 protected $_columnsList = array(
-<?php foreach ( $objTables->getColumns () as $column ): ?>
-    self::<?= strtoupper ( $column->getName () ) ?> => '<?= strtolower (
-        \Classes\Maker\AbstractMaker::getClassName ( $column->getName () )
+<?php foreach ($objTables->getColumns() as $column): ?>
+    self::<?= strtoupper($column->getName()) ?> => '<?= strtolower(
+        \Classes\Maker\AbstractMaker::getClassName($column->getName())
     ) ?>',
 <?php endforeach; ?>
 );
@@ -61,10 +61,10 @@ 
 * @see <?= $this->config->namespace ?>Model_EntityAbstract::$_filters
 */
 protected $_filters = array(
-<?php foreach ( $objTables->getColumns () as $column ): ?>
+<?php foreach ($objTables->getColumns() as $column): ?>
     <?php
     $filters = null;
-    switch ( ucfirst ( $column->getType () ) ) {
+    switch (ucfirst($column->getType())) {
         case 'String':
             $filters = 'StripTags", "StringTrim';
             break;
@@ -74,12 +74,12 @@ 
         case 'Date':
             break;
         default:
-            $filters = ucfirst ( $column->getType () );
+            $filters = ucfirst($column->getType());
             break;
     }
     ?>
-    '<?= $column->getName () ?>'=>array (
-    <?= ( !empty( $filters ) ) ? "\"{$filters}\"\n" : null; ?>
+    '<?= $column->getName() ?>'=>array (
+    <?= ( ! empty($filters)) ? "\"{$filters}\"\n" : null; ?>
     ),
 <?php endforeach; ?>
 );
@@ -88,34 +88,34 @@ 
 * @see <?= $this->config->namespace ?>Model_EntityAbstract::$_validators
 */
 protected $_validators= array(
-<?php foreach ( $objTables->getColumns () as $column ): ?>
+<?php foreach ($objTables->getColumns() as $column): ?>
     <?php
-    $validators = array ();
+    $validators = array();
 
-    $validators[] = $column->isNullable () ? "'allowEmpty' => true" : "'NotEmpty'";
+    $validators[] = $column->isNullable() ? "'allowEmpty' => true" : "'NotEmpty'";
 
-    switch ( ucfirst ( $column->getType () ) ) {
+    switch (ucfirst($column->getType())) {
         case 'String':
-            if ( $column->getMaxLength () ) {
-                $validators[] = "array( 'StringLength', array( 'max' => " . $column->getMaxLength () . " ) )";
+            if ($column->getMaxLength()) {
+                $validators[] = "array( 'StringLength', array( 'max' => " . $column->getMaxLength() . " ) )";
             }
 
             break;
         case 'Boolean':
             break;
         default:
-            $name         = ucfirst ( $column->getType () );
+            $name         = ucfirst($column->getType());
             $validators[] = "'$name'";
             break;
     }
-    $validators = implode ( ", ", $validators ) ?>
-    '<?= $column->getName () ?>' => array (
-    <?= ( !empty( $validators ) ) ? "{$validators}\n" : null ?>
+    $validators = implode(", ", $validators) ?>
+    '<?= $column->getName() ?>' => array (
+    <?= ( ! empty($validators)) ? "{$validators}\n" : null ?>
     ),
 <?php endforeach; ?>
 );
 
-<?php if ( $objTables->hasPrimaryKey () ): ?>
+<?php if ($objTables->hasPrimaryKey()): ?>
     /**
     * Nome da Primary Key
     *
@@ -124,78 +124,78 @@ 
     */
 
     protected $_primary = array(
-    <?php foreach ( $objTables->getPrimarykeys () as $pks ) : ?>
-        '<?= $pks->getName () ?>',
+    <?php foreach ($objTables->getPrimarykeys() as $pks) : ?>
+        '<?= $pks->getName() ?>',
     <?php endforeach ?>
     );
 <?php endif ?>
 
-<?php foreach ( $parents as $parent ): ?>
+<?php foreach ($parents as $parent): ?>
     /**
-    * Parent relation <?= \Classes\Maker\AbstractMaker::getClassName ( $parent[ 'table' ] ) . "\n" ?>
+    * Parent relation <?= \Classes\Maker\AbstractMaker::getClassName($parent['table']) . "\n" ?>
     *
-    * @var <?= $parent[ 'name' ] . "\n" ?>
+    * @var <?= $parent['name'] . "\n" ?>
     */
-    protected $_parent_<?= $parent[ 'name' ] ?>;
+    protected $_parent_<?= $parent['name'] ?>;
 
 <?php endforeach; ?>
-<?php foreach ( $depends as $depend ): ?>
+<?php foreach ($depends as $depend): ?>
     /**
-    * Depends relation <?= \Classes\Maker\AbstractMaker::getClassName ( $depend[ 'table' ] ) . "\n" ?>
+    * Depends relation <?= \Classes\Maker\AbstractMaker::getClassName($depend['table']) . "\n" ?>
     *
-    * @var <?= $depend[ 'class' ] . "\n" ?>
+    * @var <?= $depend['class'] . "\n" ?>
     */
-    protected $_depend_<?= $depend[ 'name' ] ?>;
+    protected $_depend_<?= $depend['name'] ?>;
 
 <?php endforeach; ?>
-<?php foreach ( $objTables->getColumns () as $column ): ?>
+<?php foreach ($objTables->getColumns() as $column): ?>
     /**
     *
-    * Sets column <?= $column->getName () . "\n" ?>
+    * Sets column <?= $column->getName() . "\n" ?>
     *
-    <?php if ( $column->equalType ( 'date' ) ): ?>
+    <?php if ($column->equalType('date')): ?>
         * Stored in ISO 8601 format.
         *
-        * @param string|Zend_Date $<?= $column->getName () . "\n" ?>
+        * @param string|Zend_Date $<?= $column->getName() . "\n" ?>
     <?php else: ?>
-        * @param <?= $column->getType () ?> $<?= $column->getName () . "\n" ?>
+        * @param <?= $column->getType() ?> $<?= $column->getName() . "\n" ?>
     <?php endif; ?>
     * @return <?= $className . "\n" ?>
     */
-    public function set<?= \Classes\Maker\AbstractMaker::getClassName ( $column->getName () ) ?>($<?= $column->getName (
+    public function set<?= \Classes\Maker\AbstractMaker::getClassName($column->getName()) ?>($<?= $column->getName(
     ) ?>)
     {
-    <?php switch ( $column->getType () ):
+    <?php switch ($column->getType()):
         case 'date': ?>
-            if (! empty($<?= $column->getName () ?>))
+            if (! empty($<?= $column->getName() ?>))
             {
-            if (! $<?= $column->getName () ?> instanceof Zend_Date)
+            if (! $<?= $column->getName() ?> instanceof Zend_Date)
             {
-            $<?= $column->getName () ?> = new Zend_Date($<?= $column->getName () ?>);
+            $<?= $column->getName() ?> = new Zend_Date($<?= $column->getName() ?>);
             }
 
-            $this-><?= $column->getName () ?> = $<?= $column->getName () ?>->toString(Zend_Date::ISO_8601);
+            $this-><?= $column->getName() ?> = $<?= $column->getName() ?>->toString(Zend_Date::ISO_8601);
             }
 
             <?php break ?>
         <?php case 'boolean': ?>
-            $this-><?= $column->getName () ?> = $<?= $column->getName () ?> ? true : false;
+            $this-><?= $column->getName() ?> = $<?= $column->getName() ?> ? true : false;
 
             <?php break ?>
         <?php default: ?>
-            $<?= $column->getName () ?> = (<?= ucfirst ( $column->getType () ) ?>) $<?= $column->getName () ?> ;
-            $input = new Zend_Filter_Input($this->_filters, $this->_validators, array('<?= $column->getName (
-            ) ?>'=>$<?= $column->getName () ?> ));
-            if(!$input->isValid ('<?= $column->getName () ?>'))
+            $<?= $column->getName() ?> = (<?= ucfirst($column->getType()) ?>) $<?= $column->getName() ?> ;
+            $input = new Zend_Filter_Input($this->_filters, $this->_validators, array('<?= $column->getName(
+            ) ?>'=>$<?= $column->getName() ?> ));
+            if(!$input->isValid ('<?= $column->getName() ?>'))
             {
             $errors =  $input->getMessages ();
-            foreach ( $errors['<?= $column->getName () ?>'] as $key => $value )
+            foreach ( $errors['<?= $column->getName() ?>'] as $key => $value )
             {
             throw new Exception ( $value );
             }
             }
 
-            $this-><?= $column->getName () ?>  = $<?= $column->getName () ?> ;
+            $this-><?= $column->getName() ?>  = $<?= $column->getName() ?> ;
 
             <?php break ?>
         <?php endswitch ?>
@@ -203,72 +203,72 @@ 
     }
 
     /**
-    * Gets column <?= $column->getName () . "\n" ?>
+    * Gets column <?= $column->getName() . "\n" ?>
     *
-    <?php if ( $column->equalType ( 'date' ) ): ?>
+    <?php if ($column->equalType('date')): ?>
         * @param boolean $returnZendDate
         * @return Zend_Date|null|string Zend_Date representation of this datetime if enabled, or ISO 8601 string if not
     <?php else: ?>
-        * @return <?= $column->getType () . "\n" ?>
+        * @return <?= $column->getType() . "\n" ?>
     <?php endif; ?>
     */
-    public function get<?= \Classes\Maker\AbstractMaker::getClassName (
-        $column->getName ()
-    ) ?>(<?php if ( $column->equalType ( 'date' ) ): ?>$returnZendDate = false <?php endif; ?>)
+    public function get<?= \Classes\Maker\AbstractMaker::getClassName(
+        $column->getName()
+    ) ?>(<?php if ($column->equalType('date')): ?>$returnZendDate = false <?php endif; ?>)
     {
-    <?php if ( $column->equalType ( 'date' ) ): ?>
+    <?php if ($column->equalType('date')): ?>
         if ($returnZendDate)
         {
-        if ($this->_data['<?= $column->getName () ?>'] === null)
+        if ($this->_data['<?= $column->getName() ?>'] === null)
         {
         return null;
         }
 
-        return new Zend_Date($this-><?= $column->getName () ?>, Zend_Date::ISO_8601);
+        return new Zend_Date($this-><?= $column->getName() ?>, Zend_Date::ISO_8601);
         }
 
     <?php endif; ?>
-    return $this-><?= $column->getName () ?>;
+    return $this-><?= $column->getName() ?>;
     }
 
 <?php endforeach; ?>
-<?php foreach ( $parents as $parent ): ?>
+<?php foreach ($parents as $parent): ?>
     /**
-    * Gets parent <?= $parent[ 'table' ] . "\n" ?>
+    * Gets parent <?= $parent['table'] . "\n" ?>
     *
-    * @return <?= $parent[ 'class' ] . "\n" ?>
+    * @return <?= $parent['class'] . "\n" ?>
     */
-    public function get<?= $parent[ 'function' ] ?>()
+    public function get<?= $parent['function'] ?>()
     {
-    if ($this->_parent_<?= $parent[ 'name' ] ?> === null)
+    if ($this->_parent_<?= $parent['name'] ?> === null)
     {
-    $this->_parent_<?= $parent[ 'name' ] ?> = $this->findParentRow('<?= $objTables->getNamespace (
-    ) ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName (
-        $parent[ 'table' ]
-    ) ?>', '<?= \Classes\Maker\AbstractMaker::getClassName ( $parent[ 'name' ] ) ?>');
+    $this->_parent_<?= $parent['name'] ?> = $this->findParentRow('<?= $objTables->getNamespace(
+    ) ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName(
+        $parent['table']
+    ) ?>', '<?= \Classes\Maker\AbstractMaker::getClassName($parent['name']) ?>');
     }
 
-    return $this->_parent_<?= $parent[ 'name' ] ?>;
+    return $this->_parent_<?= $parent['name'] ?>;
     }
 
 <?php endforeach; ?>
 
 
-<?php foreach ( $depends as $depend ): ?>
+<?php foreach ($depends as $depend): ?>
     /**
-    * Gets dependent <?= $depend[ 'table' ] . "\n" ?>
+    * Gets dependent <?= $depend['table'] . "\n" ?>
     *
-    * @return <?= $depend[ 'class' ] . "\n" ?>
+    * @return <?= $depend['class'] . "\n" ?>
     */
-    public function get<?= $depend[ 'function' ] ?>()
+    public function get<?= $depend['function'] ?>()
     {
-    if ($this->_depend_<?= $depend[ 'name' ] ?> === null)
+    if ($this->_depend_<?= $depend['name'] ?> === null)
     {
-    $this->_depend_<?= $depend[ 'name' ] ?> = $this->findDependentRowset('<?= $objTables->getNamespace (
-    ) ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName ( $depend[ 'table' ] ) ?>');
+    $this->_depend_<?= $depend['name'] ?> = $this->findDependentRowset('<?= $objTables->getNamespace(
+    ) ?>_DbTable_<?= \Classes\Maker\AbstractMaker::getClassName($depend['table']) ?>');
     }
 
-    return $this->_depend_<?= $depend[ 'name' ] ?>;
+    return $this->_depend_<?= $depend['name'] ?>;
     }
 
 <?php endforeach; ?>

Braces +10 added lines, -4 removed lines

@@ -157,9 +157,12 @@ 
         * Stored in ISO 8601 format.
         *
         * @param string|Zend_Date $<?= $column->getName () . "\n" ?>
-    <?php else: ?>
+    <?php else {
+    : ?>
         * @param <?= $column->getType () ?> $<?= $column->getName () . "\n" ?>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     * @return <?= $className . "\n" ?>
     */
     public function set<?= \Classes\Maker\AbstractMaker::getClassName ( $column->getName () ) ?>($<?= $column->getName (
@@ -208,9 +211,12 @@ 
     <?php if ( $column->equalType ( 'date' ) ): ?>
         * @param boolean $returnZendDate
         * @return Zend_Date|null|string Zend_Date representation of this datetime if enabled, or ISO 8601 string if not
-    <?php else: ?>
+    <?php else {
+    : ?>
         * @return <?= $column->getType () . "\n" ?>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     */
     public function get<?= \Classes\Maker\AbstractMaker::getClassName (
         $column->getName ()

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

Indentation +8 added lines, -8 removed lines

@@ -169,10 +169,10 @@ 
         if ( empty( $this->totalTables ) ) {
 
             $this->totalTables = $this->getPDO ()
-                                      ->query (
-                                          "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}'"
-                                      )
-                                      ->fetchColumn ();
+                                        ->query (
+                                            "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}'"
+                                        )
+                                        ->fetchColumn ();
         }
 
         return (int) $this->totalTables;
@@ -189,10 +189,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 +36 added lines, -36 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,11 +112,11 @@ 
      *
      * @return array[]
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
 
-        return $this->getPDO ()
-                    ->query (
+        return $this->getPDO()
+                    ->query(
                         "select
                 0 AS table_schema,
                 table_name,
@@ -128,16 +128,16 @@ 
             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,
@@ -156,7 +156,7 @@ 
 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);
     }
 
     /**
@@ -164,15 +164,15 @@ 
      *
      * @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;
@@ -186,15 +186,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;
         }
 

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";
         }
 

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()
         );
     }