pedro151 / orm-generator

build/Classes/Db/DbTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
     }
 
     /**
-     * @param string $Namespace
+     * @param string $namespace
      */
     public function setNamespace ( $namespace )
     {

Spacing +44 added lines, -44 removed lines

@@ -11,14 +11,14 @@ 
     /**
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    final private function __construct ()
+    final private function __construct()
     {
     }
 
     /**
      * @return \Classes\Db\DbTable
      */
-    public static function getInstance(){
+    public static function getInstance() {
         return new self();
     }
 
@@ -40,7 +40,7 @@ 
     /**
      * @var \Classes\Db\Column[]
      */
-    private $columns = array ();
+    private $columns = array();
 
     /**
      * @var string
@@ -50,25 +50,25 @@ 
     /**
      * @type \Classes\Db\Column[]
      */
-    private $primarykeys = array ();
+    private $primarykeys = array();
 
     /**
      * @type \Classes\Db\Column[]
      */
-    private $foreingkeys = array ();
+    private $foreingkeys = array();
 
-    private $dependence = array ();
+    private $dependence = array();
 
     /**
      * @type string[]
      */
-    private $sequence = array ();
+    private $sequence = array();
 
-    public function populate ( $array )
+    public function populate($array)
     {
-        $this->name = $array[ 'table' ];
-        $this->schema = isset( $array[ 'schema' ] ) ? $array[ 'schema' ] : null;
-        $this->database = $array[ 'database' ];
+        $this->name = $array['table'];
+        $this->schema = isset($array['schema']) ? $array['schema'] : null;
+        $this->database = $array['database'];
 
         return $this;
     }
@@ -78,9 +78,9 @@ 
      *
      * @param \Classes\Db\Column $column
      */
-    public function addColumn ( Column $column )
+    public function addColumn(Column $column)
     {
-        $this->columns[ $column->getName () ] = $column;
+        $this->columns[$column->getName()] = $column;
 
         return $this;
     }
@@ -90,24 +90,24 @@ 
      *
      * @return \Classes\Db\Column
      */
-    public function getColumn ( $columnName )
+    public function getColumn($columnName)
     {
-        return $this->columns[ $columnName ];
+        return $this->columns[$columnName];
     }
 
-    public function hasColumn ( $columnName )
+    public function hasColumn($columnName)
     {
-        return isset( $this->columns[ $columnName ] );
+        return isset($this->columns[$columnName]);
     }
 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getPrimaryKeys ()
+    public function getPrimaryKeys()
     {
-        if ( empty ( $this->primarykeys ) )
+        if (empty ($this->primarykeys))
         {
-            $this->primarykeys = array_filter ( $this->columns , function ( $column ){ return $column->isPrimaryKey (); } );
+            $this->primarykeys = array_filter($this->columns, function($column) { return $column->isPrimaryKey(); } );
         }
 
         return $this->primarykeys;
@@ -116,25 +116,25 @@ 
     /**
      * @return bool
      */
-    public function hasPrimaryKey ()
+    public function hasPrimaryKey()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->getPrimaryKeys ();
+            $this->getPrimaryKeys();
         }
 
-        return ! empty ( $this->sequence );
+        return ! empty ($this->sequence);
     }
 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getForeingkeys ()
+    public function getForeingkeys()
     {
 
-        if ( empty ( $this->foreingkeys ) )
+        if (empty ($this->foreingkeys))
         {
-            $this->foreingkeys = array_filter ( $this->columns , function ( $column ){ return $column->isForeingkey (); } );
+            $this->foreingkeys = array_filter($this->columns, function($column) { return $column->isForeingkey(); } );
         }
 
         return $this->foreingkeys;
@@ -144,11 +144,11 @@ 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getDependences ()
+    public function getDependences()
     {
-        if ( empty ( $this->dependence ) )
+        if (empty ($this->dependence))
         {
-            $this->dependence = array_filter ( $this->columns , function ( $column ){ return $column->hasDependence (); } );
+            $this->dependence = array_filter($this->columns, function($column) { return $column->hasDependence(); } );
         }
 
         return $this->dependence;
@@ -157,11 +157,11 @@ 
     /**
      * @return string[]
      */
-    public function getSequences ()
+    public function getSequences()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->sequence = array_filter ( $this->columns , function ( $column ){ return $column->hasSequence (); } );
+            $this->sequence = array_filter($this->columns, function($column) { return $column->hasSequence(); } );
         }
 
         return $this->sequence;
@@ -170,20 +170,20 @@ 
     /**
      * @return bool
      */
-    public function hasSequences ()
+    public function hasSequences()
     {
-        if ( empty ( $this->sequence ) )
+        if (empty ($this->sequence))
         {
-            $this->getSequences ();
+            $this->getSequences();
         }
 
-        return ! empty ( $this->sequence );
+        return ! empty ($this->sequence);
     }
 
     /**
      * @return \Classes\Db\Column[]
      */
-    public function getColumns ()
+    public function getColumns()
     {
         return $this->columns;
     }
@@ -191,7 +191,7 @@ 
     /**
      * @return string
      */
-    public function getName ()
+    public function getName()
     {
         return $this->name;
     }
@@ -199,7 +199,7 @@ 
     /**
      * @return string
      */
-    public function getSchema ()
+    public function getSchema()
     {
         return $this->schema;
     }
@@ -207,7 +207,7 @@ 
     /**
      * @return bool
      */
-    public function hasSchema ()
+    public function hasSchema()
     {
         return (bool) $this->schema;
     }
@@ -215,7 +215,7 @@ 
     /**
      * @return string
      */
-    public function getDatabase ()
+    public function getDatabase()
     {
         return $this->database;
     }
@@ -223,7 +223,7 @@ 
     /**
      * @return string
      */
-    public function getNamespace ()
+    public function getNamespace()
     {
         return $this->namespace;
     }
@@ -231,7 +231,7 @@ 
     /**
      * @param string $Namespace
      */
-    public function setNamespace ( $namespace )
+    public function setNamespace($namespace)
     {
         $this->namespace = $namespace;
     }

build/Classes/MakerConfigFile.php

Doc Comments -1 removed lines

@@ -44,7 +44,6 @@
     /**
      * Analisa e estrutura a Configuracao do generate
      *
-     * @param string $_path
      * @param array  $argv
      *
      * @return array

Spacing +26 added lines, -26 removed lines

@@ -24,21 +24,21 @@ 
 
     private $msg = "\033[0mPlease enter the value for %index% \033[1;33m[%config%]:\033[0m ";
 
-    private $configs = array (
-        'name-ini'  => 'config' ,
-        'framework'   => 'none' ,
-        'driver'      => 'pgsql' ,
-        'environment' => 'dev' ,
-        'host'        => 'localhost' ,
-        'database'    => null ,
-        'schema'      => null ,
-        'username'    => null ,
+    private $configs = array(
+        'name-ini'  => 'config',
+        'framework'   => 'none',
+        'driver'      => 'pgsql',
+        'environment' => 'dev',
+        'host'        => 'localhost',
+        'database'    => null,
+        'schema'      => null,
+        'username'    => null,
         'password'    => null
     );
 
-    public function __construct ( $argv , $basePath )
+    public function __construct($argv, $basePath)
     {
-        $this->argv = $this->parseConfig ( $basePath , $argv );
+        $this->argv = $this->parseConfig($basePath, $argv);
     }
 
     /**
@@ -50,32 +50,32 @@ 
      * @return array
      * @throws \Exception
      */
-    private function parseConfig ( $basePath , $argv )
+    private function parseConfig($basePath, $argv)
     {
         $this->baseLocation = $basePath;
 
-        $arrayIO = array_diff_key ( $this->configs , $argv );
-        foreach ( $arrayIO as $index => $config )
+        $arrayIO = array_diff_key($this->configs, $argv);
+        foreach ($arrayIO as $index => $config)
         {
-            $attribs = array ( "%index%" => $index , "%config%" => $config );
-            echo strtr ( $this->msg , $attribs );
-            $line = trim ( fgets ( STDIN ) );
-            if ( ! empty( $line ) )
+            $attribs = array("%index%" => $index, "%config%" => $config);
+            echo strtr($this->msg, $attribs);
+            $line = trim(fgets(STDIN));
+            if ( ! empty($line))
             {
-                $this->configs[ $index ] = strtolower ( $line );
+                $this->configs[$index] = strtolower($line);
             }
         }
-        $this->configs ['version']     = Config::$version;
-        return $argv + array_filter ( $this->configs );
+        $this->configs ['version'] = Config::$version;
+        return $argv + array_filter($this->configs);
     }
 
-    public function run ()
+    public function run()
     {
         $path = $this->baseLocation . DIRECTORY_SEPARATOR . "configs";
-        self::makeDir ( $path );
-        self::makeSourcer (
-            $path . DIRECTORY_SEPARATOR . $this->argv[ 'name-ini' ] . '.ini' ,
-            $this->getParsedTplContents ( $this->template , $this->argv )
+        self::makeDir($path);
+        self::makeSourcer(
+            $path . DIRECTORY_SEPARATOR . $this->argv['name-ini'] . '.ini',
+            $this->getParsedTplContents($this->template, $this->argv)
         );
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }

build/Classes/AdapterMakerFile/ZendFrameworkOne/Model.php

Indentation +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
 
     public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
     {
-       return array();
+        return array();
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -13,14 +13,14 @@
      * @var void
      */
     protected $fileTpl       = "model.php";
-    protected $fileFixedData = array (
-        'exception' => array (
-            'tpl'  => "model_exception.php" ,
+    protected $fileFixedData = array(
+        'exception' => array(
+            'tpl'  => "model_exception.php",
             'name' => "Exception"
         )
     );
 
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
        return array();
     }

create-phar.php

Spacing +16 added lines, -16 removed lines

@@ -1,32 +1,32 @@
 <?php
-define ( 'PREFIX', 'orm-generator' );
-define ( 'PHAR_FILE', PREFIX . '.phar' );
-define ( 'PHAR_OUTPUT', 'bin' . DIRECTORY_SEPARATOR . PHAR_FILE );
-define ( 'DEFAULT_STUB', 'phar-generate.php' );
-define ( 'BUILD_DIR', realpath ( __DIR__ . '/build' ) );
-define ( 'INCLUDE_EXTENSION', '/\.php$/' );
+define('PREFIX', 'orm-generator');
+define('PHAR_FILE', PREFIX . '.phar');
+define('PHAR_OUTPUT', 'bin' . DIRECTORY_SEPARATOR . PHAR_FILE);
+define('DEFAULT_STUB', 'phar-generate.php');
+define('BUILD_DIR', realpath(__DIR__ . '/build'));
+define('INCLUDE_EXTENSION', '/\.php$/');
 
 try
 {
-    if ( file_exists ( PHAR_OUTPUT ) )
+    if (file_exists(PHAR_OUTPUT))
     {
-        unlink ( PHAR_OUTPUT );
+        unlink(PHAR_OUTPUT);
     }
 
     /****************************************
      * phar file creation
      ****************************************/
-    $tarphar = new Phar( PHAR_OUTPUT );
-    $phar = $tarphar->convertToExecutable ( Phar::PHAR );
-    $phar->startBuffering ();
-    $phar->buildFromDirectory ( BUILD_DIR, INCLUDE_EXTENSION );
-    $stub = $phar->createDefaultStub ( DEFAULT_STUB );
-    $phar->setStub ( "#!/usr/bin/php\n" . $stub );
-    $phar->stopBuffering ();
+    $tarphar = new Phar(PHAR_OUTPUT);
+    $phar = $tarphar->convertToExecutable(Phar::PHAR);
+    $phar->startBuffering();
+    $phar->buildFromDirectory(BUILD_DIR, INCLUDE_EXTENSION);
+    $stub = $phar->createDefaultStub(DEFAULT_STUB);
+    $phar->setStub("#!/usr/bin/php\n" . $stub);
+    $phar->stopBuffering();
 
 
 }
-catch ( Exception $e )
+catch (Exception $e)
 {
     echo $e;
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
     $phar->stopBuffering ();
 
 
-}
-catch ( Exception $e )
+} catch ( Exception $e )
 {
     echo $e;
 }
\ No newline at end of file

build/Classes/AdaptersDriver/Pgsql.php

Doc Comments -1 removed lines

@@ -71,7 +71,6 @@
     /**
      * Retorna um Array com nome das tabelas
      *
-     * @param void $schema
      *
      * @return string[]
      */

Spacing +51 added lines, -51 removed lines

@@ -27,9 +27,9 @@ 
     /**
      * @type array|\string[]
      */
-    protected $schema = array ( 'public' );
+    protected $schema = array('public');
 
-    protected $dataTypesToSimple = array (
+    protected $dataTypesToSimple = array(
         /* Numeric Types */
         'smallint'         => 'int',
         'integer'          => 'int',
@@ -57,11 +57,11 @@ 
         'boolean'          => 'boolean'
     );
 
-    public function __construct ( AbstractAdapter $adapterConfig )
+    public function __construct(AbstractAdapter $adapterConfig)
     {
-        parent::__construct ( $adapterConfig );
-        if ( $adapterConfig->hasSchemas () ) {
-            $this->schema = $adapterConfig->getSchemas ();
+        parent::__construct($adapterConfig);
+        if ($adapterConfig->hasSchemas()) {
+            $this->schema = $adapterConfig->getSchemas();
         }
 
     }
@@ -73,16 +73,16 @@ 
      *
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) ) {
+        if (empty($this->tableList)) {
 
-            $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
+            $sqlTables = ! empty($this->tablesName) ? "AND table_name IN ( $this->tablesName )" : '';
 
-            $strSchema = implode ( "', '", $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->tableList = $this->getPDO ()
-                                    ->query (
+            $this->tableList = $this->getPDO()
+                                    ->query(
                                         "SELECT table_schema,
               table_name
              FROM information_schema.tables
@@ -94,7 +94,7 @@ 
                table_name
               ASC"
                                     )
-                                    ->fetchAll ();
+                                    ->fetchAll();
         }
 
         return $this->tableList;
@@ -105,13 +105,13 @@ 
      *
      * @return array
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
-        $sqlTables = !empty($this->tablesName)?"AND c.table_name IN ( $this->tablesName )":'';
-        $strSchema = implode ( "', '", $this->schema );
+        $sqlTables = ! empty($this->tablesName) ? "AND c.table_name IN ( $this->tablesName )" : '';
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()
-                    ->query (
+        return $this->getPDO()
+                    ->query(
                         "SELECT distinct
 	c.table_schema,
 	c.table_name,
@@ -126,16 +126,16 @@ 
 		 $sqlTables and  c.table_schema IN ('$strSchema')
 		order by c.table_name asc"
                     )
-                    ->fetchAll ( \PDO::FETCH_ASSOC );
+                    ->fetchAll(\PDO::FETCH_ASSOC);
     }
 
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        $sqlTables = !empty($this->tablesName)?"AND tc.table_name IN ( $this->tablesName )":'';
-        $strSchema = implode ( "', '", $this->schema );
+        $sqlTables = ! empty($this->tablesName) ? "AND tc.table_name IN ( $this->tablesName )" : '';
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()
-                    ->query (
+        return $this->getPDO()
+                    ->query(
                         "SELECT distinct
                 tc.constraint_type,
                 tc.constraint_name,
@@ -157,7 +157,7 @@ 
                         AND tc.constraint_schema = ccu.constraint_schema
                     ORDER by tc.table_schema"
                     )
-                    ->fetchAll ( \PDO::FETCH_ASSOC );
+                    ->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
@@ -168,22 +168,22 @@ 
      *
      * @return string
      */
-    public function getSequence ( $table, $column, $schema = 0 )
+    public function getSequence($table, $column, $schema = 0)
     {
         $tableTemp = $table;
-        if ( 0 !== $schema ) {
+        if (0 !== $schema) {
             $tableTemp = $schema . '.' . $table;
         }
 
-        $pdo     = $this->getPDO ();
-        $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$tableTemp', '$column');" )
-                       ->fetchColumn ();
+        $pdo     = $this->getPDO();
+        $return1 = $pdo->query("SELECT pg_get_serial_sequence('$tableTemp', '$column');")
+                       ->fetchColumn();
 
-        if ( !is_null ( $return1 ) ) {
+        if ( ! is_null($return1)) {
             return $return1;
         }
 
-        $stmt = $pdo->prepare (
+        $stmt = $pdo->prepare(
             "SELECT distinct adsrc FROM pg_attrdef AS att
             INNER JOIN pg_class AS c
               ON adrelid = c.oid AND c.relname = ? --table
@@ -194,15 +194,15 @@ 
               "
         );
 
-        $stmt->bindParam ( 1, $table );
-        $stmt->bindParam ( 2, $column );
-        $stmt->bindParam ( 3, $schema );
-        $stmt->execute ();
-        $return2 = $stmt->fetchColumn ();
+        $stmt->bindParam(1, $table);
+        $stmt->bindParam(2, $column);
+        $stmt->bindParam(3, $schema);
+        $stmt->execute();
+        $return2 = $stmt->fetchColumn();
 
-        if ( $return2 ) {
-            return preg_filter (
-                array (
+        if ($return2) {
+            return preg_filter(
+                array(
                     '/nextval\(\'/',
                     '/\'::regclass\)/'
                 ),
@@ -217,9 +217,9 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
+        return sprintf(
             "pgsql:host=%s;port=%s;dbname=%s",
             $this->host,
             $this->port,
@@ -232,9 +232,9 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
+        return sprintf(
             "pgsql:unix_socket=%s;dbname=%s",
             $this->socket,
             $this->database
@@ -247,22 +247,22 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) ) {
-            $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
+        if (empty($this->totalTables)) {
+            $sqlTables = ! empty($this->tablesName) ? "AND table_name IN ( $this->tablesName )" : '';
 
-            $strSchema = implode ( "', '", $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->totalTables = $this->getPDO ()
-                                      ->query (
+            $this->totalTables = $this->getPDO()
+                                      ->query(
                                           "SELECT COUNT(table_name)  AS total
              FROM information_schema.tables
              WHERE
               table_type = 'BASE TABLE'
               AND table_schema IN ( '" . $strSchema . "' ) $sqlTables"
                                       )
-                                      ->fetchColumn ();
+                                      ->fetchColumn();
         }
 
         return (int) $this->totalTables;

Indentation +5 added lines, -5 removed lines

@@ -178,7 +178,7 @@ 
 
         $pdo     = $this->getPDO ();
         $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$tableTemp', '$column');" )
-                       ->fetchColumn ();
+                        ->fetchColumn ();
 
         if ( !is_null ( $return1 ) ) {
             return $return1;
@@ -256,14 +256,14 @@ 
             $strSchema = implode ( "', '", $this->schema );
 
             $this->totalTables = $this->getPDO ()
-                                      ->query (
-                                          "SELECT COUNT(table_name)  AS total
+                                        ->query (
+                                            "SELECT COUNT(table_name)  AS total
              FROM information_schema.tables
              WHERE
               table_type = 'BASE TABLE'
               AND table_schema IN ( '" . $strSchema . "' ) $sqlTables"
-                                      )
-                                      ->fetchColumn ();
+                                        )
+                                        ->fetchColumn ();
         }
 
         return (int) $this->totalTables;

build/Classes/AdapterConfig/None.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
 
     const SEPARETOR = "_";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -31,12 +31,12 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
 
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
         // TODO: Implement parseFrameworkConfig() method.
     }
@@ -46,12 +46,12 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
-        return array (
-            DbTable::getInstance (),
-            Entity::getInstance (),
-            Model::getInstance ()
+        return array(
+            DbTable::getInstance(),
+            Entity::getInstance(),
+            Model::getInstance()
         );
     }
 

build/Classes/AdapterMakerFile/Phalcon/Model.php

Indentation +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
 
     public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
     {
-       return array();
+        return array();
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
     /**
      * @var void
      */
-    protected $fileTpl       = "model.php";
+    protected $fileTpl = "model.php";
 
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
        return array();
     }

build/Classes/Db/Constrant.php

Doc Comments +3 added lines

@@ -70,6 +70,9 @@
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getDatabase (){
         return $this->database;
     }

Spacing +15 added lines, -15 removed lines

@@ -21,11 +21,11 @@ 
      *
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    final private function __construct ()
+    final private function __construct()
     {
     }
 
-    public static function getInstance ()
+    public static function getInstance()
     {
         return new self();
     }
@@ -55,34 +55,34 @@ 
      *
      * @return Constrant
      */
-    public function populate ( $array )
+    public function populate($array)
     {
-        if ( isset( $array[ 'schema' ] ) )
+        if (isset($array['schema']))
         {
-            $this->schema = $array[ 'schema' ];
+            $this->schema = $array['schema'];
         }
 
-        $this->database = $array[ 'database' ];
-        $this->constrant = $array[ 'constrant' ];
-        $this->table = $array[ 'table' ];
-        $this->column = $array[ 'column' ];
+        $this->database = $array['database'];
+        $this->constrant = $array['constrant'];
+        $this->table = $array['table'];
+        $this->column = $array['column'];
 
         return $this;
     }
 
-    public function getDatabase (){
+    public function getDatabase() {
         return $this->database;
     }
 
     /**
      * @return string
      */
-    public function getNameConstrant ()
+    public function getNameConstrant()
     {
         return $this->constrant;
     }
 
-    public function hasSchema ()
+    public function hasSchema()
     {
         return (bool) $this->schema;
     }
@@ -90,7 +90,7 @@ 
     /**
      * @return string
      */
-    public function getSchema ()
+    public function getSchema()
     {
         return $this->schema;
     }
@@ -98,7 +98,7 @@ 
     /**
      * @return string
      */
-    public function getTable ()
+    public function getTable()
     {
         return $this->table;
     }
@@ -106,7 +106,7 @@ 
     /**
      * @return string
      */
-    public function getColumn ()
+    public function getColumn()
     {
         return $this->column;
     }

build/Classes/AdapterConfig/AbstractAdapter.php

Doc Comments +4 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
     /**
      * @param \Classes\Db\DbTable|\Classes\Db\Constrant $table
      *
-     * @return mixed
+     * @return string
      */
 
     public function createClassNamespace ( $table )
@@ -225,6 +225,9 @@ 
         return true;
     }
 
+    /**
+     * @return string
+     */
     protected function getFrameworkIni ()
     {
         return $this->framworkFiles[ 'ini' ];
@@ -332,7 +335,6 @@ 
     }
 
     /**
-     * @param string $schema
      *
      * @return string
      */

Indentation +1 added lines, -1 removed lines

@@ -400,7 +400,7 @@
         $matches = preg_grep ( '*\.*' , $this->getTablesName () );
         if ( count ( $matches ) )
         {
-           die("\033[0;31mError: Table name must not contain the schema.\033[0m\n");
+            die("\033[0;31mError: Table name must not contain the schema.\033[0m\n");
         }
     }
 

Spacing +178 added lines, -178 removed lines

@@ -16,101 +16,101 @@ 
 abstract class AbstractAdapter
 {
 
-    protected $arrConfig = array (
+    protected $arrConfig = array(
         ############################# DATABASE
         //Driver do banco de dados
-        'driver'          => null ,
+        'driver'          => null,
         //Nome do banco de dados
-        'database'        => null ,
+        'database'        => null,
         //Host do banco
-        'host'            => 'localhost' ,
+        'host'            => 'localhost',
         //Port do banco
-        'port'            => '' ,
+        'port'            => '',
         //usuario do banco
-        'username'        => null ,
+        'username'        => null,
         //senha do banco
-        'password'        => null ,
+        'password'        => null,
         // lista de schemas do banco de dados
-        'schema'          => array () ,
-        'version'         => '' ,
-        'socket'          => null ,
+        'schema'          => array(),
+        'version'         => '',
+        'socket'          => null,
 
         ########################### DOCS
         // autor que gerou o script
-        'author'          => "Pedro" ,
-        'license'         => "New BSD License" ,
-        'copyright'       => "ORM Generator - Pedro151" ,
-        'link'            => 'https://github.com/pedro151/orm-generator' ,
-        'version'         => '' ,
+        'author'          => "Pedro",
+        'license'         => "New BSD License",
+        'copyright'       => "ORM Generator - Pedro151",
+        'link'            => 'https://github.com/pedro151/orm-generator',
+        'version'         => '',
         // data que foi gerado o script
-        'last_modify'     => null ,
+        'last_modify'     => null,
 
         ########################## Ambiente/Arquivos
 
         // Nome do framework para o adapter
-        'framework'       => null ,
+        'framework'       => null,
         // namespace das classes
-        'namespace'       => "" ,
+        'namespace'       => "",
         // caminho onde os arquivos devem ser criados
-        'path'            => 'models' ,
+        'path'            => 'models',
         // flag para gerar pasta com o nome do driver do banco de dados
-        'folder-database' => 0 ,
+        'folder-database' => 0,
         // string com o nome da pastar personalizada
-        'folder-name'     => '' ,
+        'folder-name'     => '',
 
         'clean-trash'     => false,
 
         ############################## Comandos adicionais
         //flag para mostrar o status da execução ao termino do processo
-        'status'          => false ,
+        'status'          => false,
         // flags para criar todas as tabelas ou nao
-        'tables'          => array () ,
+        'tables'          => array(),
         // lista de Classes opcionais pre-definidas para serem criadas
-        'optional-classes'=> array (),
+        'optional-classes'=> array(),
         //Lista de tabelas a serem ignoradas
-        'ignoreTable'     => array () ,
+        'ignoreTable'     => array(),
     );
 
     /**
      * @var string[] um array com todos os campos obrigatorios
      */
-    protected $attRequered = array (
-        'driver'   => true ,
-        'database' => true ,
-        'host'     => true ,
-        'username' => true ,
+    protected $attRequered = array(
+        'driver'   => true,
+        'database' => true,
+        'host'     => true,
+        'username' => true,
         'path'     => true
     );
 
-    protected $arrFunc = array ();
+    protected $arrFunc = array();
 
-    private $framworkFiles = array ();
+    private $framworkFiles = array();
 
-    public $reservedWord = array ();
+    public $reservedWord = array();
 
-    private static $dataTypesDefault = array (
-        'int'       => 'int' ,
-        'float'     => 'float' ,
-        'string'    => 'string' ,
-        'text'      => 'string' ,
-        'date'      => 'date' ,
-        'datetime'  => 'datetime' ,
-        'timestamp' => 'timestamp' ,
+    private static $dataTypesDefault = array(
+        'int'       => 'int',
+        'float'     => 'float',
+        'string'    => 'string',
+        'text'      => 'string',
+        'date'      => 'date',
+        'datetime'  => 'datetime',
+        'timestamp' => 'timestamp',
         'boolean'   => 'boolean'
     );
 
-    private static $dataTypesPhp = array (
-        'int'       => 'int' ,
-        'float'     => 'float' ,
-        'string'    => 'string' ,
-        'text'      => 'string' ,
-        'date'      => 'string' ,
-        'datetime'  => 'string' ,
-        'timestamp' => 'string' ,
+    private static $dataTypesPhp = array(
+        'int'       => 'int',
+        'float'     => 'float',
+        'string'    => 'string',
+        'text'      => 'string',
+        'date'      => 'string',
+        'datetime'  => 'string',
+        'timestamp' => 'string',
         'boolean'   => 'boolean'
     );
 
-    protected $dataTypes = array ();
+    protected $dataTypes = array();
 
     const SEPARETOR = "";
 
@@ -119,9 +119,9 @@ 
      *
      * @return bool
      */
-    protected function checkConfig ()
+    protected function checkConfig()
     {
-        if ( array_diff_key ( $this->attRequered , array_filter ( $this->arrConfig ) ) )
+        if (array_diff_key($this->attRequered, array_filter($this->arrConfig)))
         {
             return false;
         }
@@ -134,33 +134,33 @@ 
      *
      * @return array
      */
-    abstract protected function getParams ();
+    abstract protected function getParams();
 
     /**
      * Popula as config do generater com as configuraçoes do framework
      *
      * @return mixed
      */
-    abstract protected function parseFrameworkConfig ();
+    abstract protected function parseFrameworkConfig();
 
     /**
      * Cria Instancias dos arquivos que devem ser gerados
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    abstract public function getMakeFileInstances ();
+    abstract public function getMakeFileInstances();
 
-    abstract protected function init ();
+    abstract protected function init();
 
     /**
      * retorna a base do Namespace
      *
      * @return array
      */
-    protected function getBaseNamespace ()
+    protected function getBaseNamespace()
     {
-        return array (
-            $this->arrConfig[ 'namespace' ] ,
+        return array(
+            $this->arrConfig['namespace'],
             'Model'
         );
     }
@@ -171,54 +171,54 @@ 
      * @return mixed
      */
 
-    public function createClassNamespace ( $table )
+    public function createClassNamespace($table)
     {
-        $arrNames = $this->getBaseNamespace ();
+        $arrNames = $this->getBaseNamespace();
 
-        if ( isset( $this->arrConfig[ 'folder-database' ] )
-             && $this->arrConfig[ 'folder-database' ]
+        if (isset($this->arrConfig['folder-database'])
+             && $this->arrConfig['folder-database']
         )
         {
-            $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'driver' ] );
+            $arrNames[] = AbstractMaker::getClassName($this->arrConfig['driver']);
         }
 
-        if ( isset( $this->arrConfig[ 'folder-name' ] )
-             && $this->arrConfig[ 'folder-name' ]
+        if (isset($this->arrConfig['folder-name'])
+             && $this->arrConfig['folder-name']
         )
         {
-            $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'folder-name' ] );
+            $arrNames[] = AbstractMaker::getClassName($this->arrConfig['folder-name']);
         }
 
-        if ( $table->hasSchema () )
+        if ($table->hasSchema())
         {
-            $arrNames[] = $this->replaceReservedWord ( AbstractMaker::getClassName ( $table->getSchema () ) );
+            $arrNames[] = $this->replaceReservedWord(AbstractMaker::getClassName($table->getSchema()));
         } else
         {
-            $arrNames[] = $this->replaceReservedWord ( AbstractMaker::getClassName ( $table->getDatabase () ) );
+            $arrNames[] = $this->replaceReservedWord(AbstractMaker::getClassName($table->getDatabase()));
         }
 
-        return implode ( static::SEPARETOR , array_filter ( $arrNames ) );
+        return implode(static::SEPARETOR, array_filter($arrNames));
     }
 
-    public function __construct ( $array )
+    public function __construct($array)
     {
         $this->dataTypes = $this->dataTypes + self::$dataTypesDefault;
-        $array += array (
-            'version'     => Config::$version ,
-            'author'      => ucfirst ( get_current_user () ) ,
-            'last_modify' => date ( "d-m-Y" )
+        $array += array(
+            'version'     => Config::$version,
+            'author'      => ucfirst(get_current_user()),
+            'last_modify' => date("d-m-Y")
         );
 
-        $this->setFrameworkFiles ( $array );
-        $this->parseFrameworkConfig ();
-        $this->setParams ( $this->getParams () );
-        $this->setParams ( $array );
-        $this->init ();
-        $this->validTableNames ();
-        if ( ! $this->isValid () )
+        $this->setFrameworkFiles($array);
+        $this->parseFrameworkConfig();
+        $this->setParams($this->getParams());
+        $this->setParams($array);
+        $this->init();
+        $this->validTableNames();
+        if ( ! $this->isValid())
         {
-            $var = array_diff_key ( $this->attRequered , array_filter ( $this->arrConfig ) );
-            throw new Exception( $var );
+            $var = array_diff_key($this->attRequered, array_filter($this->arrConfig));
+            throw new Exception($var);
         }
     }
 
@@ -227,43 +227,43 @@ 
      *
      * @param $array
      */
-    public function setFrameworkFiles ( $array )
+    public function setFrameworkFiles($array)
     {
-        $this->framworkFiles[ 'library' ] = isset( $array[ 'framework-path-library' ] )
-            ? $array[ 'framework-path-library' ] : null;
+        $this->framworkFiles['library'] = isset($array['framework-path-library'])
+            ? $array['framework-path-library'] : null;
 
-        $this->framworkFiles[ 'ini' ] = isset( $array[ 'framework-ini' ] )
-            ? $array[ 'framework-ini' ] : null;
+        $this->framworkFiles['ini'] = isset($array['framework-ini'])
+            ? $array['framework-ini'] : null;
 
-        $this->framworkFiles[ 'environment' ] = isset( $array[ 'environment' ] )
-            ? $array[ 'environment' ] : 'production';
+        $this->framworkFiles['environment'] = isset($array['environment'])
+            ? $array['environment'] : 'production';
 
     }
 
-    protected function isValidFrameworkFiles ()
+    protected function isValidFrameworkFiles()
     {
-        if ( ! is_file ( $this->framworkFiles[ 'ini' ] ) )
+        if ( ! is_file($this->framworkFiles['ini']))
         {
             return false;
         }
 
-        if ( ! is_dir ( $this->framworkFiles[ 'library' ] ) )
+        if ( ! is_dir($this->framworkFiles['library']))
         {
             return false;
         }
 
-        if ( ! isset ( $this->framworkFiles[ 'environment' ] )
-             or empty( $this->framworkFiles[ 'environment' ] )
+        if ( ! isset ($this->framworkFiles['environment'])
+             or empty($this->framworkFiles['environment'])
         )
         {
             return false;
         }
-        set_include_path (
-            implode (
-                PATH_SEPARATOR ,
-                array (
-                    realpath ( $this->framworkFiles[ 'library' ] ) ,
-                    get_include_path () ,
+        set_include_path(
+            implode(
+                PATH_SEPARATOR,
+                array(
+                    realpath($this->framworkFiles['library']),
+                    get_include_path(),
                 )
             )
         );
@@ -271,119 +271,119 @@ 
         return true;
     }
 
-    protected function getFrameworkIni ()
+    protected function getFrameworkIni()
     {
-        return $this->framworkFiles[ 'ini' ];
+        return $this->framworkFiles['ini'];
     }
 
-    protected function getEnvironment ()
+    protected function getEnvironment()
     {
-        return $this->framworkFiles[ 'environment' ];
+        return $this->framworkFiles['environment'];
     }
 
     /**
      * Popula as variaveis de acordo com o arquivo de configuração do seu  framework
      */
-    protected function isValid ()
+    protected function isValid()
     {
-        return $this->checkConfig ();
+        return $this->checkConfig();
     }
 
-    private function setParams ( $array )
+    private function setParams($array)
     {
-        if ( count ( $array ) > 0 )
+        if (count($array) > 0)
         {
-            $this->arrConfig = array_filter ( $array ) + $this->arrConfig;
+            $this->arrConfig = array_filter($array) + $this->arrConfig;
         }
     }
 
     /**
      * @return string
      */
-    public function getDatabase ()
+    public function getDatabase()
     {
-        return $this->arrConfig[ 'database' ];
+        return $this->arrConfig['database'];
     }
 
     /**
      * @return bool
      */
-    public function hasSchemas ()
+    public function hasSchemas()
     {
-        return ! empty ( $this->arrConfig[ 'schema' ] );
+        return ! empty ($this->arrConfig['schema']);
     }
 
     /**
      * @return string[]
      */
-    public function getSchemas ()
+    public function getSchemas()
     {
-        if ( is_string ( $this->arrConfig[ 'schema' ] ) )
+        if (is_string($this->arrConfig['schema']))
         {
-            return array ( $this->arrConfig[ 'schema' ] );
+            return array($this->arrConfig['schema']);
         }
 
-        return $this->arrConfig[ 'schema' ];
+        return $this->arrConfig['schema'];
     }
 
-    public function setSchema ( $schema )
+    public function setSchema($schema)
     {
-        $this->arrConfig[ 'schema' ] = $schema;
+        $this->arrConfig['schema'] = $schema;
     }
 
     /**
      * @return string
      */
-    public function getHost ()
+    public function getHost()
     {
-        return $this->arrConfig[ 'host' ];
+        return $this->arrConfig['host'];
     }
 
     /**
      * @return int
      */
-    public function getPort ()
+    public function getPort()
     {
-        return $this->arrConfig[ 'port' ];
+        return $this->arrConfig['port'];
     }
 
     /**
      * @return boolean
      */
-    public function hasPort ()
+    public function hasPort()
     {
-        return ! empty( $this->arrConfig[ 'port' ] );
+        return ! empty($this->arrConfig['port']);
     }
 
     /**
      * @return boolean
      */
-    public function isCleanTrash(){
-        return (boolean) $this->arrConfig[ 'clean-trash' ];
+    public function isCleanTrash() {
+        return (boolean) $this->arrConfig['clean-trash'];
     }
 
     /**
      * @return string
      */
-    public function getSocket ()
+    public function getSocket()
     {
-        return $this->arrConfig[ 'socket' ];
+        return $this->arrConfig['socket'];
     }
 
     /**
      * @return string
      */
-    public function getUser ()
+    public function getUser()
     {
-        return $this->arrConfig[ 'username' ];
+        return $this->arrConfig['username'];
     }
 
     /**
      * @return string
      */
-    public function getPassword ()
+    public function getPassword()
     {
-        return $this->arrConfig[ 'password' ];
+        return $this->arrConfig['password'];
     }
 
     /**
@@ -391,11 +391,11 @@ 
      *
      * @return string
      */
-    public function replaceReservedWord ( $palavra )
+    public function replaceReservedWord($palavra)
     {
-        if ( isset( $this->reservedWord[ strtolower ( $palavra ) ] ) )
+        if (isset($this->reservedWord[strtolower($palavra)]))
         {
-            return $this->reservedWord[ strtolower ( $palavra ) ];
+            return $this->reservedWord[strtolower($palavra)];
         }
 
         return $palavra;
@@ -404,15 +404,15 @@ 
     /**
      * @return bool
      */
-    public function isStatusEnabled ()
+    public function isStatusEnabled()
     {
-        return (bool) $this->arrConfig[ 'status' ];
+        return (bool) $this->arrConfig['status'];
     }
 
-    public function validTableNames ()
+    public function validTableNames()
     {
-        $matches = preg_grep ( '*\.*' , $this->getTablesName () );
-        if ( count ( $matches ) )
+        $matches = preg_grep('*\.*', $this->getTablesName());
+        if (count($matches))
         {
            die("\033[0;31mError: Table name must not contain the schema.\033[0m\n");
         }
@@ -421,49 +421,49 @@ 
     /**
      * @return bool
      */
-    public function hasTablesName (){
-        return ! empty( $this->arrConfig[ 'tables' ] );
+    public function hasTablesName() {
+        return ! empty($this->arrConfig['tables']);
     }
 
     /**
      * @return string[]
      */
-    public function getTablesName ()
+    public function getTablesName()
     {
-        if ( is_string ( $this->arrConfig[ 'tables' ] ) )
+        if (is_string($this->arrConfig['tables']))
         {
-            return array ( $this->arrConfig[ 'tables' ] );
+            return array($this->arrConfig['tables']);
         }
 
-        return $this->arrConfig[ 'tables' ];
+        return $this->arrConfig['tables'];
     }
 
     /**
      * @return string
      */
-    public function getListTablesName(){
-        $str = implode("','", $this->getTablesName() );
+    public function getListTablesName() {
+        $str = implode("','", $this->getTablesName());
         return "'$str'";
     }
 
     /**
      * @return bool
      */
-    public function hasOptionalClasses (){
-        return ! empty( $this->arrConfig[ 'optional-classes' ] );
+    public function hasOptionalClasses() {
+        return ! empty($this->arrConfig['optional-classes']);
     }
 
     /**
      * @return string[]
      */
-    public function getOptionalClasses ()
+    public function getOptionalClasses()
     {
-        if ( is_string ( $this->arrConfig[ 'optional-classes' ] ) )
+        if (is_string($this->arrConfig['optional-classes']))
         {
-            return array ( $this->arrConfig[ 'optional-classes' ] );
+            return array($this->arrConfig['optional-classes']);
         }
 
-        return $this->arrConfig[ 'optional-classes' ];
+        return $this->arrConfig['optional-classes'];
     }
 
     /**
@@ -471,25 +471,25 @@ 
      *
      * @return string
      */
-    public function __get ( $str )
+    public function __get($str)
     {
-        $arr = array (
-            'namespace' ,
-            'framework' ,
-            'author' ,
-            'license' ,
-            'version' ,
-            'copyright' ,
-            'link' ,
-            'last_modify' ,
-            'path' ,
-            'folder-database' ,
+        $arr = array(
+            'namespace',
+            'framework',
+            'author',
+            'license',
+            'version',
+            'copyright',
+            'link',
+            'last_modify',
+            'path',
+            'folder-database',
             'folder-name'
         );
 
-        if ( in_array ( $str , $arr ) )
+        if (in_array($str, $arr))
         {
-            return $this->arrConfig[ strtolower ( $str ) ];
+            return $this->arrConfig[strtolower($str)];
         }
 
         return;
@@ -500,9 +500,9 @@ 
      *
      * @return string
      */
-    public static function convertTypeToPHP ( $type )
+    public static function convertTypeToPHP($type)
     {
-        return self::$dataTypesPhp[ $type ];
+        return self::$dataTypesPhp[$type];
     }
 
     /**
@@ -510,9 +510,9 @@ 
      *
      * @return string
      */
-    public static function convertTypeToDefault ( $type )
+    public static function convertTypeToDefault($type)
     {
-        return self::$dataTypesDefault[ $type ];
+        return self::$dataTypesDefault[$type];
     }
 
     /**
@@ -520,8 +520,8 @@ 
      *
      * @return string
      */
-    public function convertTypeToTypeFramework ( $type )
+    public function convertTypeToTypeFramework($type)
     {
-        return $this->dataTypes[ $type ];
+        return $this->dataTypes[$type];
     }
 }