pedro151 / orm-generator

build/Classes/AdapterConfig/ZendFrameworkOne.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
     /**
      * Cria Instancias dos arquivos que devem ser gerados
      *
-     * @return AbstractAdapter[]
+     * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
     public function getMakeFileInstances ()
     {

Spacing +33 added lines, -33 removed lines

@@ -24,7 +24,7 @@ 
 
     const SEPARETOR = "_";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -33,75 +33,75 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
-        if ( ! $this->config or !$this->isValidFrameworkFiles ())
+        if ( ! $this->config or ! $this->isValidFrameworkFiles())
         {
-            return array ();
+            return array();
         }
 
-        return array (
+        return array(
             //Driver do banco de dados
-            'driver'   => $this->config[ 'adapter' ] ,
+            'driver'   => $this->config['adapter'],
             //Nome do banco de dados
-            'database' => $this->config[ 'params' ][ 'dbname' ] ,
+            'database' => $this->config['params']['dbname'],
             //Host do banco
-            'host'     => $this->config[ 'params' ][ 'host' ] ,
+            'host'     => $this->config['params']['host'],
             //Port do banco
-            'port'     => isset( $this->config[ 'params' ][ 'port' ] )
-                ? $this->config[ 'params' ][ 'port' ] : '' ,
+            'port'     => isset($this->config['params']['port'])
+                ? $this->config['params']['port'] : '',
             //usuario do banco
-            'username' => $this->config[ 'params' ][ 'username' ] ,
+            'username' => $this->config['params']['username'],
             //senha do banco
-            'password' => $this->config[ 'params' ][ 'password' ] ,
+            'password' => $this->config['params']['password'],
         );
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
-        if(!$this->isValidFrameworkFiles ()){
+        if ( ! $this->isValidFrameworkFiles()) {
             return;
         }
 
-        $frameworkIni = $this->getFrameworkIni ();
+        $frameworkIni = $this->getFrameworkIni();
 
         require_once 'Zend/Config/Ini.php';
 
         $objConfig = new \Zend_Config_Ini(
-            realpath ( $frameworkIni ) , $this->getEnvironment ()
+            realpath($frameworkIni), $this->getEnvironment()
         );
 
-        $arrConfig = $objConfig->toArray ();
+        $arrConfig = $objConfig->toArray();
 
-        if ( isset( $arrConfig[ 'resources' ][ 'db' ] ) )
+        if (isset($arrConfig['resources']['db']))
         {
-            $this->config = $arrConfig[ 'resources' ][ 'db' ];
+            $this->config = $arrConfig['resources']['db'];
         }
     }
 
-    public function createClassNamespace ( $table )
+    public function createClassNamespace($table)
     {
-        $arrNames = array (
-            $this->arrConfig[ 'namespace' ] ,
+        $arrNames = array(
+            $this->arrConfig['namespace'],
             'Model'
         );
 
-        if ( isset( $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 ( $table->hasSchema () )
+        if ($table->hasSchema())
         {
-            $arrNames[] = AbstractMaker::getClassName ( $table->getSchema () );
+            $arrNames[] = AbstractMaker::getClassName($table->getSchema());
         } else
         {
-            $arrNames[] = AbstractMaker::getClassName ( $table->getDatabase () );
+            $arrNames[] = AbstractMaker::getClassName($table->getDatabase());
         }
 
-        return implode ( self::SEPARETOR , array_filter ( $arrNames ) );
+        return implode(self::SEPARETOR, array_filter($arrNames));
     }
 
     /**
@@ -109,12 +109,12 @@ 
      *
      * @return 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/AdaptersDriver/Mssql.php

Doc Comments -1 removed lines

@@ -54,7 +54,6 @@
 
     /**
      * @inheritDoc
-     * @param string $databaseName
      * @return \Classes\Db\DbTable[]
      */
     public function getTables($schema = 0)

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
      *
      * @return array[]
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
         // TODO: Implement getListColumns() method.
     }
@@ -88,17 +88,17 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
         // TODO: Implement totalTables() method.
     }
 
-    public function getSequence ( $table , $column )
+    public function getSequence($table, $column)
     {
         // TODO: Implement getSequence() method.
     }
 
-    public function getListConstrant ()
+    public function getListConstrant()
     {
         // TODO: Implement getListConstrant() method.
     }

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 +27 added lines, -27 removed lines

@@ -24,21 +24,21 @@ 
 
     private $msg = "\033[0mPlease enter the value for %index% \033[1;33m[%config%]:\033[0m ";
 
-    private $configs = array (
-        'config-env'  => 'config' ,
-        'framework'   => 'none' ,
-        'driver'      => 'pgsql' ,
-        'environment' => 'dev' ,
-        'host'        => 'localhost' ,
-        'database'    => null ,
-        'schema'      => null ,
-        'username'    => null ,
+    private $configs = array(
+        'config-env'  => '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 = dirname ( $basePath );
+        $this->baseLocation = dirname($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[ 'config-env' ] . '.ini' ,
-            $this->getParsedTplContents ( $this->template , $this->argv )
+        self::makeDir($path);
+        self::makeSourcer(
+            $path . DIRECTORY_SEPARATOR . $this->argv['config-env'] . '.ini',
+            $this->getParsedTplContents($this->template, $this->argv)
         );
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }

build/Classes/MakerFile.php

Doc Comments +6 added lines, -1 removed lines

@@ -46,6 +46,7 @@ 
 
     /**
      * Analisa os caminhos das pastas base
+     * @param string $basePath
      */
     public function parseLocation ( $basePath )
     {
@@ -175,6 +176,9 @@ 
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }
 
+    /**
+     * @param integer $countFiles
+     */
     private function reportProcess ( $countFiles )
     {
         if ( $this->config->isStatusEnabled () )
@@ -194,7 +198,7 @@ 
     /**
      * Instancia os Modulos de diretorios e tampletes
      *
-     * @return AbstractAdapter[]
+     * @return AdapterConfig\AbstractAdapter[]
      */
     public function factoryMakerFile ()
     {
@@ -225,6 +229,7 @@ 
      * parse a tpl file and return the result
      *
      * @param String $tplFile
+     * @param AdapterConfig\AbstractAdapter $objMakeFile
      *
      * @return String
      */

Spacing +81 added lines, -81 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * @type string[]
      */
-    public $location = array ();
+    public $location = array();
 
     /**
      * caminho de pastas Base
@@ -37,154 +37,154 @@ 
      */
     private $driver;
 
-    public function __construct ( Config $config )
+    public function __construct(Config $config)
     {
-        $this->config = $config->getAdapterConfig ();
-        $this->driver = $config->getAdapterDriver ();
-        $this->parseLocation ( $config->_basePath );
+        $this->config = $config->getAdapterConfig();
+        $this->driver = $config->getAdapterDriver();
+        $this->parseLocation($config->_basePath);
     }
 
     /**
      * Analisa os caminhos das pastas base
      */
-    public function parseLocation ( $basePath )
+    public function parseLocation($basePath)
     {
 
-        $arrBase = array (
-            $basePath ,
+        $arrBase = array(
+            $basePath,
             $this->config->path
         );
 
-        $this->baseLocation = implode ( DIRECTORY_SEPARATOR , array_filter ( $arrBase ) );
+        $this->baseLocation = implode(DIRECTORY_SEPARATOR, array_filter($arrBase));
 
         # pasta com nome do driver do banco
         $driverBase = '';
-        if ( $this->config->{"folder-database"} )
+        if ($this->config->{"folder-database"} )
         {
-            $classDriver = explode ( '\\' , get_class ( $this->driver ) );
-            $driverBase = end ( $classDriver );
+            $classDriver = explode('\\', get_class($this->driver));
+            $driverBase = end($classDriver);
         }
 
-        if ( $this->config->hasSchemas () )
+        if ($this->config->hasSchemas())
         {
 
-            $schemas = $this->config->getSchemas ();
-            foreach ( $schemas as $schema )
+            $schemas = $this->config->getSchemas();
+            foreach ($schemas as $schema)
             {
-                $arrUrl = array (
-                    $this->baseLocation ,
-                    $driverBase ,
-                    $this->getClassName ( $schema )
+                $arrUrl = array(
+                    $this->baseLocation,
+                    $driverBase,
+                    $this->getClassName($schema)
                 );
 
-                $this->location[ $schema ] = implode ( DIRECTORY_SEPARATOR , array_filter ( $arrUrl ) );
-                unset( $arrUrl );
+                $this->location[$schema] = implode(DIRECTORY_SEPARATOR, array_filter($arrUrl));
+                unset($arrUrl);
             }
 
 
         } else
         {
-            $baseLocation = implode (
-                DIRECTORY_SEPARATOR , array_filter ( array (
-                        $this->baseLocation ,
-                        $driverBase ,
-                        $this->getClassName ( $this->getConfig ()->getDatabase () )
+            $baseLocation = implode(
+                DIRECTORY_SEPARATOR, array_filter(array(
+                        $this->baseLocation,
+                        $driverBase,
+                        $this->getClassName($this->getConfig()->getDatabase())
                     )
                 )
             );
-            $this->location = array ( $baseLocation );
+            $this->location = array($baseLocation);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getConfig ()
+    public function getConfig()
     {
         return $this->config;
     }
 
     /* Get current time */
-    public function startTime ()
+    public function startTime()
     {
         echo "Starting..\n";
-        $this->startTime = microtime ( true );
+        $this->startTime = microtime(true);
     }
 
-    private function getRunTime ()
+    private function getRunTime()
     {
-        return round ( ( microtime ( true ) - $this->startTime ) , 3 );
+        return round((microtime(true) - $this->startTime), 3);
     }
 
     /**
      * Executa o Make, criando arquivos e Diretorios
      */
-    public function run ()
+    public function run()
     {
-        $this->startTime ();
-        $this->driver->runDatabase ();
-        $max = $this->driver->getTotalTables () * count ( $this->factoryMakerFile () );
+        $this->startTime();
+        $this->driver->runDatabase();
+        $max = $this->driver->getTotalTables() * count($this->factoryMakerFile());
         $cur = 0;
 
 
-        foreach ( $this->location as $schema => $location )
+        foreach ($this->location as $schema => $location)
         {
-            foreach ( $this->factoryMakerFile () as $objMakeFile )
+            foreach ($this->factoryMakerFile() as $objMakeFile)
             {
-                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName ();
-                self::makeDir ( $path );
+                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName();
+                self::makeDir($path);
 
-                if ( $objMakeFile->getParentFileTpl () != '' )
+                if ($objMakeFile->getParentFileTpl() != '')
                 {
                     $fileAbstract = $this->baseLocation
                                     . DIRECTORY_SEPARATOR
-                                    . $objMakeFile->getParentClass () . '.php';
+                                    . $objMakeFile->getParentClass() . '.php';
 
-                    $tplAbstract = $this->getParsedTplContents ( $objMakeFile->getParentFileTpl () );
-                    self::makeSourcer ( $fileAbstract , $tplAbstract , $objMakeFile->isOverwrite () );
-                    unset( $fileAbstract , $tplAbstract );
+                    $tplAbstract = $this->getParsedTplContents($objMakeFile->getParentFileTpl());
+                    self::makeSourcer($fileAbstract, $tplAbstract, $objMakeFile->isOverwrite());
+                    unset($fileAbstract, $tplAbstract);
                 }
 
-                foreach ( $this->driver->getTables ( $schema ) as $key => $objTables )
+                foreach ($this->driver->getTables($schema) as $key => $objTables)
                 {
-                    $total = ceil ( $cur / $max ) * 100;
-                    printf ( "\r Creating: %6.2f%%" , $total );
-                    $cur ++;
+                    $total = ceil($cur / $max) * 100;
+                    printf("\r Creating: %6.2f%%", $total);
+                    $cur++;
 
                     $file = $path
                             . DIRECTORY_SEPARATOR
-                            . self::getClassName ( $objTables->getName () )
+                            . self::getClassName($objTables->getName())
                             . '.php';
 
 
-                    $tpl = $this->getParsedTplContents (
-                        $objMakeFile->getFileTpl () ,
-                        $objMakeFile->parseRelation ( $this , $objTables )
-                        , $objTables , $objMakeFile
+                    $tpl = $this->getParsedTplContents(
+                        $objMakeFile->getFileTpl(),
+                        $objMakeFile->parseRelation($this, $objTables)
+                        , $objTables, $objMakeFile
 
                     );
-                    self::makeSourcer ( $file , $tpl , $objMakeFile->isOverwrite () );
+                    self::makeSourcer($file, $tpl, $objMakeFile->isOverwrite());
                 }
 
             }
         }
 
-        $this->reportProcess ( $cur );
+        $this->reportProcess($cur);
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }
 
-    private function reportProcess ( $countFiles )
+    private function reportProcess($countFiles)
     {
-        if ( $this->config->isStatusEnabled () )
+        if ($this->config->isStatusEnabled())
         {
-            $databases = count ( $this->location );
-            $countDir = $this->countDiretory ();
-            $totalTable = $this->driver->getTotalTables ();
+            $databases = count($this->location);
+            $countDir = $this->countDiretory();
+            $totalTable = $this->driver->getTotalTables();
             echo "\n------";
-            printf ( "\n\r-Files generated:%s" , $countFiles );
-            printf ( "\n\r-Diretory generated:%s" , $databases * $countDir );
-            printf ( "\n\r-Scanned tables:%s" , $totalTable );
-            printf ( "\n\r-Execution time: %ssec" , $this->getRunTime () );
+            printf("\n\r-Files generated:%s", $countFiles);
+            printf("\n\r-Diretory generated:%s", $databases * $countDir);
+            printf("\n\r-Scanned tables:%s", $totalTable);
+            printf("\n\r-Execution time: %ssec", $this->getRunTime());
             echo "\n------";
         }
     }
@@ -194,9 +194,9 @@ 
      *
      * @return AbstractAdapter[]
      */
-    public function factoryMakerFile ()
+    public function factoryMakerFile()
     {
-        return $this->config->getMakeFileInstances ();
+        return $this->config->getMakeFileInstances();
     }
 
     /**
@@ -204,14 +204,14 @@ 
      *
      * @return int
      */
-    public function countDiretory ()
+    public function countDiretory()
     {
         $dir = 0;
-        foreach ( $this->factoryMakerFile () as $abstractAdapter )
+        foreach ($this->factoryMakerFile() as $abstractAdapter)
         {
-            if ( $abstractAdapter->hasDiretory () )
+            if ($abstractAdapter->hasDiretory())
             {
-                $dir ++;
+                $dir++;
             }
         }
 
@@ -226,23 +226,23 @@ 
      *
      * @return String
      */
-    protected function getParsedTplContents ( $tplFile , $vars = array () , \Classes\Db\DbTable $objTables = null , $objMakeFile = null )
+    protected function getParsedTplContents($tplFile, $vars = array(), \Classes\Db\DbTable $objTables = null, $objMakeFile = null)
     {
 
-        $arrUrl = array (
-            __DIR__ ,
-            'templates' ,
-            $this->config->framework ,
+        $arrUrl = array(
+            __DIR__,
+            'templates',
+            $this->config->framework,
             $tplFile
         );
 
-        $filePath = implode ( DIRECTORY_SEPARATOR , filter_var_array ( $arrUrl ) );
+        $filePath = implode(DIRECTORY_SEPARATOR, filter_var_array($arrUrl));
 
-        extract ( $vars );
-        ob_start ();
+        extract($vars);
+        ob_start();
         require $filePath;
-        $data = ob_get_contents ();
-        ob_end_clean ();
+        $data = ob_get_contents();
+        ob_end_clean();
 
         return $data;
     }

build/phar-generate.php

Spacing +34 added lines, -34 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
-if ( ! ini_get ( 'short_open_tag' ) )
+if ( ! ini_get('short_open_tag'))
 {
-    die( "please enable short_open_tag directive in php.ini\n" );
+    die("please enable short_open_tag directive in php.ini\n");
 }
 
-if ( ! ini_get ( 'register_argc_argv' ) )
+if ( ! ini_get('register_argc_argv'))
 {
-    die( "please enable register_argc_argv directive in php.ini\n" );
+    die("please enable register_argc_argv directive in php.ini\n");
 }
 
 if (function_exists('ini_set')) {
     @ini_set('display_errors', 1);
 
-    $memoryInBytes = function ($value) {
+    $memoryInBytes = function($value) {
         $unit = strtolower(substr($value, -1, 1));
         $value = (int) $value;
-        switch($unit) {
+        switch ($unit) {
             case 'g':
                 $value *= 1024;
             // no break (cumulative multiplier)
@@ -38,14 +38,14 @@ 
     unset($memoryInBytes, $memoryLimit);
 }
 
-\Phar::interceptFileFuncs ();
+\Phar::interceptFileFuncs();
 
-set_include_path (
-    implode (
-        PATH_SEPARATOR ,
-        array (
-            realpath ( __DIR__ ) ,
-            get_include_path () ,
+set_include_path(
+    implode(
+        PATH_SEPARATOR,
+        array(
+            realpath(__DIR__),
+            get_include_path(),
         )
     )
 );
@@ -56,43 +56,43 @@ 
 
 try
 {
-    $_path = realpath (
-        str_replace (
+    $_path = realpath(
+        str_replace(
             'phar://'
-            , '' , __DIR__
+            , '', __DIR__
         )
     );
 
-    $arrValid = array (
-        'version' ,
-        'help' ,
-        'status' ,
-        'init' ,
-        'config-env:' ,
-        'config-ini:' ,
-        'database:' ,
-        'schema:' ,
-        'driver:' ,
-        'framework:' ,
+    $arrValid = array(
+        'version',
+        'help',
+        'status',
+        'init',
+        'config-env:',
+        'config-ini:',
+        'database:',
+        'schema:',
+        'driver:',
+        'framework:',
         'path:'
     );
 
-    $argv = getopt ( null, $arrValid );
+    $argv = getopt(null, $arrValid);
 
-    if ( array_key_exists ( 'init', $argv ) )
+    if (array_key_exists('init', $argv))
     {
-        $maker = new \Classes\MakerConfigFile( $argv, $_path );
+        $maker = new \Classes\MakerConfigFile($argv, $_path);
     }
     else
     {
-        $maker = new \Classes\MakerFile( new \Classes\Config( $argv, $_path ) );
+        $maker = new \Classes\MakerFile(new \Classes\Config($argv, $_path));
     }
 
-    $maker->run ();
+    $maker->run();
 
-} catch ( \Exception $e )
+} catch (\Exception $e)
 {
-    die( $e->getMessage () );
+    die($e->getMessage());
 }
 
 __halt_compiler();
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
     if ( array_key_exists ( 'init', $argv ) )
     {
         $maker = new \Classes\MakerConfigFile( $argv, $_path );
-    }
-    else
+    } else
     {
         $maker = new \Classes\MakerFile( new \Classes\Config( $argv, $_path ) );
     }

build/Classes/AdaptersDriver/Mysql.php

Indentation +2 added lines, -2 removed lines

@@ -298,8 +298,8 @@
     public function getSequence ( $table , $column )
     {
         $return = $this->getPDO ()
-                       ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
-                       ->fetch ( \PDO::FETCH_ASSOC );
+                        ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
+                        ->fetch ( \PDO::FETCH_ASSOC );
 
         if ( ! $return )
         {

Spacing +34 added lines, -34 removed lines

@@ -30,21 +30,21 @@ 
      *
      * @return string
      */
-    protected function convertTypeToPhp ( $str )
+    protected function convertTypeToPhp($str)
     {
         $res = '';
-        if ( preg_match ( '/(tinyint\(1\)|bit)/' , $str ) )
+        if (preg_match('/(tinyint\(1\)|bit)/', $str))
         {
             $res = 'boolean';
-        } elseif ( preg_match ( '/(datetime|timestamp|blob|char|enum|text|date)/' , $str ) )
+        } elseif (preg_match('/(datetime|timestamp|blob|char|enum|text|date)/', $str))
         {
             $res = 'string';
-        } elseif ( preg_match ( '/(decimal|numeric|float|double)/' , $str ) )
+        } elseif (preg_match('/(decimal|numeric|float|double)/', $str))
         {
             $res = 'float';
-        } elseif ( preg_match ( '#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#' , $str , $matches ) )
+        } elseif (preg_match('#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#', $str, $matches))
         {
-            $res = $matches[ 1 ];
+            $res = $matches[1];
         } else
         {
             print "Can't convert column type to PHP - Unrecognized type: $str";
@@ -57,12 +57,12 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
-            "mysql:host=%s;port=%s;dbname=%s" ,
-            $this->host ,
-            $this->port ,
+        return sprintf(
+            "mysql:host=%s;port=%s;dbname=%s",
+            $this->host,
+            $this->port,
             $this->database
 
         );
@@ -72,11 +72,11 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
-            "mysql:unix_socket=%s;dbname=%s" ,
-            $this->socket ,
+        return sprintf(
+            "mysql:unix_socket=%s;dbname=%s",
+            $this->socket,
             $this->database
 
         );
@@ -86,13 +86,13 @@ 
      * @inheritDoc
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) )
+        if (empty($this->tableList))
         {
-            $this->tableList = $this->getPDO ()->query (
+            $this->tableList = $this->getPDO()->query(
                 "show tables"
-            )->fetchAll ();
+            )->fetchAll();
         }
 
         return $this->tableList;
@@ -103,10 +103,10 @@ 
      *
      * @return array[]
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "select
                 0 AS table_schema,
                 table_name,
@@ -117,15 +117,15 @@ 
             from information_schema.columns
             where table_schema IN ('{$this->database}')
             order by table_name,ordinal_position"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
      * @return array
      */
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
      i.constraint_type,
      k.constraint_name,
@@ -142,7 +142,7 @@ 
 WHERE
 i.TABLE_SCHEMA IN ('{$this->database}') AND i.CONSTRAINT_TYPE IN ('FOREIGN KEY', 'PRIMARY KEY' )
 order by k.table_schema, k.table_name;"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
@@ -150,14 +150,14 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) )
+        if (empty($this->totalTables))
         {
 
-            $this->totalTables = $this->getPDO ()->query (
+            $this->totalTables = $this->getPDO()->query(
                 "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}'"
-            )->fetchColumn ();
+            )->fetchColumn();
         }
 
         return (int) $this->totalTables;
@@ -171,13 +171,13 @@ 
      *
      * @return string
      */
-    public function getSequence ( $table , $column )
+    public function getSequence($table, $column)
     {
-        $return = $this->getPDO ()
-                       ->query ( "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';" )
-                       ->fetch ( \PDO::FETCH_ASSOC );
+        $return = $this->getPDO()
+                       ->query("select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';")
+                       ->fetch(\PDO::FETCH_ASSOC);
 
-        if ( ! $return )
+        if ( ! $return)
         {
             return;
         }

build/Classes/AdaptersDriver/Pgsql.php

Indentation +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
     {
         $pdo = $this->getPDO ();
         $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$table', '$column');" )
-                       ->fetchColumn ();
+                        ->fetchColumn ();
 
         if ( $return1 )
         {

Doc Comments -1 removed lines

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

Spacing +68 added lines, -68 removed lines

@@ -27,43 +27,43 @@ 
     /**
      * @type array|\string[]
      */
-    protected $schema = array ( 'public' );
+    protected $schema = array('public');
 
-    protected $dataTypes = array (
+    protected $dataTypes = array(
         /* Numeric Types */
-        'smallint'         => 'int' ,
-        'integer'          => 'int' ,
-        'bigint'           => 'float' ,
-        'decimal'          => 'float' ,
-        'numeric'          => 'float' ,
-        'real'             => 'float' ,
-        'double precision' => 'float' ,
-        'serial'           => 'int' ,
-        'bigserial'        => 'float' ,
+        'smallint'         => 'int',
+        'integer'          => 'int',
+        'bigint'           => 'float',
+        'decimal'          => 'float',
+        'numeric'          => 'float',
+        'real'             => 'float',
+        'double precision' => 'float',
+        'serial'           => 'int',
+        'bigserial'        => 'float',
         /* Monetary Types */
-        'money'            => 'float' ,
+        'money'            => 'float',
         /* Character Types */
-        'character varyin' => 'string' ,
-        'varchar'          => 'string' ,
-        'character'        => 'string' ,
-        'char'             => 'string' ,
-        'text'             => 'string' ,
+        'character varyin' => 'string',
+        'varchar'          => 'string',
+        'character'        => 'string',
+        'char'             => 'string',
+        'text'             => 'string',
         /* Binary Data Types */
-        'bytea'            => 'string' ,
+        'bytea'            => 'string',
         /* Date/Time Types */
-        'datatime'         => 'date' ,
-        'date'             => 'date' ,
+        'datatime'         => 'date',
+        'date'             => 'date',
 
         /* Boolean Type */
         'boolean'          => 'boolean'
     );
 
-    public function __construct ( AbstractAdapter $adapterConfig )
+    public function __construct(AbstractAdapter $adapterConfig)
     {
-        parent::__construct ( $adapterConfig );
-        if ( $adapterConfig->hasSchemas () )
+        parent::__construct($adapterConfig);
+        if ($adapterConfig->hasSchemas())
         {
-            $this->schema = $adapterConfig->getSchemas ();
+            $this->schema = $adapterConfig->getSchemas();
         }
 
     }
@@ -75,13 +75,13 @@ 
      *
      * @return string[]
      */
-    public function getListNameTable ()
+    public function getListNameTable()
     {
-        if ( empty( $this->tableList ) )
+        if (empty($this->tableList))
         {
-            $strSchema = implode ( "', '" , $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->tableList = $this->getPDO ()->query (
+            $this->tableList = $this->getPDO()->query(
                 "SELECT table_schema,
               table_name
              FROM information_schema.tables
@@ -92,7 +92,7 @@ 
                table_schema,
                table_name
               ASC"
-            )->fetchAll ();
+            )->fetchAll();
         }
 
         return $this->tableList;
@@ -103,11 +103,11 @@ 
      *
      * @return array
      */
-    public function getListColumns ()
+    public function getListColumns()
     {
-        $strSchema = implode ( "', '" , $this->schema );
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
 	c.table_schema,
 	c.table_name,
@@ -121,14 +121,14 @@ 
 		ON st.table_name=c.table_name and st.table_type = 'BASE TABLE'
 		and  c.table_schema IN ('$strSchema')
 		order by c.table_name asc"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
-    public function getListConstrant ()
+    public function getListConstrant()
     {
-        $strSchema = implode ( "', '" , $this->schema );
+        $strSchema = implode("', '", $this->schema);
 
-        return $this->getPDO ()->query (
+        return $this->getPDO()->query(
             "SELECT distinct
                 tc.constraint_type,
                 tc.constraint_name,
@@ -148,7 +148,7 @@ 
                       ON tc.constraint_name  = ccu.constraint_name
                         AND tc.constraint_schema = ccu.constraint_schema
                     ORDER by tc.table_schema"
-        )->fetchAll ( \PDO::FETCH_ASSOC );
+        )->fetchAll(\PDO::FETCH_ASSOC);
     }
 
 
@@ -160,20 +160,20 @@ 
      *
      * @return string
      */
-    public function getSequence ( $table , $column )
+    public function getSequence($table, $column)
     {
-        $pdo = $this->getPDO ();
-        $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$table', '$column');" )
-                       ->fetchColumn ();
+        $pdo = $this->getPDO();
+        $return1 = $pdo->query("SELECT pg_get_serial_sequence('$table', '$column');")
+                       ->fetchColumn();
 
-        if ( $return1 )
+        if ($return1)
         {
             return $return1;
         }
 
-        $dtbase = explode ( '.' , $table );;
+        $dtbase = explode('.', $table); ;
 
-        $stmt = $pdo->prepare (
+        $stmt = $pdo->prepare(
             "SELECT adsrc FROM pg_attrdef AS att
             INNER JOIN pg_class AS c
               ON adrelid = c.oid AND att.adnum=1 AND c.relname = ?
@@ -181,19 +181,19 @@ 
               ON n.oid = c.relnamespace and n.nspname=?"
         );
 
-        $schema = isset( $dtbase[ 1 ] ) ? $dtbase[ 1 ] : 'public';
+        $schema = isset($dtbase[1]) ? $dtbase[1] : 'public';
 
-        $stmt->bindParam ( 1 , $schema );
-        $stmt->bindParam ( 2 , $dtbase[ 0 ] );
-        $stmt->execute ();
-        $return2 = $stmt->fetchColumn ();
-        if ( $return2 )
+        $stmt->bindParam(1, $schema);
+        $stmt->bindParam(2, $dtbase[0]);
+        $stmt->execute();
+        $return2 = $stmt->fetchColumn();
+        if ($return2)
         {
-            return preg_filter (
-                array (
-                    '/nextval\(\'/' ,
+            return preg_filter(
+                array(
+                    '/nextval\(\'/',
                     '/\'::regclass\)/'
-                ) , '' , $return2
+                ), '', $return2
             );
         }
 
@@ -204,12 +204,12 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOString ()
+    public function getPDOString()
     {
-        return sprintf (
-            "pgsql:host=%s;port=%s;dbname=%s" ,
-            $this->host ,
-            $this->port ,
+        return sprintf(
+            "pgsql:host=%s;port=%s;dbname=%s",
+            $this->host,
+            $this->port,
             $this->database
 
         );
@@ -219,11 +219,11 @@ 
      * @inheritDoc
      * @return string
      */
-    public function getPDOSocketString ()
+    public function getPDOSocketString()
     {
-        return sprintf (
-            "pgsql:unix_socket=%s;dbname=%s" ,
-            $this->socket ,
+        return sprintf(
+            "pgsql:unix_socket=%s;dbname=%s",
+            $this->socket,
             $this->database
 
         );
@@ -234,19 +234,19 @@ 
      *
      * @return int
      */
-    public function getTotalTables ()
+    public function getTotalTables()
     {
-        if ( empty( $this->totalTables ) )
+        if (empty($this->totalTables))
         {
-            $strSchema = implode ( "', '" , $this->schema );
+            $strSchema = implode("', '", $this->schema);
 
-            $this->totalTables = $this->getPDO ()->query (
+            $this->totalTables = $this->getPDO()->query(
                 "SELECT COUNT(table_name)  AS total
              FROM information_schema.tables
              WHERE
               table_type = 'BASE TABLE'
               AND table_schema IN ( '" . $strSchema . "' )"
-            )->fetchColumn ();
+            )->fetchColumn();
         }
 
         return (int) $this->totalTables;

build/Classes/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 +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     protected $parentFileTpl = "";
     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();
     }