pedro151 / orm-generator

build/Classes/Update/ProgressBar.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             {
                 $length = $this->getProgress ();
                 printf ( "\r[%-100s] %d%%" , str_repeat ( "=" , $length )
-                                             . ">" , $length );
+                                                . ">" , $length );
             }
         }
 

Spacing +20 added lines, -20 removed lines

@@ -14,14 +14,14 @@ 
 
     private $progresslength = 0;
 
-    private function __construct (){ }
+    private function __construct() { }
 
     /**
      * @return \Classes\Update\ProgressBar
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
-        if ( is_null ( self::$progressBar ) )
+        if (is_null(self::$progressBar))
         {
             self::$progressBar = new ProgressBar();
         }
@@ -29,38 +29,38 @@ 
         return self::$progressBar;
     }
 
-    public function setMaxByte ( $bytesMax )
+    public function setMaxByte($bytesMax)
     {
         $this->max = $bytesMax;
 
         return $this;
     }
 
-    public function setProgress ( $progress )
+    public function setProgress($progress)
     {
         $this->progress = $progress;
-        $this->calcule ();
+        $this->calcule();
 
         return $this;
     }
 
-    public function getProgress ()
+    public function getProgress()
     {
         return $this->progresslength;
     }
 
-    public function calcule ()
+    public function calcule()
     {
-        if ( $this->progress > 0 )
+        if ($this->progress > 0)
         {
-            $this->progresslength = round( $this->progress * 100 / $this->max );
+            $this->progresslength = round($this->progress * 100 / $this->max);
             //$this->progresslength = (int) ( ( $this->progress / $this->max ) * 100 );
         }
     }
 
-    public function finish ()
+    public function finish()
     {
-        if ( $this->getProgress () >= 99 && !self::$finished)
+        if ($this->getProgress() >= 99 && ! self::$finished)
         {
             echo "\n\033[1;32mDone!\033[0m\n";
             self::$finished = 1;
@@ -68,25 +68,25 @@ 
 
     }
 
-    public function render ()
+    public function render()
     {
-        if ( $this->progress > 0 && !self::$finished)
+        if ($this->progress > 0 && ! self::$finished)
         {
-            if ( ! isset( $this->max ) )
+            if ( ! isset($this->max))
             {
-                printf ( "\rUnknown filesize.. %2d kb done.." , $this->progress / 1024 );
+                printf("\rUnknown filesize.. %2d kb done..", $this->progress / 1024);
             } else
             {
-                $length = $this->getProgress ();
-                printf ( "\r[%-100s] %d%%" , str_repeat ( "=" , $length )
-                                             . ">" , $length );
+                $length = $this->getProgress();
+                printf("\r[%-100s] %d%%", str_repeat("=", $length)
+                                             . ">", $length);
             }
         }
 
         return $this;
     }
 
-    public function clear ()
+    public function clear()
     {
         $this->max = 0;
         $this->progress = 0;

build/Classes/Update/Content/GitHub.php

Spacing +16 added lines, -16 removed lines

@@ -13,28 +13,28 @@ 
 class GitHub extends AbstractContent
 {
     private static $tagsGithub  = "https://api.github.com/repos/pedro151/orm-generator/tags";
-    private static $listVersion = array ();
+    private static $listVersion = array();
     private        $phar        = "https://raw.githubusercontent.com/pedro151/orm-generator/%s/bin/orm-generator.phar";
     //private        $phar        = "https://github.com/pedro151/orm-generator/blob/%s/bin/orm-generator.phar?raw=true";
 
     /**
      * @return mixed
      */
-    public function getInfo ()
+    public function getInfo()
     {
-        return json_decode ( $this->getContent ( self::$tagsGithub ) );
+        return json_decode($this->getContent(self::$tagsGithub));
     }
 
     /**
      *
      */
-    protected function init ()
+    protected function init()
     {
-        if ( is_array ( $this->getInfo () ) )
+        if (is_array($this->getInfo()))
         {
-            foreach ( $this->getInfo () as $index => $objTag )
+            foreach ($this->getInfo() as $index => $objTag)
             {
-                self::$listVersion[ preg_replace ( "/[^0-9.]/" , "" , $objTag->name ) ] = sprintf ( $this->phar , $objTag->name );
+                self::$listVersion[preg_replace("/[^0-9.]/", "", $objTag->name)] = sprintf($this->phar, $objTag->name);
             }
         }
     }
@@ -42,19 +42,19 @@ 
     /**
      * @return mixed
      */
-    public function getLastVersion ()
+    public function getLastVersion()
     {
-        return current ( array_keys ( self::$listVersion ) );
+        return current(array_keys(self::$listVersion));
     }
 
     /**
      * @return mixed
      */
-    public function getLastPhar ()
+    public function getLastPhar()
     {
-        reset ( self::$listVersion );
+        reset(self::$listVersion);
 
-        return current ( self::$listVersion );
+        return current(self::$listVersion);
     }
 
     /**
@@ -62,14 +62,14 @@ 
      *
      * @return mixed
      */
-    public function getPharByVersion ( $version )
+    public function getPharByVersion($version)
     {
-        return self::$listVersion[ $version ];
+        return self::$listVersion[$version];
     }
 
-    public function hasPharByVersion ( $version )
+    public function hasPharByVersion($version)
     {
-        return isset( self::$listVersion[ $version ] );
+        return isset(self::$listVersion[$version]);
     }
 
 }
\ No newline at end of file

build/Classes/Update/Version.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if ( self::HasNewVersion () )
         {
             return "\033[0;31mThere is a new version " . self::$lastVersion
-                   . " available\033[0m \n";
+                    . " available\033[0m \n";
         }
     }
 

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @return string
      */
-    public static function getVersion ()
+    public static function getVersion()
     {
         return static::$_currentVersion;
     }
@@ -23,9 +23,9 @@ 
     /**
      * @return bool
      */
-    public static function HasNewVersion ()
+    public static function HasNewVersion()
     {
-        self::$lastVersion = GitHub::getInstance ()->getLastVersion ();
+        self::$lastVersion = GitHub::getInstance()->getLastVersion();
 
         return self::$lastVersion > static::$_currentVersion;
     }
@@ -33,9 +33,9 @@ 
     /**
      * @return string
      */
-    public function messageHasNewVersion ()
+    public function messageHasNewVersion()
     {
-        if ( self::HasNewVersion () )
+        if (self::HasNewVersion())
         {
             return "\033[0;31mThere is a new version " . self::$lastVersion
                    . " available\033[0m \n";
@@ -47,14 +47,14 @@ 
      *
      * @return bool
      */
-    public static function equalVersion ( $version )
+    public static function equalVersion($version)
     {
-        return $version === self::getVersion ();
+        return $version === self::getVersion();
     }
 
-    public static function existVersion ( $version )
+    public static function existVersion($version)
     {
-        return GitHub::getInstance ()->hasPharByVersion ( $version );
+        return GitHub::getInstance()->hasPharByVersion($version);
     }
 
 }
\ No newline at end of file

build/Classes/MakerFile.php

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

Doc Comments +5 added lines

@@ -108,6 +108,7 @@ 
 
     /**
      * Analisa os caminhos das pastas base
+     * @param string $basePath
      */
     public function parseLocation ( $basePath )
     {
@@ -265,6 +266,9 @@ 
         $progressBar->finish();
     }
 
+    /**
+     * @param integer $cur
+     */
     private function waitOfDatabase ( &$cur )
     {
         printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
@@ -329,6 +333,7 @@ 
      * parse a tpl file and return the result
      *
      * @param String $tplFile
+     * @param AbstractAdapter $objMakeFile
      *
      * @return String
      */

build/Classes/Config.php

Indentation +4 added lines, -4 removed lines

@@ -160,14 +160,14 @@ 
     {
         $update = new Update();
         $update->update ()
-               ->modifyTempName ();
+                ->modifyTempName ();
     }
 
     public function download ( $version )
     {
         $update = new Update();
         $update->downloadVersion ( $version )
-               ->modifyTempName ();
+                ->modifyTempName ();
     }
 
     public function getVersion ()
@@ -193,7 +193,7 @@ 
         $configIni = isset( $argv[ 'name-ini' ] )
             ? $argv[ 'name-ini' ]
             : $this->_basePath
-              . $this->configIniDefault;
+                . $this->configIniDefault;
 
         $configTemp = $this->loadIniFile ( realpath ( $configIni ) );
         $configCurrent = self::parseConfigEnv ( $configTemp , $argv );
@@ -207,7 +207,7 @@ 
         {
             $frameworks = implode ( "\n\t" , $this->frameworkList );
             throw new \Exception( "list of frameworks: \n\t\033[1;33m" . $frameworks
-                                  . "\n\033[0m" );
+                                    . "\n\033[0m" );
         }
 
         return $argv + array_filter ( $configCurrent );

Spacing +98 added lines, -98 removed lines

@@ -55,7 +55,7 @@ 
     /**
      * @var array
      */
-    private $argv = array ();
+    private $argv = array();
 
     /**
      * @var \Classes\AdapterConfig\AbstractAdapter
@@ -67,57 +67,57 @@ 
      */
     private $adapterDriver;
 
-    private $frameworkList = array (
-        'none' ,
-        'zf1' ,
+    private $frameworkList = array(
+        'none',
+        'zf1',
         'phalcon'
     );
 
-    private $parameterList = array (
-        'init'             => 'Creates the necessary configuration file to start using the orm-generator.' ,
-        'name-ini'         => 'reference to another .ini file configuration (relative path).' ,
-        'config-env'       => 'orm-generator configuration environment.' ,
-        'framework'        => 'name framework used, which has the contents of the database configurations and framework template.' ,
-        'driver'           => 'database driver name (Ex.: pgsql).' ,
-        'database'         => 'database name.' ,
-        'schema'           => 'database schema name (one or more than one).' ,
-        'tables'           => 'table name (parameter can be used more then once).' ,
-        'optional-classes' => 'List of optional Predefined classes to be created (Consult in github the list of each framework).' ,
-        'clean-trash'      => 'delete all files that do not belong to your Database due' ,
-        'status'           => 'show status of implementation carried out after completing the process.' ,
-        'version'          => 'shows the version of orm-generator.' ,
-        'help'             => "help command explaining all the options and manner of use." ,
-        'path'             => "specify where to create the files (default is current directory)." ,
-        'update'           => "Upgrade to latest version." ,
+    private $parameterList = array(
+        'init'             => 'Creates the necessary configuration file to start using the orm-generator.',
+        'name-ini'         => 'reference to another .ini file configuration (relative path).',
+        'config-env'       => 'orm-generator configuration environment.',
+        'framework'        => 'name framework used, which has the contents of the database configurations and framework template.',
+        'driver'           => 'database driver name (Ex.: pgsql).',
+        'database'         => 'database name.',
+        'schema'           => 'database schema name (one or more than one).',
+        'tables'           => 'table name (parameter can be used more then once).',
+        'optional-classes' => 'List of optional Predefined classes to be created (Consult in github the list of each framework).',
+        'clean-trash'      => 'delete all files that do not belong to your Database due',
+        'status'           => 'show status of implementation carried out after completing the process.',
+        'version'          => 'shows the version of orm-generator.',
+        'help'             => "help command explaining all the options and manner of use.",
+        'path'             => "specify where to create the files (default is current directory).",
+        'update'           => "Upgrade to latest version.",
         'download'         => "download the reported version (ex. --download=1.5.0). "
     );
 
-    public function __construct ( $argv , $basePath , $numArgs )
+    public function __construct($argv, $basePath, $numArgs)
     {
-        if ( array_key_exists ( 'help' , $argv ) or ( $numArgs > 1
-                                                      && count ( $argv ) < 1 )
+        if (array_key_exists('help', $argv) or ($numArgs > 1
+                                                      && count($argv) < 1)
         )
         {
-            die ( $this->getUsage () );
+            die ($this->getUsage());
         }
-        if ( array_key_exists ( 'version' , $argv ) )
+        if (array_key_exists('version', $argv))
         {
-            die ( $this->getVersion () );
+            die ($this->getVersion());
         }
-        if ( array_key_exists ( 'status' , $argv ) )
+        if (array_key_exists('status', $argv))
         {
-            $argv[ 'status' ] = true;
+            $argv['status'] = true;
         }
-        if ( array_key_exists ( 'update' , $argv ) )
+        if (array_key_exists('update', $argv))
         {
-            die ( $this->update () );
+            die ($this->update());
         }
-        if ( array_key_exists ( 'download' , $argv ) )
+        if (array_key_exists('download', $argv))
         {
-            die ( $this->download ( $argv[ 'download' ] ) );
+            die ($this->download($argv['download']));
         }
 
-        $this->argv = $this->parseConfig ( $basePath , $argv );
+        $this->argv = $this->parseConfig($basePath, $argv);
     }
 
     /**
@@ -125,10 +125,10 @@ 
      *
      * @return string
      */
-    public function getUsage ()
+    public function getUsage()
     {
-        $version = $this->getVersion ();
-        $list = $this->renderParam ();
+        $version = $this->getVersion();
+        $list = $this->renderParam();
 
         return <<<EOF
 parameters:
@@ -139,12 +139,12 @@ 
 EOF;
     }
 
-    public function renderParam ()
+    public function renderParam()
     {
         $return = "";
-        foreach ( $this->parameterList as $param => $desc )
+        foreach ($this->parameterList as $param => $desc)
         {
-            if ( strlen ( $param ) < 5 )
+            if (strlen($param) < 5)
             {
                 $return .= "\t--" . $param . "\t\t: " . $desc . "\n";
             } else
@@ -157,21 +157,21 @@ 
         return $return;
     }
 
-    public function update ()
+    public function update()
     {
         $update = new Update();
-        $update->update ()
-               ->modifyTempName ();
+        $update->update()
+               ->modifyTempName();
     }
 
-    public function download ( $version )
+    public function download($version)
     {
         $update = new Update();
-        $update->downloadVersion ( $version )
-               ->modifyTempName ();
+        $update->downloadVersion($version)
+               ->modifyTempName();
     }
 
-    public function getVersion ()
+    public function getVersion()
     {
         $version = new Version();
 
@@ -187,31 +187,31 @@ 
      * @return array
      * @throws \Exception
      */
-    private function parseConfig ( $basePath , $argv )
+    private function parseConfig($basePath, $argv)
     {
         $this->_basePath = $basePath;
 
-        $configIni = isset( $argv[ 'name-ini' ] )
-            ? $argv[ 'name-ini' ]
+        $configIni = isset($argv['name-ini'])
+            ? $argv['name-ini']
             : $this->_basePath
               . $this->configIniDefault;
 
-        $configTemp = $this->loadIniFile ( realpath ( $configIni ) );
-        $configCurrent = self::parseConfigEnv ( $configTemp , $argv );
+        $configTemp = $this->loadIniFile(realpath($configIni));
+        $configCurrent = self::parseConfigEnv($configTemp, $argv);
 
-        if ( ! isset( $configCurrent[ 'framework' ] ) )
+        if ( ! isset($configCurrent['framework']))
         {
-            throw new \Exception( "configure which framework you want to use! \n" );
+            throw new \Exception("configure which framework you want to use! \n");
         }
 
-        if ( ! in_array ( $configCurrent[ 'framework' ] , $this->frameworkList ) )
+        if ( ! in_array($configCurrent['framework'], $this->frameworkList))
         {
-            $frameworks = implode ( "\n\t" , $this->frameworkList );
-            throw new \Exception( "list of frameworks: \n\t\033[1;33m" . $frameworks
-                                  . "\n\033[0m" );
+            $frameworks = implode("\n\t", $this->frameworkList);
+            throw new \Exception("list of frameworks: \n\t\033[1;33m" . $frameworks
+                                  . "\n\033[0m");
         }
 
-        return $argv + array_filter ( $configCurrent );
+        return $argv + array_filter($configCurrent);
     }
 
     /**
@@ -221,24 +221,24 @@ 
      *
      * @return string
      */
-    private static function parseConfigEnv ( $configTemp , $argv )
+    private static function parseConfigEnv($configTemp, $argv)
     {
-        $thisSection = isset( $configTemp[ key ( $configTemp ) ][ 'config-env' ] )
-            ? $configTemp[ key (
+        $thisSection = isset($configTemp[key($configTemp)]['config-env'])
+            ? $configTemp[key(
                 $configTemp
-            ) ][ 'config-env' ] : null;
+            )]['config-env'] : null;
 
-        $thisSection = isset( $argv[ 'config-env' ] ) ? $argv[ 'config-env' ]
+        $thisSection = isset($argv['config-env']) ? $argv['config-env']
             : $thisSection;
 
-        if ( isset( $configTemp[ $thisSection ][ 'extends' ] ) )
+        if (isset($configTemp[$thisSection]['extends']))
         {
             #faz marge da config principal com a config extendida
-            return $configTemp[ $thisSection ]
-                   + $configTemp[ $configTemp[ $thisSection ][ 'extends' ] ];
+            return $configTemp[$thisSection]
+                   + $configTemp[$configTemp[$thisSection]['extends']];
         }
 
-        return $configTemp[ key ( $configTemp ) ];
+        return $configTemp[key($configTemp)];
     }
 
     /**
@@ -252,32 +252,32 @@ 
      * @throws \Exception
      * @return array
      */
-    protected function loadIniFile ( $filename )
+    protected function loadIniFile($filename)
     {
-        if ( ! is_file ( $filename ) )
+        if ( ! is_file($filename))
         {
-            throw new \Exception( "\033[0;31mError: configuration file does not exist! \033[0m\n" );
+            throw new \Exception("\033[0;31mError: configuration file does not exist! \033[0m\n");
         }
 
-        $loaded = parse_ini_file ( $filename , true );
-        $iniArray = array ();
-        foreach ( $loaded as $key => $data )
+        $loaded = parse_ini_file($filename, true);
+        $iniArray = array();
+        foreach ($loaded as $key => $data)
         {
-            $pieces = explode ( $this->sectionSeparator , $key );
-            $thisSection = trim ( $pieces[ 0 ] );
-            switch ( count ( $pieces ) )
+            $pieces = explode($this->sectionSeparator, $key);
+            $thisSection = trim($pieces[0]);
+            switch (count($pieces))
             {
                 case 1:
-                    $iniArray[ $thisSection ] = $data;
+                    $iniArray[$thisSection] = $data;
                     break;
 
                 case 2:
-                    $extendedSection = trim ( $pieces[ 1 ] );
-                    $iniArray[ $thisSection ] = array_merge ( array ( 'extends' => $extendedSection ) , $data );
+                    $extendedSection = trim($pieces[1]);
+                    $iniArray[$thisSection] = array_merge(array('extends' => $extendedSection), $data);
                     break;
 
                 default:
-                    throw new \Exception( "Section '$thisSection' may not extend multiple sections in $filename" );
+                    throw new \Exception("Section '$thisSection' may not extend multiple sections in $filename");
             }
         }
 
@@ -290,16 +290,16 @@ 
      * @return \Classes\AdapterConfig\AbstractAdapter
      *
      */
-    private function factoryConfig ()
+    private function factoryConfig()
     {
-        switch ( strtolower ( $this->argv[ 'framework' ] ) )
+        switch (strtolower($this->argv['framework']))
         {
             case 'zf1':
-                return new ZendFrameworkOne( $this->argv );
+                return new ZendFrameworkOne($this->argv);
             case 'phalcon':
-                return new Phalcon( $this->argv );
+                return new Phalcon($this->argv);
             default:
-                return new None( $this->argv );
+                return new None($this->argv);
         }
 
     }
@@ -311,33 +311,33 @@ 
      *
      * @return AdaptersDriver\AbsractAdapter
      */
-    private function factoryDriver ( AdapterConfig\AbstractAdapter $config )
+    private function factoryDriver(AdapterConfig\AbstractAdapter $config)
     {
-        switch ( $this->argv[ 'driver' ] )
+        switch ($this->argv['driver'])
         {
             case 'pgsql':
             case 'pdo_pgsql':
-                return new Pgsql( $config );
+                return new Pgsql($config);
             case 'mysql':
             case 'pdo_mysql':
-                return new Mysql( $config );
+                return new Mysql($config);
             case 'mssql':
-                return new Mssql( $config );
+                return new Mssql($config);
             case 'dblib':
-                return new Dblib( $config );
+                return new Dblib($config);
             case 'sqlsrv':
-                return new Sqlsrv( $config );
+                return new Sqlsrv($config);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getAdapterConfig ()
+    public function getAdapterConfig()
     {
-        if ( ! $this->adapterConfig instanceof AbstractAdapter )
+        if ( ! $this->adapterConfig instanceof AbstractAdapter)
         {
-            $this->adapterConfig = $this->factoryConfig ();
+            $this->adapterConfig = $this->factoryConfig();
         }
 
         return $this->adapterConfig;
@@ -346,11 +346,11 @@ 
     /**
      * @return AdaptersDriver\AbsractAdapter
      */
-    public function getAdapterDriver ( AdapterConfig\AbstractAdapter $config )
+    public function getAdapterDriver(AdapterConfig\AbstractAdapter $config)
     {
-        if ( ! $this->adapterDriver )
+        if ( ! $this->adapterDriver)
         {
-            $this->adapterDriver = $this->factoryDriver ( $config );
+            $this->adapterDriver = $this->factoryDriver($config);
         }
 
         return $this->adapterDriver;

build/Classes/templates/zf1/peer.php

Spacing +7 added lines, -7 removed lines

@@ -3,21 +3,21 @@
 /**
  * Application Model Peer
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * Tabela definida por 'tablename'
  *
  * @package   <?=$objTables->getNamespace()?><?="\n"?>
  * @subpackage Peer
- * @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()?>_Peer_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends <?=$objTables->getNamespace()?$objTables->getNamespace()."_":''?>DbTable_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () ) . "\n"?>
+class <?=$objTables->getNamespace()?>_Peer_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends <?=$objTables->getNamespace() ? $objTables->getNamespace() . "_" : ''?>DbTable_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName()) . "\n"?>
 {
     /* @TODO Codifique aqui */
 }

build/Classes/AdapterMakerFile/ZendFrameworkOne/Peer.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

@@ -14,14 +14,14 @@
      */
     public    $pastName      = 'Peer';
     protected $fileTpl       = "peer.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();
     }

build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
                 $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
 
                 if(!in_array($class,$dependents)){
-                   $dependents[] = $class;
+                    $dependents[] = $class;
                 }
             }
         }

Spacing +30 added lines, -30 removed lines

@@ -15,14 +15,14 @@ 
 
     public    $pastName      = 'DbTable';
     protected $fileTpl       = "dbtable.php";
-    protected $fileFixedData = array (
-        'parentclass' => array (
-            'name' => "TableAbstract" ,
+    protected $fileFixedData = array(
+        'parentclass' => array(
+            'name' => "TableAbstract",
             'tpl'  => "dbtable_abstract.php"
         )
     );
 
-    protected $overwrite     = true;
+    protected $overwrite = true;
 
     /**
      * @param \Classes\MakerFile $makerFile
@@ -30,70 +30,70 @@ 
      *
      * @return array
      */
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
         $referenceMap = '';
-        $references = array ();
+        $references = array();
         $dependentTables = '';
-        $dependents = array ();
-        foreach ( $dbTable->getForeingkeys () as $objColumn )
+        $dependents = array();
+        foreach ($dbTable->getForeingkeys() as $objColumn)
         {
-            $constrant = $objColumn->getFks ();
-            $variable =  $constrant->getNameConstrant () . ZendFrameworkOne::SEPARETOR . $objColumn->getName ();
+            $constrant = $objColumn->getFks();
+            $variable = $constrant->getNameConstrant() . ZendFrameworkOne::SEPARETOR . $objColumn->getName();
 
-            $arrClass = array (
-                $makerFile->getConfig ()->createClassNamespace ( $constrant ),
+            $arrClass = array(
+                $makerFile->getConfig()->createClassNamespace($constrant),
                 'DbTable',
-                AbstractMaker::getClassName ( $constrant->getTable () )
+                AbstractMaker::getClassName($constrant->getTable())
             );
-            $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+            $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
-            $references[] = sprintf (
+            $references[] = sprintf(
                 "
        '%s' => array (
             'columns'       => '%s' ,
             'refTableClass' => '%s',
             'refColumns'    =>'%s'
        )",
-                AbstractMaker::getClassName ( $variable ),
-                $objColumn->getName (),
+                AbstractMaker::getClassName($variable),
+                $objColumn->getName(),
                 $class,
-                $constrant->getColumn ()
+                $constrant->getColumn()
 
             );
         }
 
-        if ( sizeof ( $references ) > 0 )
+        if (sizeof($references) > 0)
         {
             $referenceMap = "protected \$_referenceMap = array(" .
-                join ( ',', $references ) . "\n    );";
+                join(',', $references) . "\n    );";
         }
 
-        foreach ( $dbTable->getDependences () as $objColumn )
+        foreach ($dbTable->getDependences() as $objColumn)
         {
-            foreach ( $objColumn->getDependences () as $dependence )
+            foreach ($objColumn->getDependences() as $dependence)
             {
-                $arrClass = array (
-                    $makerFile->getConfig ()->createClassNamespace ( $dependence ),
+                $arrClass = array(
+                    $makerFile->getConfig()->createClassNamespace($dependence),
                     'DbTable',
-                    AbstractMaker::getClassName ( $dependence->getTable () )
+                    AbstractMaker::getClassName($dependence->getTable())
                 );
-                $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+                $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
-                if(!in_array($class,$dependents)){
+                if ( ! in_array($class, $dependents)) {
                    $dependents[] = $class;
                 }
             }
         }
 
-        if ( sizeof ( $dependents ) > 0 )
+        if (sizeof($dependents) > 0)
         {
             $dependentTables = "protected \$_dependentTables = array(\n        '" .
-                join ( "',\n        '", $dependents ) . "'\n    );";
+                join("',\n        '", $dependents) . "'\n    );";
         }
 
 
-        return array (
+        return array(
             'referenceMap'    => $referenceMap,
             'dependentTables' => $dependentTables
         );

build/Classes/AdapterConfig/ZendFrameworkOne.php

Spacing +31 added lines, -31 removed lines

@@ -24,7 +24,7 @@ 
 
     const SEPARETOR = "_";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -33,50 +33,50 @@ 
      *
      * @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'];
         }
     }
 
@@ -85,27 +85,27 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
 
-        $instances = array ();
-        if ( $this->hasOptionalClasses () )
+        $instances = array();
+        if ($this->hasOptionalClasses())
         {
-            foreach ( $this->getOptionalClasses () as $optionalClass )
+            foreach ($this->getOptionalClasses() as $optionalClass)
             {
-                $Name = ucfirst ( $optionalClass );
+                $Name = ucfirst($optionalClass);
                 $className = "Classes\\AdapterMakerFile\\ZendFrameworkOne\\{$Name}";
-                if(method_exists($className,'getInstance')){
-                    $instances[] = $className::getInstance ();
+                if (method_exists($className, 'getInstance')) {
+                    $instances[] = $className::getInstance();
                 }
             }
         }
 
-        return array_merge ( array (
-            DbTable::getInstance () ,
-            Entity::getInstance () ,
-            Model::getInstance ()
-        ) , $instances );
+        return array_merge(array(
+            DbTable::getInstance(),
+            Entity::getInstance(),
+            Model::getInstance()
+        ), $instances);
     }
 
 }