pedro151 / orm-generator

build/Classes/templates/phalcon/entity_abstract.php

Spacing +7 added lines, -7 removed lines

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

build/Classes/AdaptersDriver/Mysql.php

Braces +7 added lines, -14 removed lines

@@ -35,26 +35,19 @@
         $res = '';
         if ( preg_match ( '/(tinyint\(1\)|bit)/', $str ) ) {
             $res = 'boolean';
-        }
-        elseif ( preg_match ( '/(timestamp|blob|char|enum)/', $str ) ) {
+        } elseif ( preg_match ( '/(timestamp|blob|char|enum)/', $str ) ) {
             $res = 'string';
-        }
-        elseif ( preg_match ( '/(text)/', $str ) ) {
+        } elseif ( preg_match ( '/(text)/', $str ) ) {
             $res = 'text';
-        }
-        elseif ( preg_match ( '/(decimal|numeric|float|double)/', $str ) ) {
+        } elseif ( preg_match ( '/(decimal|numeric|float|double)/', $str ) ) {
             $res = 'float';
-        }
-        elseif ( preg_match ( '#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#', $str, $matches ) ) {
+        } elseif ( preg_match ( '#^(?:tiny|small|medium|long|big|var)?(\w+)(?:\(\d+\))?(?:\s\w+)*$#', $str, $matches ) ) {
             $res = $matches[ 1 ];
-        }
-        elseif ( preg_match ( '/(date)/', $str ) ) {
+        } elseif ( preg_match ( '/(date)/', $str ) ) {
             $res = 'date';
-        }
-        elseif ( preg_match ( '/(datetime)/', $str ) ) {
+        } elseif ( preg_match ( '/(datetime)/', $str ) ) {
             $res = 'datetime';
-        }
-        else {
+        } else {
             print "Can't convert column type to Simple - Unrecognized type: $str";
         }
 

Indentation +8 added lines, -8 removed lines

@@ -174,10 +174,10 @@ 
             $sqlTables = !empty($this->tablesName)?"AND table_name IN ( $this->tablesName )":'';
 
             $this->totalTables = $this->getPDO ()
-                                      ->query (
-                                          "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}' $sqlTables"
-                                      )
-                                      ->fetchColumn ();
+                                        ->query (
+                                            "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '{$this->database}' $sqlTables"
+                                        )
+                                        ->fetchColumn ();
         }
 
         return (int) $this->totalTables;
@@ -194,10 +194,10 @@ 
     public function getSequence ( $table, $column, $schema = 0 )
     {
         $return = $this->getPDO ()
-                       ->query (
-                           "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';"
-                       )
-                       ->fetch ( \PDO::FETCH_ASSOC );
+                        ->query (
+                            "select * from information_schema.columns where extra like '%auto_increment%' and  TABLE_SCHEMA='{$this->database}' AND TABLE_NAME='{$table}' AND COLUMN_NAME='{$column}';"
+                        )
+                        ->fetch ( \PDO::FETCH_ASSOC );
 
         if ( !$return ) {
             return;

Spacing +39 added lines, -39 removed lines

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

build/Classes/AdapterConfig/Phalcon.php

Spacing +13 added lines, -13 removed lines

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

build/Classes/MakerFile.php

Doc Comments +5 added lines

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

Indentation +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
         foreach ( $arrFoldersName as $index => $folderName )
         {
             $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+                                                ->replaceReservedWord ( $folderName );
         }
 
         return implode ( DIRECTORY_SEPARATOR , array_filter ( $arrFoldersName ) );
@@ -157,7 +157,7 @@ 
                 $folderName ,
                 $this->getClassName (
                     $this->getConfig ()
-                         ->getDatabase ()
+                            ->getDatabase ()
                 )
             );
             $this->location = array ( $this->filterLocation ( $url ) );

Spacing +122 added lines, -122 removed lines

@@ -22,7 +22,7 @@ 
     /**
      * @type string[]
      */
-    public $location = array ();
+    public $location = array();
 
     /**
      * caminho de pastas Base
@@ -46,46 +46,46 @@ 
 
     private $msgReservedWord = "\033[0mPlease enter the value for reserved word \033[0;31m'%index%' \033[1;33m[%config%]:\033[0m ";
 
-    public function __construct ( Config $config )
+    public function __construct(Config $config)
     {
-        $this->config = $config->getAdapterConfig ();
-        $this->parseReservedWord ( $this->getConfig () );
-        $this->driver = $config->getAdapterDriver ( $this->getConfig () );
-        $this->parseLocation ( $config->_basePath );
+        $this->config = $config->getAdapterConfig();
+        $this->parseReservedWord($this->getConfig());
+        $this->driver = $config->getAdapterDriver($this->getConfig());
+        $this->parseLocation($config->_basePath);
     }
 
     /**
      * @param AdapterConfig\AbstractAdapter $config
      */
-    public function parseReservedWord ( AdapterConfig\AbstractAdapter $config )
+    public function parseReservedWord(AdapterConfig\AbstractAdapter $config)
     {
         $palavrasReservadas = $config->reservedWord;
-        if ( ! $palavrasReservadas )
+        if ( ! $palavrasReservadas)
         {
             return;
         }
 
-        $schema = $config->getSchemas ();
-        $db = $config->getDatabase ();
-        $hasSchema = array_intersect ( $schema , array_flip ( $palavrasReservadas ) );
-        $hasDatabase = in_array ( $db , $palavrasReservadas );
-        if ( ! ( $hasSchema or $hasDatabase ) )
+        $schema = $config->getSchemas();
+        $db = $config->getDatabase();
+        $hasSchema = array_intersect($schema, array_flip($palavrasReservadas));
+        $hasDatabase = in_array($db, $palavrasReservadas);
+        if ( ! ($hasSchema or $hasDatabase))
         {
             return;
         }
 
         echo "- database has reserved words\n";
-        foreach ( $palavrasReservadas as $index => $config )
+        foreach ($palavrasReservadas as $index => $config)
         {
-            $attribs = array (
-                "%index%"  => $index ,
+            $attribs = array(
+                "%index%"  => $index,
                 "%config%" => $config
             );
-            echo strtr ( $this->msgReservedWord , $attribs );
-            $line = trim ( fgets ( STDIN ) );
-            if ( ! empty( $line ) )
+            echo strtr($this->msgReservedWord, $attribs);
+            $line = trim(fgets(STDIN));
+            if ( ! empty($line))
             {
-                $this->getConfig ()->reservedWord[ $index ] = $line;
+                $this->getConfig()->reservedWord[$index] = $line;
             }
         }
     }
@@ -95,199 +95,199 @@ 
      *
      * @return string
      */
-    private function filterLocation ( $arrFoldersName )
+    private function filterLocation($arrFoldersName)
     {
-        foreach ( $arrFoldersName as $index => $folderName )
+        foreach ($arrFoldersName as $index => $folderName)
         {
-            $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+            $arrFoldersName[$index] = $this->getConfig()
+                                             ->replaceReservedWord($folderName);
         }
 
-        return implode ( DIRECTORY_SEPARATOR , array_filter ( $arrFoldersName ) );
+        return implode(DIRECTORY_SEPARATOR, array_filter($arrFoldersName));
     }
 
     /**
      * Analisa os caminhos das pastas base
      */
-    public function parseLocation ( $basePath )
+    public function parseLocation($basePath)
     {
 
-        $arrBase = array (
-            $basePath ,
+        $arrBase = array(
+            $basePath,
             $this->config->path
         );
 
-        $this->baseLocation = $this->filterLocation ( $arrBase );
+        $this->baseLocation = $this->filterLocation($arrBase);
 
         # pasta com nome do driver do banco
         $driverBase = '';
-        if ( (bool) @$this->config->{"folder-database"} )
+        if ((bool) @$this->config->{"folder-database"} )
         {
-            $classDriver = explode ( '\\' , get_class ( $this->driver ) );
-            $driverBase = end ( $classDriver );
+            $classDriver = explode('\\', get_class($this->driver));
+            $driverBase = end($classDriver);
         }
         $folderName = '';
-        if ( (bool) @$this->config->{"folder-name"} )
+        if ((bool) @$this->config->{"folder-name"} )
         {
-            $folderName = $this->getClassName ( trim ( $this->config->{"folder-name"} ) );
+            $folderName = $this->getClassName(trim($this->config->{"folder-name"} ));
         }
 
-        if ( $this->config->hasSchemas () )
+        if ($this->config->hasSchemas())
         {
 
-            $schemas = $this->config->getSchemas ();
-            foreach ( $schemas as $schema )
+            $schemas = $this->config->getSchemas();
+            foreach ($schemas as $schema)
             {
-                $arrUrl = array (
-                    $this->baseLocation ,
-                    $driverBase ,
-                    $folderName ,
-                    $this->getClassName ( $schema )
+                $arrUrl = array(
+                    $this->baseLocation,
+                    $driverBase,
+                    $folderName,
+                    $this->getClassName($schema)
                 );
 
-                $this->location[ $schema ] = $this->filterLocation ( $arrUrl );
-                unset( $arrUrl );
+                $this->location[$schema] = $this->filterLocation($arrUrl);
+                unset($arrUrl);
             }
 
         } else
         {
-            $url = array (
-                $this->baseLocation ,
-                $driverBase ,
-                $folderName ,
-                $this->getClassName (
-                    $this->getConfig ()
-                         ->getDatabase ()
+            $url = array(
+                $this->baseLocation,
+                $driverBase,
+                $folderName,
+                $this->getClassName(
+                    $this->getConfig()
+                         ->getDatabase()
                 )
             );
-            $this->location = array ( $this->filterLocation ( $url ) );
-            unset( $url );
+            $this->location = array($this->filterLocation($url));
+            unset($url);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getConfig ()
+    public function getConfig()
     {
         return $this->config;
     }
 
     /* Get current time */
-    public function startTime ()
+    public function startTime()
     {
         echo "\033[1;32mStarting..\033[0m\n";
-        $this->startTime = microtime ( true );
+        $this->startTime = microtime(true);
     }
 
-    private function getRunTime ()
+    private function getRunTime()
     {
-        return round ( ( microtime ( true ) - $this->startTime ) , 3 );
+        return round((microtime(true) - $this->startTime), 3);
     }
 
     /**
      * @param $objMakeFile
      */
-    private function generateFilesFixed ( FilesFixeds $objFilesFixeds )
+    private function generateFilesFixed(FilesFixeds $objFilesFixeds)
     {
-        if ( $objFilesFixeds->hasData () )
+        if ($objFilesFixeds->hasData())
         {
             $file = $this->baseLocation
                     . DIRECTORY_SEPARATOR
-                    . $objFilesFixeds->getFileName ()
+                    . $objFilesFixeds->getFileName()
                     . '.php';
 
-            $tpl = $this->getParsedTplContents ( $objFilesFixeds->getTpl () );
-            self::makeSourcer ( $file , $tpl , true );
+            $tpl = $this->getParsedTplContents($objFilesFixeds->getTpl());
+            self::makeSourcer($file, $tpl, true);
         }
     }
 
     /**
      * Executa o Make, criando arquivos e Diretorios
      */
-    public function run ()
+    public function run()
     {
         $cur = 0;
         $numFilesCreated = 0;
         $numFilesIgnored = 0;
 
-        $this->startTime ();
-        $this->waitOfDatabase ( $cur );
+        $this->startTime();
+        $this->waitOfDatabase($cur);
 
-        $this->max = $this->driver->getTotalTables () * $this->countDiretory ();
-        $progressBar = ProgressBar::getInstance ()->setMaxByte ( $this->max );
+        $this->max = $this->driver->getTotalTables() * $this->countDiretory();
+        $progressBar = ProgressBar::getInstance()->setMaxByte($this->max);
 
-        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 ();
-                if ( $this->config->isCleanTrash () )
+                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName();
+                if ($this->config->isCleanTrash())
                 {
-                    CleanTrash::getInstance ()->run ( $path , $this->driver , $schema );
+                    CleanTrash::getInstance()->run($path, $this->driver, $schema);
                 }
-                self::makeDir ( $path );
+                self::makeDir($path);
 
                 #Cria as Classes de Exceção e Abstratas
-                foreach ( $objMakeFile->getListFilesFixed () as $nameObject )
+                foreach ($objMakeFile->getListFilesFixed() as $nameObject)
                 {
-                    $this->generateFilesFixed ( $objMakeFile->getFilesFixeds ( $nameObject ) );
+                    $this->generateFilesFixed($objMakeFile->getFilesFixeds($nameObject));
                 }
 
                 #Cria as Classes do Banco
-                foreach ( $this->driver->getTables ( $schema ) as $key => $objTables )
+                foreach ($this->driver->getTables($schema) as $key => $objTables)
                 {
                     $file = $path . DIRECTORY_SEPARATOR
-                            . self::getClassName ( $objTables->getName () ) . '.php';
+                            . self::getClassName($objTables->getName()) . '.php';
 
-                    $tpl = $this->getParsedTplContents (
-                        $objMakeFile->getFileTpl () ,
-                        $objMakeFile->parseRelation ( $this , $objTables ) ,
-                        $objTables ,
+                    $tpl = $this->getParsedTplContents(
+                        $objMakeFile->getFileTpl(),
+                        $objMakeFile->parseRelation($this, $objTables),
+                        $objTables,
                         $objMakeFile
 
                     );
-                    if ( self::makeSourcer ( $file , $tpl , $objMakeFile->isOverwrite () ) )
+                    if (self::makeSourcer($file, $tpl, $objMakeFile->isOverwrite()))
                     {
-                        ++ $numFilesCreated;
+                        ++$numFilesCreated;
                     } else
                     {
-                        ++ $numFilesIgnored;
+                        ++$numFilesIgnored;
                     }
 
                     ++$cur;
-                    $progressBar->setProgress ( $cur )->render();
+                    $progressBar->setProgress($cur)->render();
                 }
             }
         }
 
-        $this->reportProcess ( $numFilesCreated , $numFilesIgnored );
+        $this->reportProcess($numFilesCreated, $numFilesIgnored);
         $progressBar->finish();
     }
 
-    private function waitOfDatabase ( &$cur )
+    private function waitOfDatabase(&$cur)
     {
-        printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
-        $this->driver->runDatabase ();
+        printf("\033[1;33mWait, the database is being analyzed..\033[0m\n");
+        $this->driver->runDatabase();
     }
 
-    private function reportProcess ( $numFilesCreated = 0 , $numFilesIgnored = 0 )
+    private function reportProcess($numFilesCreated = 0, $numFilesIgnored = 0)
     {
-        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();
             $totalFiles = $numFilesIgnored + $numFilesCreated;
-            $totalFilesDeleted = CleanTrash::getInstance ()->getNumFilesDeleted ();
+            $totalFilesDeleted = CleanTrash::getInstance()->getNumFilesDeleted();
             echo "\n------";
-            printf ( "\n\r-Files generated/updated: \033[1;33m%s\033[0m" , $numFilesCreated );
-            printf ( "\n\r-Files not upgradeable: \033[1;33m%s\033[0m" , $numFilesIgnored );
-            printf ( "\n\r-Files deleted: \033[1;33m%s\033[0m" , $totalFilesDeleted );
-            printf ( "\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m" , $totalFiles , $this->max );
-            printf ( "\n\r-Diretories: \033[1;33m%s\033[0m" , $databases * $countDir );
-            printf ( "\n\r-Scanned tables: \033[1;33m%s\033[0m" , $totalTable );
-            printf ( "\n\r-Execution time: \033[1;33m%ssec\033[0m" , $this->getRunTime () );
+            printf("\n\r-Files generated/updated: \033[1;33m%s\033[0m", $numFilesCreated);
+            printf("\n\r-Files not upgradeable: \033[1;33m%s\033[0m", $numFilesIgnored);
+            printf("\n\r-Files deleted: \033[1;33m%s\033[0m", $totalFilesDeleted);
+            printf("\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m", $totalFiles, $this->max);
+            printf("\n\r-Diretories: \033[1;33m%s\033[0m", $databases * $countDir);
+            printf("\n\r-Scanned tables: \033[1;33m%s\033[0m", $totalTable);
+            printf("\n\r-Execution time: \033[1;33m%ssec\033[0m", $this->getRunTime());
             echo "\n------";
         }
     }
@@ -297,9 +297,9 @@ 
      *
      * @return AbstractAdapter[]
      */
-    public function factoryMakerFile ()
+    public function factoryMakerFile()
     {
-        return $this->config->getMakeFileInstances ();
+        return $this->config->getMakeFileInstances();
     }
 
     /**
@@ -307,16 +307,16 @@ 
      *
      * @return int
      */
-    public function countDiretory ()
+    public function countDiretory()
     {
-        if ( null === $this->countDir )
+        if (null === $this->countDir)
         {
             $this->countDir = 1;
-            foreach ( $this->factoryMakerFile () as $abstractAdapter )
+            foreach ($this->factoryMakerFile() as $abstractAdapter)
             {
-                if ( $abstractAdapter->hasDiretory () )
+                if ($abstractAdapter->hasDiretory())
                 {
-                    ++ $this->countDir;
+                    ++$this->countDir;
                 }
             }
         }
@@ -332,25 +332,25 @@ 
      *
      * @return String
      */
-    protected function getParsedTplContents (
-        $tplFile , $vars = array () , \Classes\Db\DbTable $objTables = 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/Classes/templates/zf1/model.php

Spacing +9 added lines, -9 removed lines

@@ -3,20 +3,20 @@
 /**
  * Data Entity implementation for this class
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
- * @package <?=$objTables->getNamespace()."\n"?>
- * @see  <?=$objTables->getNamespace()?>_Entity_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?>. <?="\n"?>
+ * @package <?=$objTables->getNamespace() . "\n"?>
+ * @see  <?=$objTables->getNamespace()?>_Entity_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?>. <?="\n"?>
  *
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
- * @version   <?=$this->config->version."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
+ * @version   <?=$this->config->version . "\n"?>
  */
 
-class <?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends <?=$objTables->getNamespace()?>_Entity_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () ). "\n"?>
+class <?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends <?=$objTables->getNamespace()?>_Entity_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName()) . "\n"?>
 {
        /* @TODO Codifique aqui */
 }

build/phar-generate.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     $arg = getopt ( null, $arrValid );
     if ( array_key_exists ( 'init', $arg ) ) {
         $maker = new \Classes\MakerConfigFile( $arg, $_path );
-    }
-    else {
+    } else {
         $maker = new \Classes\MakerFile( new \Classes\Config( $arg, $_path, count ( $argv ) ) );
     }
 

Spacing +29 added lines, -29 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
-if ( ! ini_get ( 'short_open_tag' ) )
+if ( ! ini_get('short_open_tag'))
 {
-    die( "\033[0;31mError: please enable short_open_tag directive in php.ini\033[0m\n" );
+    die("\033[0;31mError: please enable short_open_tag directive in php.ini\033[0m\n");
 }
 
-if ( ! ini_get ( 'register_argc_argv' ) )
+if ( ! ini_get('register_argc_argv'))
 {
-    die( "\033[0;31mError: please enable register_argc_argv directive in php.ini\033[0m\n" );
+    die("\033[0;31mError: please enable register_argc_argv directive in php.ini\033[0m\n");
 }
 
-if ( function_exists ( 'ini_set' ) ) {
-    @ini_set ( 'display_errors', 1 );
+if (function_exists('ini_set')) {
+    @ini_set('display_errors', 1);
 
-    $memoryInBytes = function ( $value ) {
-        $unit  = strtolower ( substr ( $value, -1, 1 ) );
+    $memoryInBytes = function($value) {
+        $unit  = strtolower(substr($value, -1, 1));
         $value = (int) $value;
-        switch ( $unit ) {
+        switch ($unit) {
             case 'g':
                 $value *= 1024;
             // no break (cumulative multiplier)
@@ -30,22 +30,22 @@ 
         return $value;
     };
 
-    $memoryLimit = trim ( ini_get ( 'memory_limit' ) );
+    $memoryLimit = trim(ini_get('memory_limit'));
     // Increase memory_limit if it is lower than 1GB
-    if ( $memoryLimit != -1 && $memoryInBytes( $memoryLimit ) < 1024 * 1024 * 1024 ) {
-        @ini_set ( 'memory_limit', '1G' );
+    if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1024) {
+        @ini_set('memory_limit', '1G');
     }
-    unset( $memoryInBytes, $memoryLimit );
+    unset($memoryInBytes, $memoryLimit);
 }
 
-\Phar::interceptFileFuncs ();
+\Phar::interceptFileFuncs();
 
-set_include_path (
-    implode (
+set_include_path(
+    implode(
         PATH_SEPARATOR,
-        array (
-            realpath ( __DIR__ ),
-            get_include_path (),
+        array(
+            realpath(__DIR__),
+            get_include_path(),
         )
     )
 );
@@ -55,15 +55,15 @@ 
 require_once 'Classes/MakerConfigFile.php';
 
 try {
-    $_path = realpath (
-        str_replace (
+    $_path = realpath(
+        str_replace(
             'phar://',
             '',
             __DIR__
         )
     );
 
-    $arrValid = array (
+    $arrValid = array(
         'version',
         'help',
         'status',
@@ -79,18 +79,18 @@ 
         'clean-trash:'
     );
 
-    $arg = getopt ( null, $arrValid );
-    if ( array_key_exists ( 'init', $arg ) ) {
-        $maker = new \Classes\MakerConfigFile( $arg, dirname($_path) );
+    $arg = getopt(null, $arrValid);
+    if (array_key_exists('init', $arg)) {
+        $maker = new \Classes\MakerConfigFile($arg, dirname($_path));
     }
     else {
-        $maker = new \Classes\MakerFile( new \Classes\Config( $arg, dirname($_path), count ( $argv ) ) );
+        $maker = new \Classes\MakerFile(new \Classes\Config($arg, dirname($_path), count($argv)));
     }
 
-    $maker->run ();
+    $maker->run();
 
-} catch ( \Exception $e ) {
-    die( $e->getMessage () );
+} catch (\Exception $e) {
+    die($e->getMessage());
 }
 
 __halt_compiler();
\ No newline at end of file

build/Classes/CleanTrash.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
         return self::$instance;
     }
 
+    /**
+     * @param string $directory
+     */
     private function scanDir ( $directory )
     {
         if(!is_dir($directory)){

Spacing +20 added lines, -20 removed lines

@@ -17,16 +17,16 @@ 
     /**
      * @type int
      */
-    private $countFileDeleted=0;
+    private $countFileDeleted = 0;
 
-    final private function __construct (){ }
+    final private function __construct() { }
 
     /**
      * @return \Classes\CleanTrash
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
-        if ( self::$instance === null )
+        if (self::$instance === null)
         {
             self::$instance = new self();
         }
@@ -34,20 +34,20 @@ 
         return self::$instance;
     }
 
-    private function scanDir ( $directory )
+    private function scanDir($directory)
     {
-        if(!is_dir($directory)){
+        if ( ! is_dir($directory)) {
             return array();
         }
 
-        $diretories = preg_grep ( '*\.ph*' , scandir ( $directory ) );
-        if(!$diretories){
+        $diretories = preg_grep('*\.ph*', scandir($directory));
+        if ( ! $diretories) {
             return array();
         }
 
-        return array_diff ( $diretories, array (
-            '..' , '.'
-        ) );
+        return array_diff($diretories, array(
+            '..', '.'
+        ));
     }
 
     /**
@@ -57,14 +57,14 @@ 
      *
      * @return array
      */
-    private function diffFiles ( $path , $driver , $schema = 0 )
+    private function diffFiles($path, $driver, $schema = 0)
     {
-        $tables = $driver->getTables ( $schema );
-        if(!$tables instanceof DbTables){
+        $tables = $driver->getTables($schema);
+        if ( ! $tables instanceof DbTables) {
             return array();
         }
         $tablesName = $tables->toArrayFileName();
-        return array_diff ( $this->scanDir ( $path ) , $tablesName );
+        return array_diff($this->scanDir($path), $tablesName);
     }
 
     /**
@@ -74,14 +74,14 @@ 
      *
      * @return int
      */
-    public function run ( $path , $driver , $schema = 0 )
+    public function run($path, $driver, $schema = 0)
     {
         $count = 0;
-        foreach ( $this->diffFiles ( $path , $driver , $schema ) as $fileDel )
+        foreach ($this->diffFiles($path, $driver, $schema) as $fileDel)
         {
-            if ( unlink ( $path . DIRECTORY_SEPARATOR . $fileDel ) )
+            if (unlink($path . DIRECTORY_SEPARATOR . $fileDel))
             {
-                ++ $count;
+                ++$count;
             }
         }
 
@@ -93,7 +93,7 @@ 
     /**
      * @return int
      */
-    public function getNumFilesDeleted ()
+    public function getNumFilesDeleted()
     {
         return $this->countFileDeleted;
     }

build/Classes/Maker/AbstractMaker.php

Spacing +16 added lines, -16 removed lines

@@ -10,13 +10,13 @@ 
      *
      * @param $dir
      */
-    public static function makeDir ( $dir )
+    public static function makeDir($dir)
     {
-        if ( !is_dir ( $dir ) )
+        if ( ! is_dir($dir))
         {
-            if ( !@mkdir ( $dir, 0755, true ) )
+            if ( ! @mkdir($dir, 0755, true))
             {
-                die( "\033[0;31mError: could not create directory $dir\033[0m\n" );
+                die("\033[0;31mError: could not create directory $dir\033[0m\n");
             }
         }
     }
@@ -28,16 +28,16 @@ 
      *
      * @return boolean
      */
-    public static function makeSourcer ( $nameFile, $tplContent, $overwrite = false )
+    public static function makeSourcer($nameFile, $tplContent, $overwrite = false)
     {
-        if ( !$overwrite && is_file ( $nameFile ) )
+        if ( ! $overwrite && is_file($nameFile))
         {
             return false;
         }
 
-        if ( !file_put_contents ( $nameFile, $tplContent ) )
+        if ( ! file_put_contents($nameFile, $tplContent))
         {
-            die( "\033[0;31mError: could not write model file $nameFile.\033[0m\n" );
+            die("\033[0;31mError: could not write model file $nameFile.\033[0m\n");
         }
 
         return true;
@@ -48,24 +48,24 @@ 
      *
      * @return string
      */
-    public static function getClassName ( $str )
+    public static function getClassName($str)
     {
         $temp = '';
-        foreach ( explode ( self::SEPARETOR, $str ) as $part )
+        foreach (explode(self::SEPARETOR, $str) as $part)
         {
-            $temp .= ucfirst ( $part );
+            $temp .= ucfirst($part);
         }
 
         return $temp;
     }
 
-    protected function getParsedTplContents ( $filePath, $vars = array () )
+    protected function getParsedTplContents($filePath, $vars = array())
     {
-        extract ( $vars );
-        ob_start ();
+        extract($vars);
+        ob_start();
         require $filePath;
-        $data = ob_get_contents ();
-        ob_end_clean ();
+        $data = ob_get_contents();
+        ob_end_clean();
 
         return $data;
     }

build/Classes/Db/Iterators/DbTables.php

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         foreach ( $this->objDbTables as $objDbTable )
         {
             $this->toArrayFileName[] = AbstractMaker::getClassName ( $objDbTable->getName () )
-                                       . '.php';
+                                        . '.php';
         }
 
         return $this->toArrayFileName;

Spacing +32 added lines, -32 removed lines

@@ -5,56 +5,56 @@ 
 use Classes\Db\DbTable;
 use Classes\Maker\AbstractMaker;
 
-class DbTables implements \ArrayAccess , \SeekableIterator , \Countable
+class DbTables implements \ArrayAccess, \SeekableIterator, \Countable
 {
 
     /**
      * @type DbTable[]
      */
-    private $objDbTables = array ();
+    private $objDbTables = array();
 
     private $position = 0;
 
-    public function offsetExists ( $offset )
+    public function offsetExists($offset)
     {
-        return isset( $this->objDbTables[ trim ( $offset ) ] );
+        return isset($this->objDbTables[trim($offset)]);
     }
 
-    public function offsetGet ( $offset )
+    public function offsetGet($offset)
     {
-        return $this->objDbTables[ trim ( $offset ) ];
+        return $this->objDbTables[trim($offset)];
     }
 
-    public function offsetSet ( $offset , $value )
+    public function offsetSet($offset, $value)
     {
-        return $this->objDbTables[ trim ( $offset ) ] = $value;
+        return $this->objDbTables[trim($offset)] = $value;
     }
 
-    public function offsetUnset ( $offset )
+    public function offsetUnset($offset)
     {
-        unset( $this->objDbTables[ trim ( $offset ) ] );
+        unset($this->objDbTables[trim($offset)]);
 
         return $this;
     }
 
-    public function count ()
+    public function count()
     {
-        return count ( $this->objDbTables );
+        return count($this->objDbTables);
     }
 
     /**
      * convert array
      */
-    public function toArrayFileName ()
+    public function toArrayFileName()
     {
-        if ( ! empty( $this->toArrayFileName ) )
+        if ( ! empty($this->toArrayFileName))
         {
             return $this->toArrayFileName;
         }
 
-        foreach ( $this->objDbTables as $objDbTable )
+        foreach ($this->objDbTables as $objDbTable)
         {
-            $this->toArrayFileName[] = AbstractMaker::getClassName ( $objDbTable->getName () )
+            $this->toArrayFileName[] = AbstractMaker::getClassName($objDbTable->getName())
                                        . '.php';
         }
 
@@ -63,12 +63,12 @@ 
 
     /* Method required for SeekableIterator interface */
 
-    public function seek ( $position )
+    public function seek($position)
     {
-        $current = array_keys ( $this->objDbTables );
-        if ( ! isset( $this->objDbTables[ $current[ $position ] ] ) )
+        $current = array_keys($this->objDbTables);
+        if ( ! isset($this->objDbTables[$current[$position]]))
         {
-            throw new OutOfBoundsException( "invalid seek position ($position)" );
+            throw new OutOfBoundsException("invalid seek position ($position)");
         }
 
         $this->position = $position;
@@ -76,34 +76,34 @@ 
 
     /* Methods required for Iterator interface */
 
-    public function rewind ()
+    public function rewind()
     {
         $this->position = 0;
     }
 
-    public function current ()
+    public function current()
     {
-        $current = array_keys ( $this->objDbTables );
+        $current = array_keys($this->objDbTables);
 
-        return $this->objDbTables[ $current[ $this->position ] ];
+        return $this->objDbTables[$current[$this->position]];
     }
 
-    public function key ()
+    public function key()
     {
-        $current = array_keys ( $this->objDbTables );
+        $current = array_keys($this->objDbTables);
 
-        return $current[ $this->position ];
+        return $current[$this->position];
     }
 
-    public function next ()
+    public function next()
     {
-        ++ $this->position;
+        ++$this->position;
     }
 
-    public function valid ()
+    public function valid()
     {
-        $current = array_keys ( $this->objDbTables );
+        $current = array_keys($this->objDbTables);
 
-        return isset( $current[ $this->position ] );
+        return isset($current[$this->position]);
     }
 }
\ No newline at end of file