pedro151 / orm-generator

build/Classes/templates/zf1/entity.php

Braces +10 added lines, -4 removed lines

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

Spacing +86 added lines, -86 removed lines

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

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
      */

Spacing +102 added lines, -102 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * @type string[]
      */
-    public $location = array ();
+    public $location = array();
 
     /**
      * caminho de pastas Base
@@ -42,42 +42,42 @@ 
 
     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 ) {
-            $attribs = array (
+        foreach ($palavrasReservadas as $index => $config) {
+            $attribs = array(
                 "%index%"  => $index,
                 "%config%" => $config
             );
-            echo strtr ( $this->msgReservedWord, $attribs );
-            $line = trim ( fgets ( STDIN ) );
-            if ( !empty( $line ) ) {
-                $this->getConfig ()->reservedWord[ $index ] = $line;
+            echo strtr($this->msgReservedWord, $attribs);
+            $line = trim(fgets(STDIN));
+            if ( ! empty($line)) {
+                $this->getConfig()->reservedWord[$index] = $line;
             }
         }
     }
@@ -87,174 +87,174 @@ 
      *
      * @return string
      */
-    private function filterLocation ( $arrFoldersName )
+    private function filterLocation($arrFoldersName)
     {
-        foreach ( $arrFoldersName as $index => $folderName ) {
-            $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+        foreach ($arrFoldersName as $index => $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 (
+        $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"} ) {
-            $classDriver = explode ( '\\', get_class ( $this->driver ) );
-            $driverBase  = end ( $classDriver );
+        if ((bool) @$this->config->{"folder-database"} ) {
+            $classDriver = explode('\\', get_class($this->driver));
+            $driverBase  = end($classDriver);
         }
         $folderName = '';
-        if ( (bool) @$this->config->{"folder-name"} ) {
-            $folderName = $this->getClassName ( trim ( $this->config->{"folder-name"} ) );
+        if ((bool) @$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 ) {
-                $arrUrl = array (
+            $schemas = $this->config->getSchemas();
+            foreach ($schemas as $schema) {
+                $arrUrl = array(
                     $this->baseLocation,
                     $driverBase,
                     $folderName,
-                    $this->getClassName ( $schema )
+                    $this->getClassName($schema)
                 );
 
-                $this->location[ $schema ] = $this->filterLocation ( $arrUrl );
-                unset( $arrUrl );
+                $this->location[$schema] = $this->filterLocation($arrUrl);
+                unset($arrUrl);
             }
 
         }
         else {
-            $url            = array (
+            $url = array(
                 $this->baseLocation,
                 $driverBase,
                 $folderName,
-                $this->getClassName (
-                    $this->getConfig ()
-                         ->getDatabase ()
+                $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);
     }
 
     /**
      * Executa o Make, criando arquivos e Diretorios
      */
-    public function run ()
+    public function run()
     {
         $cur             = 0;
         $numFilesCreated = 0;
         $numFilesIgnored = 0;
 
-        $this->startTime ();
+        $this->startTime();
         $this->waitOfDatabase($cur);
 
-        $this->max       = $this->driver->getTotalTables () * $this->countDiretory ();
+        $this->max = $this->driver->getTotalTables() * $this->countDiretory();
 
-        foreach ( $this->location as $schema => $location ) {
-            foreach ( $this->factoryMakerFile () as $objMakeFile ) {
-                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName ();
-                self::makeDir ( $path );
-                if ( $objMakeFile->getParentFileTpl () != '' ) {
+        foreach ($this->location as $schema => $location) {
+            foreach ($this->factoryMakerFile() as $objMakeFile) {
+                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName();
+                self::makeDir($path);
+                if ($objMakeFile->getParentFileTpl() != '') {
                     $fileAbstract = $this->baseLocation
                                     . DIRECTORY_SEPARATOR
-                                    . $objMakeFile->getParentClass ()
+                                    . $objMakeFile->getParentClass()
                                     . '.php';
 
-                    $tplAbstract = $this->getParsedTplContents ( $objMakeFile->getParentFileTpl () );
-                    self::makeSourcer ( $fileAbstract, $tplAbstract, true );
-                    unset( $fileAbstract, $tplAbstract );
+                    $tplAbstract = $this->getParsedTplContents($objMakeFile->getParentFileTpl());
+                    self::makeSourcer($fileAbstract, $tplAbstract, true);
+                    unset($fileAbstract, $tplAbstract);
                 }
 
-                foreach ( $this->driver->getTables ( $schema ) as $key => $objTables ) {
-                    $file = $path . DIRECTORY_SEPARATOR . self::getClassName ( $objTables->getName () ) . '.php';
+                foreach ($this->driver->getTables($schema) as $key => $objTables) {
+                    $file = $path . DIRECTORY_SEPARATOR . self::getClassName($objTables->getName()) . '.php';
 
-                    $tpl = $this->getParsedTplContents (
-                        $objMakeFile->getFileTpl (),
-                        $objMakeFile->parseRelation ( $this, $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;
                     }
                     else {
                         ++$numFilesIgnored;
                     }
 
-                    $this->countCreatedFiles ( $cur );
+                    $this->countCreatedFiles($cur);
                 }
             }
         }
 
-        $this->reportProcess ( $numFilesCreated, $numFilesIgnored );
+        $this->reportProcess($numFilesCreated, $numFilesIgnored);
         echo "\n\033[1;32mSuccessfully process finished!\n\033[0m";
     }
 
-    private function waitOfDatabase ( &$cur )
+    private function waitOfDatabase(&$cur)
     {
-        printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
-        $this->driver->runDatabase ();
-        printf ( "\r Creating: \033[1;32m%6.2f%%\033[0m", $cur );
+        printf("\033[1;33mWait, the database is being analyzed..\033[0m\n");
+        $this->driver->runDatabase();
+        printf("\r Creating: \033[1;32m%6.2f%%\033[0m", $cur);
     }
 
-    private function countCreatedFiles ( &$cur )
+    private function countCreatedFiles(&$cur)
     {
         ++$cur;
-        $total = ( $cur / $this->max ) * 100;
-        printf ( "\r Creating: \033[1;32m%6.2f%%\033[0m", $total );
+        $total = ($cur / $this->max) * 100;
+        printf("\r Creating: \033[1;32m%6.2f%%\033[0m", $total);
     }
 
-    private function reportProcess ( $numFilesCreated = 0, $numFilesIgnored = 0 )
+    private function reportProcess($numFilesCreated = 0, $numFilesIgnored = 0)
     {
-        if ( $this->config->isStatusEnabled () ) {
-            $databases  = count ( $this->location );
-            $countDir   = $this->countDiretory ();
-            $totalTable = $this->driver->getTotalTables ();
+        if ($this->config->isStatusEnabled()) {
+            $databases  = count($this->location);
+            $countDir   = $this->countDiretory();
+            $totalTable = $this->driver->getTotalTables();
             $totalFiles = $numFilesIgnored + $numFilesCreated;
             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-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-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------";
         }
     }
@@ -264,9 +264,9 @@ 
      *
      * @return AbstractAdapter[]
      */
-    public function factoryMakerFile ()
+    public function factoryMakerFile()
     {
-        return $this->config->getMakeFileInstances ();
+        return $this->config->getMakeFileInstances();
     }
 
     /**
@@ -274,12 +274,12 @@ 
      *
      * @return int
      */
-    public function countDiretory ()
+    public function countDiretory()
     {
-        if ( null === $this->countDir ) {
+        if (null === $this->countDir) {
             $this->countDir = 1;
-            foreach ( $this->factoryMakerFile () as $abstractAdapter ) {
-                if ( $abstractAdapter->hasDiretory () ) {
+            foreach ($this->factoryMakerFile() as $abstractAdapter) {
+                if ($abstractAdapter->hasDiretory()) {
                     ++$this->countDir;
                 }
             }
@@ -296,24 +296,24 @@ 
      *
      * @return String
      */
-    protected function getParsedTplContents ( $tplFile, $vars = array (), \Classes\Db\DbTable $objTables = null,
-                                              $objMakeFile = null )
+    protected function getParsedTplContents($tplFile, $vars = array(), \Classes\Db\DbTable $objTables = null,
+                                              $objMakeFile = null)
     {
 
-        $arrUrl = array (
+        $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;
     }

Braces +2 added lines, -4 removed lines

@@ -136,8 +136,7 @@ 
                 unset( $arrUrl );
             }
 
-        }
-        else {
+        } else {
             $url            = array (
                 $this->baseLocation,
                 $driverBase,
@@ -213,8 +212,7 @@ 
                     );
                     if ( self::makeSourcer ( $file, $tpl, $objMakeFile->isOverwrite () ) ) {
                         ++$numFilesCreated;
-                    }
-                    else {
+                    } else {
                         ++$numFilesIgnored;
                     }
 

build/Classes/AdapterConfig/AbstractAdapter.php

Indentation +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
         $matches = preg_grep ( '*\.*' , $this->getTablesName () );
         if ( count ( $matches ) )
         {
-           die("error: Table name must not contain the schema\n");
+            die("error: Table name must not contain the schema\n");
         }
     }
 

Spacing +158 added lines, -158 removed lines

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

build/Classes/AdapterMakerFile/ZendFrameworkOne/Entity.php

Spacing +43 added lines, -43 removed lines

@@ -22,7 +22,7 @@ 
     protected $fileTpl       = "entity.php";
     protected $overwrite     = true;
 
-    protected $validFunc = array ();
+    protected $validFunc = array();
 
     /**
      * @param \Classes\MakerFile  $makerFile
@@ -30,11 +30,11 @@ 
      *
      * @return array
      */
-    public function parseRelation ( \Classes\MakerFile $makerFile , \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
-        return array (
-            'parents' => $this->listParents ( $makerFile , $dbTable ) ,
-            'depends' => $this->listDependence ( $makerFile , $dbTable )
+        return array(
+            'parents' => $this->listParents($makerFile, $dbTable),
+            'depends' => $this->listDependence($makerFile, $dbTable)
         );
     }
 
@@ -44,39 +44,39 @@ 
      *
      * @return array
      */
-    private function listParents ( \Classes\MakerFile $makerFile , \Classes\Db\DbTable $dbTable )
+    private function listParents(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
-        $parents = array ();
-        foreach ( $dbTable->getForeingkeys () as $objColumn )
+        $parents = array();
+        foreach ($dbTable->getForeingkeys() as $objColumn)
         {
-            $constrant = $objColumn->getFks ();
+            $constrant = $objColumn->getFks();
             $name =
                 'Parent'
                 . ZendFrameworkOne::SEPARETOR
-                . AbstractMaker::getClassName ( $constrant->getTable () )
+                . AbstractMaker::getClassName($constrant->getTable())
                 . ZendFrameworkOne::SEPARETOR
                 . 'By'
                 . ZendFrameworkOne::SEPARETOR
-                . $objColumn->getName ();
+                . $objColumn->getName();
 
-            $variable = $constrant->getNameConstrant () . ZendFrameworkOne::SEPARETOR . $objColumn->getName ();
+            $variable = $constrant->getNameConstrant() . ZendFrameworkOne::SEPARETOR . $objColumn->getName();
 
-            $arrClass = array (
-                $makerFile->getConfig ()->createClassNamespace ( $constrant ),
-                AbstractMaker::getClassName ( $constrant->getTable () )
+            $arrClass = array(
+                $makerFile->getConfig()->createClassNamespace($constrant),
+                AbstractMaker::getClassName($constrant->getTable())
             );
-            $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
-
-            $parents[] = array (
-                'class'    => $class ,
-                'function' => AbstractMaker::getClassName ( $name ) ,
-                'table'    => $constrant->getTable () ,
-                'column'   => $constrant->getColumn() ,
-                'name'     => $constrant->getNameConstrant() ,
+            $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
+
+            $parents[] = array(
+                'class'    => $class,
+                'function' => AbstractMaker::getClassName($name),
+                'table'    => $constrant->getTable(),
+                'column'   => $constrant->getColumn(),
+                'name'     => $constrant->getNameConstrant(),
                 'variable' => $variable
 
             );
-            unset( $name );
+            unset($name);
         }
 
         return $parents;
@@ -88,43 +88,43 @@ 
      *
      * @return array
      */
-    private function listDependence ( \Classes\MakerFile $makerFile , \Classes\Db\DbTable $dbTable )
+    private function listDependence(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
-        $depends = array ();
-        foreach ( $dbTable->getDependences () as $objColumn )
+        $depends = array();
+        foreach ($dbTable->getDependences() as $objColumn)
         {
-            foreach ( $objColumn->getDependences () as $dependence )
+            foreach ($objColumn->getDependences() as $dependence)
             {
                 $name =
                     'Depend'
                     . ZendFrameworkOne::SEPARETOR
-                    . AbstractMaker::getClassName ( $dependence->getTable () )
+                    . AbstractMaker::getClassName($dependence->getTable())
                     . ZendFrameworkOne::SEPARETOR
                     . 'By'
                     . ZendFrameworkOne::SEPARETOR
-                    . $objColumn->getName ();
+                    . $objColumn->getName();
 
-                if ( ! key_exists ( $name , $this->validFunc ) )
+                if ( ! key_exists($name, $this->validFunc))
                 {
-                    $variable = $dependence->getNameConstrant () . ZendFrameworkOne::SEPARETOR . $objColumn->getName ();
+                    $variable = $dependence->getNameConstrant() . ZendFrameworkOne::SEPARETOR . $objColumn->getName();
 
-                    $arrClass = array (
-                        $makerFile->getConfig ()->createClassNamespace ( $dependence ),
-                        AbstractMaker::getClassName ( $dependence->getTable () )
+                    $arrClass = array(
+                        $makerFile->getConfig()->createClassNamespace($dependence),
+                        AbstractMaker::getClassName($dependence->getTable())
                     );
-                    $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+                    $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
-                    $this->validFunc[ $name ] = true;
-                    $depends[] = array (
+                    $this->validFunc[$name] = true;
+                    $depends[] = array(
                         'class'    =>  $class,
-                        'function' => AbstractMaker::getClassName ( $name ) ,
-                        'table'    => $dependence->getTable () ,
-                        'column'   => $dependence->getColumn () ,
-                        'name'     =>  $dependence->getNameConstrant (),
+                        'function' => AbstractMaker::getClassName($name),
+                        'table'    => $dependence->getTable(),
+                        'column'   => $dependence->getColumn(),
+                        'name'     =>  $dependence->getNameConstrant(),
                         'variable' => $variable
                     );
                 }
-                unset( $name );
+                unset($name);
             }
         }
 

build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php

Spacing +25 added lines, -25 removed lines

@@ -28,68 +28,68 @@
      *
      * @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));
 
                 $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/AdaptersDriver/AbsractAdapter.php

Spacing +109 added lines, -109 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * @type \Classes\Db\DbTable[][]
      */
-    private $objDbTables = array ();
+    private $objDbTables = array();
 
     /**
      * @var AbstractAdapter
@@ -79,20 +79,20 @@ 
     /**
      * analisa e popula as Foreing keys, Primary keys e dependencias do banco nos objetos
      */
-    protected function parseConstrants ()
+    protected function parseConstrants()
     {
-        foreach ( $this->getListConstrant () as $constrant ) {
-
-            $schema     = $constrant[ 'table_schema' ];
-            $table_name = $constrant [ 'table_name' ];
-            $this->populateForeignAndPrimaryKeys ( $constrant, $table_name, $schema );
-            unset( $table_name, $schema );
-
-            if ( $constrant[ 'constraint_type' ] == "FOREIGN KEY" ) {
-                $schema     = $constrant[ 'foreign_schema' ];
-                $table_name = $constrant [ 'foreign_table' ];
-                $this->populateDependece ( $constrant, $table_name, $schema );
-                unset( $table_name, $schema );
+        foreach ($this->getListConstrant() as $constrant) {
+
+            $schema     = $constrant['table_schema'];
+            $table_name = $constrant ['table_name'];
+            $this->populateForeignAndPrimaryKeys($constrant, $table_name, $schema);
+            unset($table_name, $schema);
+
+            if ($constrant['constraint_type'] == "FOREIGN KEY") {
+                $schema     = $constrant['foreign_schema'];
+                $table_name = $constrant ['foreign_table'];
+                $this->populateDependece($constrant, $table_name, $schema);
+                unset($table_name, $schema);
             }
         }
     }
@@ -102,34 +102,34 @@ 
      * @param string $table_name
      * @param int    $schema
      */
-    private function populateForeignAndPrimaryKeys ( $constrant, $table_name, $schema = 0 )
+    private function populateForeignAndPrimaryKeys($constrant, $table_name, $schema = 0)
     {
-        if ( $this->hasTable ( $table_name, $schema ) ) {
-            $table = $this->getTable ( $table_name, $schema );
-            if ( $table->hasColumn ( $constrant[ "column_name" ] ) ) {
-                $objConstrant = Constrant::getInstance ()
-                                         ->populate (
-                                             array (
-                                                 'constrant' => $constrant[ 'constraint_name' ],
-                                                 'schema'    => $constrant[ 'foreign_schema' ],
-                                                 'table'     => $constrant[ 'foreign_table' ],
-                                                 'column'    => $constrant[ 'foreign_column' ],
+        if ($this->hasTable($table_name, $schema)) {
+            $table = $this->getTable($table_name, $schema);
+            if ($table->hasColumn($constrant["column_name"])) {
+                $objConstrant = Constrant::getInstance()
+                                         ->populate(
+                                             array(
+                                                 'constrant' => $constrant['constraint_name'],
+                                                 'schema'    => $constrant['foreign_schema'],
+                                                 'table'     => $constrant['foreign_table'],
+                                                 'column'    => $constrant['foreign_column'],
                                                  'database'  => $this->database
                                              )
                                          );
 
-                switch ( $constrant[ 'constraint_type' ] ) {
+                switch ($constrant['constraint_type']) {
                     case "FOREIGN KEY":
-                        $table->getColumn ( $constrant[ "column_name" ] )
-                              ->addRefFk ( $objConstrant );
+                        $table->getColumn($constrant["column_name"])
+                              ->addRefFk($objConstrant);
                         break;
                     case"PRIMARY KEY":
-                        $table->getColumn ( $constrant[ "column_name" ] )
-                              ->setPrimaryKey ( $objConstrant )
-                              ->setSequence (
-                                  $this->getSequence (
+                        $table->getColumn($constrant["column_name"])
+                              ->setPrimaryKey($objConstrant)
+                              ->setSequence(
+                                  $this->getSequence(
                                       $table_name,
-                                      $constrant[ "column_name" ],
+                                      $constrant["column_name"],
                                       $schema
                                   )
                               );
@@ -144,18 +144,18 @@ 
      * @param string $table_name
      * @param int    $schema
      */
-    private function populateDependece ( $constrant, $table_name, $schema = 0 )
+    private function populateDependece($constrant, $table_name, $schema = 0)
     {
-        if ( $this->hasTable ( $table_name, $schema ) ) {
-            $table = $this->getTable ( $table_name, $schema );
-            if ( $table->hasColumn ( $constrant[ "foreign_column" ] ) ) {
-                $table->getColumn ( $constrant[ "foreign_column" ] )
-                      ->createDependece (
-                          $constrant[ 'constraint_name' ],
-                          $constrant[ 'table_name' ],
-                          $constrant[ 'column_name' ],
+        if ($this->hasTable($table_name, $schema)) {
+            $table = $this->getTable($table_name, $schema);
+            if ($table->hasColumn($constrant["foreign_column"])) {
+                $table->getColumn($constrant["foreign_column"])
+                      ->createDependece(
+                          $constrant['constraint_name'],
+                          $constrant['table_name'],
+                          $constrant['column_name'],
                           $this->database,
-                          $constrant[ 'table_schema' ]
+                          $constrant['table_schema']
                       );
             }
         }
@@ -164,33 +164,33 @@ 
     /**
      * cria um Array com nome das tabelas
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( $this->hasTables () ) {
-            return $this->getAllTables ();
+        if ($this->hasTables()) {
+            return $this->getAllTables();
         }
 
-        foreach ( $this->getListColumns () as $table ) {
-            $schema = $table[ 'table_schema' ];
-            $key    = $table [ 'table_name' ];
-            if ( !$this->hasTable ( $key, $schema ) ) {
-                $this->createTable ( $key, $schema );
+        foreach ($this->getListColumns() as $table) {
+            $schema = $table['table_schema'];
+            $key    = $table ['table_name'];
+            if ( ! $this->hasTable($key, $schema)) {
+                $this->createTable($key, $schema);
             }
 
-            $column = Column::getInstance ()
-                            ->populate (
-                                array (
-                                    'name'       => $table [ 'column_name' ],
-                                    'type'       => $this->convertTypeToSimple ( $table[ 'data_type' ] ),
-                                    'nullable'   => ( $table[ 'is_nullable' ] == 'YES' ),
-                                    'max_length' => $table[ 'max_length' ]
+            $column = Column::getInstance()
+                            ->populate(
+                                array(
+                                    'name'       => $table ['column_name'],
+                                    'type'       => $this->convertTypeToSimple($table['data_type']),
+                                    'nullable'   => ($table['is_nullable'] == 'YES'),
+                                    'max_length' => $table['max_length']
                                 )
                             );
 
-            $this->getTable ( $key, $schema )
-                 ->addColumn ( $column )
-                 ->setNamespace (
-                     $this->config->createClassNamespace ( $this->getTable ( $key, $schema ) )
+            $this->getTable($key, $schema)
+                 ->addColumn($column)
+                 ->setNamespace(
+                     $this->config->createClassNamespace($this->getTable($key, $schema))
                  );
         }
     }
@@ -200,7 +200,7 @@ 
      *
      * @return int
      */
-    abstract public function getTotalTables ();
+    abstract public function getTotalTables();
 
     /**
      * Retorna o Nome da Sequence da tabela
@@ -210,31 +210,31 @@ 
      *
      * @return string
      */
-    abstract public function getSequence ( $table, $column, $schema = 0 );
+    abstract public function getSequence($table, $column, $schema = 0);
 
     /**
      * @return array
      */
-    abstract public function getListConstrant ();
+    abstract public function getListConstrant();
 
     /**
      * @param string $str
      *
      * @return string
      */
-    protected function convertTypeToPhp ( $str )
+    protected function convertTypeToPhp($str)
     {
-        if ( isset( $this->dataTypesToPhp[ $str ] ) ) {
-            return $this->dataTypesToPhp[ $str ];
+        if (isset($this->dataTypesToPhp[$str])) {
+            return $this->dataTypesToPhp[$str];
         }
 
         return 'string';
     }
 
-    protected function convertTypeToSimple ( $str )
+    protected function convertTypeToSimple($str)
     {
-        if ( isset( $this->dataTypesToSimple[ $str ] ) ) {
-            return $this->dataTypesToSimple[ $str ];
+        if (isset($this->dataTypesToSimple[$str])) {
+            return $this->dataTypesToSimple[$str];
         }
 
         return 'string';
@@ -243,12 +243,12 @@ 
     /**
      * @return string
      */
-    abstract public function getPDOString ();
+    abstract public function getPDOString();
 
     /**
      * @return string
      */
-    abstract public function getPDOSocketString ();
+    abstract public function getPDOSocketString();
 
     /**
      * @param     $nameTable
@@ -256,11 +256,11 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function createTable ( $nameTable, $schema = 0 )
+    public function createTable($nameTable, $schema = 0)
     {
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
+        $this->objDbTables[$schema][trim($nameTable)] = DbTable::getInstance()
+                                                                      ->populate(
+                                                                          array(
                                                                               'table'    => $nameTable,
                                                                               'schema'   => $schema,
                                                                               'database' => $this->database
@@ -275,23 +275,23 @@ 
      *
      * @return \Classes\Db\DbTable[]
      */
-    public function getTables ( $schema = 0 )
+    public function getTables($schema = 0)
     {
-        if ( !isset( $this->objDbTables[ $schema ] ) ) {
-            return array ();
+        if ( ! isset($this->objDbTables[$schema])) {
+            return array();
         }
 
-        return $this->objDbTables[ $schema ];
+        return $this->objDbTables[$schema];
     }
 
-    public function getAllTables ()
+    public function getAllTables()
     {
         return $this->objDbTables;
     }
 
-    public function hasTables ()
+    public function hasTables()
     {
-        return !empty( $this->objDbTables );
+        return ! empty($this->objDbTables);
     }
 
     /**
@@ -301,9 +301,9 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function getTable ( $nameTable, $schema = 0 )
+    public function getTable($nameTable, $schema = 0)
     {
-        return $this->objDbTables[ $schema ][ trim ( $nameTable ) ];
+        return $this->objDbTables[$schema][trim($nameTable)];
     }
 
     /**
@@ -312,9 +312,9 @@ 
      *
      * @return bool
      */
-    public function hasTable ( $nameTable, $schema = 0 )
+    public function hasTable($nameTable, $schema = 0)
     {
-        return isset( $this->objDbTables[ $schema ][ trim ( $nameTable ) ] );
+        return isset($this->objDbTables[$schema][trim($nameTable)]);
     }
 
     /**
@@ -322,60 +322,60 @@ 
      *
      * @return array[]
      */
-    abstract public function getListColumns ();
+    abstract public function getListColumns();
 
     /**
      * Retorna um Array com nome das tabelas
      *
      * @return string[]
      */
-    abstract public function getListNameTable ();
+    abstract public function getListNameTable();
 
     /**
      * @param \Classes\AdapterConfig\AbstractAdapter $adapterConfig
      */
-    public function __construct ( AbstractAdapter $adapterConfig )
+    public function __construct(AbstractAdapter $adapterConfig)
     {
         $this->config   = $adapterConfig;
-        $this->host     = $adapterConfig->getHost ();
-        $this->database = $adapterConfig->getDatabase ();
-        $this->port     = $adapterConfig->hasPort () ? $adapterConfig->getPort () : $this->port;
-        $this->username = $adapterConfig->getUser ();
-        $this->password = $adapterConfig->getPassword ();
-        $this->socket   = $adapterConfig->getSocket ();
-        $this->tablesName = $adapterConfig->hasTablesName ()? $adapterConfig->getListTablesName():'';
+        $this->host     = $adapterConfig->getHost();
+        $this->database = $adapterConfig->getDatabase();
+        $this->port     = $adapterConfig->hasPort() ? $adapterConfig->getPort() : $this->port;
+        $this->username = $adapterConfig->getUser();
+        $this->password = $adapterConfig->getPassword();
+        $this->socket   = $adapterConfig->getSocket();
+        $this->tablesName = $adapterConfig->hasTablesName() ? $adapterConfig->getListTablesName() : '';
 
     }
 
     /**
      * Executa as consultas do banco de dados
      */
-    public function runDatabase ()
+    public function runDatabase()
     {
-        $this->parseTables ();
-        $this->parseConstrants ();
+        $this->parseTables();
+        $this->parseConstrants();
     }
 
     /**
      *
      * @return \PDO
      */
-    public function getPDO ()
+    public function getPDO()
     {
-        if ( is_null ( $this->_pdo ) ) {
-            if ( !empty( $this->socket ) ) {
-                $pdoString = $this->getPDOSocketString ();
+        if (is_null($this->_pdo)) {
+            if ( ! empty($this->socket)) {
+                $pdoString = $this->getPDOSocketString();
             }
             else {
-                $pdoString = $this->getPDOString ();
+                $pdoString = $this->getPDOString();
             }
 
             try {
-                $this->_pdo = new \PDO (
+                $this->_pdo = new \PDO(
                     $pdoString, $this->username, $this->password
                 );
-            } catch ( \Exception $e ) {
-                die ( "pdo error: " . $e->getMessage () . "\n" );
+            } catch (\Exception $e) {
+                die ("pdo error: " . $e->getMessage() . "\n");
             }
         }
 

build/Classes/AdaptersDriver/Pgsql.php

Spacing +51 added lines, -51 removed lines

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

build/Classes/AdaptersDriver/Mysql.php

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 )" : '';
 
-        return $this->getPDO ()
-                    ->query (
+        return $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;"
                     )
-                    ->fetchAll ( \PDO::FETCH_ASSOC );
+                    ->fetchAll(\PDO::FETCH_ASSOC);
     }
 
     /**
@@ -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/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 */
 }