pedro151 / orm-generator

build/Classes/AdapterMakerFile/Phalcon/Entity.php

Spacing +31 added lines, -31 removed lines

@@ -20,7 +20,7 @@ 
     protected $fileTpl   = "entity.php";
     protected $overwrite = true;
 
-    protected $validFunc = array ();
+    protected $validFunc = array();
 
     private $intersectDependence = false;
 
@@ -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 (
-            'mapParents'    => $this->listParents ( $makerFile, $dbTable ),
-            'mapDependents' => $this->listDependence ( $makerFile, $dbTable )
+        return array(
+            'mapParents'    => $this->listParents($makerFile, $dbTable),
+            'mapDependents' => $this->listDependence($makerFile, $dbTable)
         );
     }
 
@@ -44,26 +44,26 @@ 
      *
      * @return array
      */
-    private function listParents ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    private function listParents(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
         $mapParents = '';
-        $references = array ();
-        foreach ( $dbTable->getForeingkeys () as $objColumn ) {
-            $constrant    = $objColumn->getFks ();
-            $references[] = sprintf (
+        $references = array();
+        foreach ($dbTable->getForeingkeys() as $objColumn) {
+            $constrant    = $objColumn->getFks();
+            $references[] = sprintf(
                 '$this->belongsTo(\'%s\', \'%s\', \'%s\', array(\'alias\' => \'%s\'))',
-                $objColumn->getName (),
-                $makerFile->getConfig ()
-                          ->createClassNamespace ( $constrant ) . Phalcon::SEPARETOR . AbstractMaker::getClassName (
-                    $constrant->getTable ()
+                $objColumn->getName(),
+                $makerFile->getConfig()
+                          ->createClassNamespace($constrant) . Phalcon::SEPARETOR . AbstractMaker::getClassName(
+                    $constrant->getTable()
                 ),
-                $constrant->getColumn (),
-                AbstractMaker::getClassName ( $constrant->getTable () )
+                $constrant->getColumn(),
+                AbstractMaker::getClassName($constrant->getTable())
             );
         }
 
-        if ( sizeof ( $references ) > 0 ) {
-            $mapParents = join ( ";\n\t\t", $references ) . ";\n";
+        if (sizeof($references) > 0) {
+            $mapParents = join(";\n\t\t", $references) . ";\n";
         }
 
 
@@ -76,28 +76,28 @@ 
      *
      * @return array
      */
-    private function listDependence ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    private function listDependence(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
         $mapDependence = '';
-        $references    = array ();
-        foreach ( $dbTable->getDependences () as $objColumn ) {
-            foreach ( $objColumn->getDependences () as $dependence ) {
-                $references[] = sprintf (
+        $references    = array();
+        foreach ($dbTable->getDependences() as $objColumn) {
+            foreach ($objColumn->getDependences() as $dependence) {
+                $references[] = sprintf(
                     '$this->hasMany(\'%s\', \'%s\', \'%s\', array(\'alias\' => \'%s\'))',
-                    $objColumn->getName (),
-                    $makerFile->getConfig ()
-                              ->createClassNamespace ( $dependence )
+                    $objColumn->getName(),
+                    $makerFile->getConfig()
+                              ->createClassNamespace($dependence)
                     . Phalcon::SEPARETOR
-                    . AbstractMaker::getClassName ( $dependence->getTable () ),
-                    $dependence->getColumn (),
-                    AbstractMaker::getClassName ( $dependence->getTable () )
+                    . AbstractMaker::getClassName($dependence->getTable()),
+                    $dependence->getColumn(),
+                    AbstractMaker::getClassName($dependence->getTable())
                 );
 
             }
         }
 
-        if ( sizeof ( $references ) > 0 ) {
-            $mapDependence = join ( ";\n\t\t", $references ) . ";";
+        if (sizeof($references) > 0) {
+            $mapDependence = join(";\n\t\t", $references) . ";";
         }
 
         return $mapDependence;

build/Classes/templates/zf1/entity.php

Spacing +39 added lines, -39 removed lines

@@ -1,35 +1,35 @@ 
 <?="<?php\n"?>
-<?php $className = $objTables->getNamespace(). '_Entity_' . \Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?>
+<?php $className = $objTables->getNamespace() . '_Entity_' . \Classes\Maker\AbstractMaker::getClassName($objTables->getName())?>
 
 /**
  * Application Entity
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
- * @package <?=$objTables->getNamespace()."\n"?>
+ * @package <?=$objTables->getNamespace() . "\n"?>
  * @subpackage Entity
  *
- * @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"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  */
 
 /**
  * Abstract class for entity
  */
 
-abstract class <?=$className?> extends <?=$this->config->namespace?$this->config->namespace."_":""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
+abstract class <?=$className?> extends <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
 {
 
 <?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()?>';
-<?php endforeach;?>
+<?php endforeach; ?>
 
     /**
     * Nome da tabela DbTable do model
@@ -37,7 +37,7 @@ 
     * @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
@@ -45,17 +45,17 @@ 
     protected $_columnsList = array(
 <?php foreach ($objTables->getColumns() as $column): ?>
         self::<?=strtoupper($column->getName())?> => '<?=strtolower(\Classes\Maker\AbstractMaker::getClassName($column->getName()))?>',
-<?php endforeach;?>
+<?php endforeach; ?>
     );
 
     /**
      * @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';
@@ -66,50 +66,50 @@ 
         case 'Date':
             break;
         default:
-            $filters = ucfirst ( $column->getType () );
+            $filters = ucfirst($column->getType());
             break;
     }
 ?>
         '<?=$column->getName()?>'=>array (
-            <?=( !empty( $filters ) ) ? "\"{$filters}\"\n" : null; ?>
+            <?=( ! empty($filters)) ? "\"{$filters}\"\n" : null; ?>
         ),
-<?php endforeach;?>
+<?php endforeach; ?>
     );
 
     /**
      * @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 () )
+            if ($column->getMaxLength())
             {
-                $validators[] = "array( 'StringLength', array( 'max' => " . $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
     *
@@ -118,7 +118,7 @@ 
     */
 
     protected $_primary = array(
-    <?php foreach($objTables->getPrimarykeys() as $pks) : ?>
+    <?php foreach ($objTables->getPrimarykeys() as $pks) : ?>
         '<?=$pks->getName()?>',
     <?php endforeach ?>
     );
@@ -132,7 +132,7 @@ 
     */
     protected $_parent_<?=$parent['name']?>;
 
-<?php endforeach;?>
+<?php endforeach; ?>
 <?php foreach ($depends as $depend): ?>
     /**
      * Depends relation <?=\Classes\Maker\AbstractMaker::getClassName($depend['table']) . "\n"?>
@@ -141,13 +141,13 @@ 
      */
      protected $_depend_<?=$depend['name']?>;
 
-<?php endforeach;?>
+<?php endforeach; ?>
 <?php foreach ($objTables->getColumns() as $column): ?>
     /**
     *
-    * Sets column <?=$column->getName()."\n"?>
+    * Sets column <?=$column->getName() . "\n"?>
     *
-<?php if ($column->getType()=='date'): ?>
+<?php if ($column->getType() == 'date'): ?>
     * Stored in ISO 8601 format.
     *
     * @param string|Zend_Date $<?=$column->getName() . "\n"?>
@@ -158,7 +158,7 @@ 
     */
     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()?>))
         {
@@ -197,16 +197,16 @@ 
     /**
     * Gets column <?=$column->getName() . "\n"?>
     *
-<?php if ($column->getType()=='date'): ?>
+<?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: ?>
     * @return <?=$column->getType() . "\n"?>
 <?php endif; ?>
     */
-    public function get<?=\Classes\Maker\AbstractMaker::getClassName($column->getName())?>(<?php if ($column->getType()=='date'): ?>$returnZendDate = false <?php endif;?>)
+    public function get<?=\Classes\Maker\AbstractMaker::getClassName($column->getName())?>(<?php if ($column->getType() == 'date'): ?>$returnZendDate = false <?php endif; ?>)
     {
-<?php if ($column->getType()=='date'): ?>
+<?php if ($column->getType() == 'date'): ?>
         if ($returnZendDate)
         {
             if ($this->_data['<?=$column->getName()?>'] === null)
@@ -232,7 +232,7 @@ 
     {
         if ($this->_parent_<?=$parent['name']?> === null)
         {
-            $this->_parent_<?=$parent['name']?> = $this->findParentRow('<?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName ($parent['table'])?>', '<?=\Classes\Maker\AbstractMaker::getClassName($parent['name'])?>');
+            $this->_parent_<?=$parent['name']?> = $this->findParentRow('<?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName($parent['table'])?>', '<?=\Classes\Maker\AbstractMaker::getClassName($parent['name'])?>');
         }
 
         return $this->_parent_<?=$parent['name']?>;
@@ -251,7 +251,7 @@ 
     {
         if ($this->_depend_<?=$depend['name']?> === null)
         {
-            $this->_depend_<?=$depend['name']?> = $this->findDependentRowset('<?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName ($depend['table'])?>');
+            $this->_depend_<?=$depend['name']?> = $this->findDependentRowset('<?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName($depend['table'])?>');
         }
 
       return $this->_depend_<?=$depend['name']?>;

build/Classes/templates/zf1/dbtable.php

Spacing +15 added lines, -15 removed lines

@@ -3,20 +3,20 @@ 
 /**
  * Application Model DbTables
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * Tabela definida por 'tablename'
  *
  * @package   <?=$objTables->getNamespace()?><?="\n"?>
  * @subpackage DbTable
- * @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"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  */
 
-class <?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends <?=$this->config->namespace?$this->config->namespace."_":""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
+class <?=$objTables->getNamespace()?>_DbTable_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_<?=$objMakeFile->getParentClass() . "\n"?>
 {
     /**
      * Nome da tabela do banco de dados
@@ -25,7 +25,7 @@ 
      * @access protected
      */
     protected $_name = '<?=$objTables->getName()?>';
-<?php if($objTables->hasSchema()): ?>
+<?php if ($objTables->hasSchema()): ?>
 
     /**
      * Schema da tabela do banco de dados
@@ -42,9 +42,9 @@ 
      * @var string
      * @access protected
      */
-    protected $_rowClass = '<?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?>';
+    protected $_rowClass = '<?=$objTables->getNamespace()?>_<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?>';
 
-<?php if( $objTables->hasPrimaryKey() ):?>
+<?php if ($objTables->hasPrimaryKey()):?>
 	/**
      * Nome da Primary Key
      *
@@ -52,12 +52,12 @@ 
      * @access protected
      */
     protected $_primary = array(
-<?php foreach($objTables->getPrimaryKeys() as $pks):?>
+<?php foreach ($objTables->getPrimaryKeys() as $pks):?>
         '<?=$pks->getName()?>',
 <?php endforeach; ?>
     );
 <?php endif ?>
-<?php if($this->config->{'folder-name'}):?>
+<?php if ($this->config->{'folder-name'}):?>
     /**
     * Initialize database adapter.
     *
@@ -72,7 +72,7 @@ 
         parent::_setupDatabaseAdapter();
     }
 <?php endif ?>
-<?php if( $objTables->hasSequences() ) : ?>
+<?php if ($objTables->hasSequences()) : ?>
 
 	/**
      * Definir a lógica para os novos valores na chave primária.
@@ -80,9 +80,9 @@ 
      *
      * @var mixed
      */
-<?php if ( 1 ==  count($objTables->getSequences() ) ) : ?>
-<?php if(strpos($this->config->driver, 'pgsql')): ?>
-<?php $seqs = $objTables->getSequences();reset($seqs);$seq = current($seqs);?>
+<?php if (1 == count($objTables->getSequences())) : ?>
+<?php if (strpos($this->config->driver, 'pgsql')): ?>
+<?php $seqs = $objTables->getSequences(); reset($seqs); $seq = current($seqs); ?>
     protected $_sequence = '<?=$seq->getSequence() ?>';
 <?php else: ?>
     protected $_sequence = true;

build/Classes/templates/zf1/dbtable_abstract.php

Spacing +6 added lines, -6 removed lines

@@ -3,17 +3,17 @@ 
 /**
  * Application Model DbTables
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * Classe Abstract pai de todas as tabelas
  *
  * @package   <?=$this->config->namespace?>Model
  * @subpackage DbTable
- * @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"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  *
  * @abstract
  */
@@ -22,7 +22,7 @@ 
  * Zend DB Table Abstract class
  */
 
-abstract class <?=$this->config->namespace?$this->config->namespace."_":""?>Model_TableAbstract extends Zend_Db_Table_Abstract
+abstract class <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_TableAbstract extends Zend_Db_Table_Abstract
 {
     /**
      * Nome da tabela do banco de dados

build/Classes/templates/zf1/entity_abstract.php

Spacing +7 added lines, -7 removed lines

@@ -3,18 +3,18 @@ 
 /**
  * Application Entity
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * @package   <?=$this->config->namespace?>Model
  * @subpackage Model
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  */
 
-abstract class <?=$this->config->namespace?$this->config->namespace."_":""?>Model_EntityAbstract extends Zend_Db_Table_Row_Abstract
+abstract class <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_EntityAbstract extends Zend_Db_Table_Row_Abstract
 {
 
     /**
@@ -74,7 +74,7 @@ 
 
     /**
     * @param array $data
-    * @return <?=$this->config->namespace?$this->config->namespace."_":""?>>Model_EntityAbstract
+    * @return <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>>Model_EntityAbstract
     */
     public static function getIntance($data = array())
     {

build/Classes/templates/phalcon/model.php

Spacing +7 added lines, -7 removed lines

@@ -3,21 +3,21 @@
 /**
  * Data Model implementation for this class
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
- * @see  <?=$objTables->getNamespace()?>\<?=$this->getClassName ( $objTables->getName () ). "\n"?>
+ * @see  <?=$objTables->getNamespace()?>\<?=$this->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"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  */
 
 
 namespace <?=$objTables->getNamespace()?>;
 
-class <?=$this->getClassName ( $objTables->getName () )?> extends \<?=$objTables->getNamespace()?>\Entity\<?=$this->getClassName ( $objTables->getName () ). "\n"?>
+class <?=$this->getClassName($objTables->getName())?> extends \<?=$objTables->getNamespace()?>\Entity\<?=$this->getClassName($objTables->getName()) . "\n"?>
 {
      /* Codifique aqui */
 }

build/Classes/templates/phalcon/entity.php

Spacing +28 added lines, -28 removed lines

@@ -3,42 +3,42 @@ 
 /**
  * Mvc Model
  *
- * <?=$this->config->last_modify."\n"?>
+ * <?=$this->config->last_modify . "\n"?>
  *
  * @package   <?=$objTables->getNamespace()?>\Entity
  * @subpackage Model
- * @author    <?=$this->config->author."\n"?>
+ * @author    <?=$this->config->author . "\n"?>
  *
- * @copyright <?=$this->config->copyright."\n"?>
- * @license   <?=$this->config->license."\n"?>
- * @link      <?=$this->config->link."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
  */
 
 namespace  <?=$objTables->getNamespace()?>\Entity;
 
 use Phalcon\Validation;
 
-abstract class <?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?> extends \Phalcon\Mvc\Model
+abstract class <?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?> extends \Phalcon\Mvc\Model
 {
 
 <?php foreach ($objTables->getColumns() as $column): ?>
     /**
-    * column <?=$column->getName()."\n"?>
+    * column <?=$column->getName() . "\n"?>
     *
-<?php if($column->isPrimaryKey()):?>
+<?php if ($column->isPrimaryKey()):?>
     * @Primary
 <?php endif ?>
-<?php if($column->hasSequence()):?>
+<?php if ($column->hasSequence()):?>
     * @Identity
 <?php endif ?>
-    * @Column(type="<?=$column->getType()?>", nullable=<?=$column->isNullable () ? "true" : "false"?><?php
-if ( $column->getMaxLength () ): ?>
-, length=<?=$column->getMaxLength ()?>
+    * @Column(type="<?=$column->getType()?>", nullable=<?=$column->isNullable() ? "true" : "false"?><?php
+if ($column->getMaxLength()): ?>
+, length=<?=$column->getMaxLength()?>
 <?php endif ?>)
     */
     protected $<?=$column->getName()?>;
 
-<?php endforeach;?>
+<?php endforeach; ?>
     /**
      * Validations and business logic
      *
@@ -49,14 +49,14 @@ 
         $validator = new Validation();
 
 <?php foreach ($objTables->getColumns() as $column): ?>
-<?php if(strtolower($column->getName()) == 'email'):?>
+<?php if (strtolower($column->getName()) == 'email'):?>
         $validator->add(
             'email',
             new \Phalcon\Validation\Validator\Email()
         );
 
 <?php endif ?>
-<?php endforeach;?>
+<?php endforeach; ?>
         return $this->validate($validator);
     }
 
@@ -65,11 +65,11 @@ 
      */
     public function initialize()
     {
-        <?=$mapDependents."\n"?>
-        <?=$mapParents."\n"?>
+        <?=$mapDependents . "\n"?>
+        <?=$mapParents . "\n"?>
     }
 
-<?php if($objTables->hasSchema()): ?>
+<?php if ($objTables->hasSchema()): ?>
     /**
      * Returns schema name where table mapped is located
      *
@@ -91,11 +91,11 @@ 
         return '<?=$objTables->getName()?>';
     }
 
-<?php if( $objTables->hasSequences() ) : ?>
+<?php if ($objTables->hasSequences()) : ?>
     public function getSequenceName()
     {
-<?php if ( 1 ==  count($objTables->getSequences() ) ) : ?>
-    <?php $seqs = $objTables->getSequences();reset($seqs);$seq = current($seqs);?>
+<?php if (1 == count($objTables->getSequences())) : ?>
+    <?php $seqs = $objTables->getSequences(); reset($seqs); $seq = current($seqs); ?>
         return "<?=$seq->getSequence() ?>";
 <?php endif ?>
     }
@@ -105,7 +105,7 @@ 
      * Allows to query a set of records that match the specified conditions
      *
      * @param mixed $parameters
-     * @return \<?=$objTables->getNamespace()?>\<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )?>[]
+     * @return \<?=$objTables->getNamespace()?>\<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName())?>[]
      */
     public static function find($parameters = null)
     {
@@ -116,7 +116,7 @@ 
      * Allows to query the first record that match the specified conditions
      *
      * @param mixed $parameters
-     * @return \<?=$objTables->getNamespace()?>\<?=\Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () )."\n"?>
+     * @return \<?=$objTables->getNamespace()?>\<?=\Classes\Maker\AbstractMaker::getClassName($objTables->getName()) . "\n"?>
      */
     public static function findFirst($parameters = null)
     {
@@ -125,17 +125,17 @@ 
 
 
 <?php foreach ($objTables->getColumns() as $column): ?>
-    public function set<?=$this->getClassName ( $column->getName () )?>( $<?=$column->getName()?> )
+    public function set<?=$this->getClassName($column->getName())?>( $<?=$column->getName()?> )
     {
         $this-><?=$column->getName()?> = $<?=$column->getName()?>;
     }
 
     /**
-    * @return <?=$column->getType ()."\n" ?>
+    * @return <?=$column->getType() . "\n" ?>
     **/
-    public function get<?=$this->getClassName ( $column->getName () )?>()
+    public function get<?=$this->getClassName($column->getName())?>()
     {
-        return (<?=$column->getType () ?>) $this-><?=$column->getName()?>;
+        return (<?=$column->getType() ?>) $this-><?=$column->getName()?>;
     }
-<?php endforeach;?>
+<?php endforeach; ?>
 }
\ No newline at end of file

build/Classes/Config.php

Spacing +61 added lines, -61 removed lines

@@ -52,7 +52,7 @@ 
     /**
      * @var array
      */
-    private $argv = array ();
+    private $argv = array();
 
     /**
      * @var \Classes\AdapterConfig\AbstractAdapter
@@ -64,22 +64,22 @@ 
      */
     private $adapterDriver;
 
-    private $frameworkList = array (
+    private $frameworkList = array(
         'none',
         'zf1',
         'phalcon'
     );
 
-    public function __construct ( $argv, $basePath )
+    public function __construct($argv, $basePath)
     {
-        if ( array_key_exists ( 'help', $argv ) ) {
-            die ( $this->getUsage () );
+        if (array_key_exists('help', $argv)) {
+            die ($this->getUsage());
         }
-        if ( array_key_exists ( 'status', $argv ) ) {
-            $argv[ 'status' ] = true;
+        if (array_key_exists('status', $argv)) {
+            $argv['status'] = true;
         }
 
-        $this->argv = $this->parseConfig ( $basePath, $argv );
+        $this->argv = $this->parseConfig($basePath, $argv);
     }
 
     /**
@@ -87,9 +87,9 @@ 
      *
      * @return string
      */
-    public function getUsage ()
+    public function getUsage()
     {
-        $version = $this->getVersion ();
+        $version = $this->getVersion();
 
         return <<<EOF
 parameters:
@@ -112,7 +112,7 @@ 
 EOF;
     }
 
-    public function getVersion ()
+    public function getVersion()
     {
         $version = static::$version;
 
@@ -128,28 +128,28 @@ 
      * @return array
      * @throws \Exception
      */
-    private function parseConfig ( $basePath, $argv )
+    private function parseConfig($basePath, $argv)
     {
-        $this->_basePath = dirname ( $basePath );
+        $this->_basePath = dirname($basePath);
 
-        $configIni = isset( $argv[ 'config-ini' ] )
-            ? $argv[ 'config-ini' ]
+        $configIni = isset($argv['config-ini'])
+            ? $argv['config-ini']
             : $this->_basePath
               . $this->configIniDefault;
 
-        $configTemp    = $this->loadIniFile ( realpath ( $configIni ) );
-        $configCurrent = self::parseConfigEnv ( $configTemp, $argv );
+        $configTemp    = $this->loadIniFile(realpath($configIni));
+        $configCurrent = self::parseConfigEnv($configTemp, $argv);
 
-        if ( !isset( $configCurrent[ 'framework' ] ) ) {
-            throw new \Exception( "configure which framework you want to use! \n" );
+        if ( ! isset($configCurrent['framework'])) {
+            throw new \Exception("configure which framework you want to use! \n");
         }
 
-        if ( !in_array ( $configCurrent[ 'framework' ], $this->frameworkList ) ) {
-            $frameworks = implode ( "\n\t", $this->frameworkList );
-            throw new \Exception( "list of frameworks: \n\t\033[1;33m" . $frameworks . "\n\033[0m" );
+        if ( ! in_array($configCurrent['framework'], $this->frameworkList)) {
+            $frameworks = implode("\n\t", $this->frameworkList);
+            throw new \Exception("list of frameworks: \n\t\033[1;33m" . $frameworks . "\n\033[0m");
         }
 
-        return $argv + array_filter ( $configCurrent );
+        return $argv + array_filter($configCurrent);
     }
 
     /**
@@ -159,20 +159,20 @@ 
      *
      * @return string
      */
-    private static function parseConfigEnv ( $configTemp, $argv )
+    private static function parseConfigEnv($configTemp, $argv)
     {
-        $thisSection = isset( $configTemp[ key ( $configTemp ) ][ 'config-env' ] ) ? $configTemp[ key (
+        $thisSection = isset($configTemp[key($configTemp)]['config-env']) ? $configTemp[key(
             $configTemp
-        ) ][ 'config-env' ] : null;
+        )]['config-env'] : null;
 
-        $thisSection = isset( $argv[ 'config-env' ] ) ? $argv[ 'config-env' ] : $thisSection;
+        $thisSection = isset($argv['config-env']) ? $argv['config-env'] : $thisSection;
 
-        if ( isset( $configTemp[ $thisSection ][ 'extends' ] ) ) {
+        if (isset($configTemp[$thisSection]['extends'])) {
             #faz marge da config principal com a config extendida
-            return $configTemp[ $thisSection ] + $configTemp[ $configTemp[ $thisSection ][ 'extends' ] ];
+            return $configTemp[$thisSection] + $configTemp[$configTemp[$thisSection]['extends']];
         }
 
-        return $configTemp[ key ( $configTemp ) ];
+        return $configTemp[key($configTemp)];
     }
 
     /**
@@ -186,29 +186,29 @@ 
      * @throws \Exception
      * @return array
      */
-    protected function loadIniFile ( $filename )
+    protected function loadIniFile($filename)
     {
-        if ( !is_file ( $filename ) ) {
-            throw new \Exception( "configuration file does not exist! \n" );
+        if ( ! is_file($filename)) {
+            throw new \Exception("configuration file does not exist! \n");
         }
 
-        $loaded   = parse_ini_file ( $filename, true );
-        $iniArray = array ();
-        foreach ( $loaded as $key => $data ) {
-            $pieces      = explode ( $this->sectionSeparator, $key );
-            $thisSection = trim ( $pieces[ 0 ] );
-            switch ( count ( $pieces ) ) {
+        $loaded   = parse_ini_file($filename, true);
+        $iniArray = array();
+        foreach ($loaded as $key => $data) {
+            $pieces      = explode($this->sectionSeparator, $key);
+            $thisSection = trim($pieces[0]);
+            switch (count($pieces)) {
                 case 1:
-                    $iniArray[ $thisSection ] = $data;
+                    $iniArray[$thisSection] = $data;
                     break;
 
                 case 2:
-                    $extendedSection          = trim ( $pieces[ 1 ] );
-                    $iniArray[ $thisSection ] = array_merge ( array ( 'extends' => $extendedSection ), $data );
+                    $extendedSection          = trim($pieces[1]);
+                    $iniArray[$thisSection] = array_merge(array('extends' => $extendedSection), $data);
                     break;
 
                 default:
-                    throw new \Exception( "Section '$thisSection' may not extend multiple sections in $filename" );
+                    throw new \Exception("Section '$thisSection' may not extend multiple sections in $filename");
             }
         }
 
@@ -221,15 +221,15 @@ 
      * @return \Classes\AdapterConfig\AbstractAdapter
      *
      */
-    private function factoryConfig ()
+    private function factoryConfig()
     {
-        switch ( strtolower ( $this->argv[ 'framework' ] ) ) {
+        switch (strtolower($this->argv['framework'])) {
             case 'zf1':
-                return new ZendFrameworkOne( $this->argv );
+                return new ZendFrameworkOne($this->argv);
             case 'phalcon':
-                return new Phalcon( $this->argv );
+                return new Phalcon($this->argv);
             default:
-                return new None( $this->argv );
+                return new None($this->argv);
         }
 
     }
@@ -241,31 +241,31 @@ 
      *
      * @return AdaptersDriver\AbsractAdapter
      */
-    private function factoryDriver ( AdapterConfig\AbstractAdapter $config )
+    private function factoryDriver(AdapterConfig\AbstractAdapter $config)
     {
-        switch ( $this->argv[ 'driver' ] ) {
+        switch ($this->argv['driver']) {
             case 'pgsql':
             case 'pdo_pgsql':
-                return new Pgsql( $config );
+                return new Pgsql($config);
             case 'mysql':
             case 'pdo_mysql':
-                return new Mysql( $config );
+                return new Mysql($config);
             case 'mssql':
-                return new Mssql( $config );
+                return new Mssql($config);
             case 'dblib':
-                return new Dblib( $config );
+                return new Dblib($config);
             case 'sqlsrv':
-                return new Sqlsrv( $config );
+                return new Sqlsrv($config);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getAdapterConfig ()
+    public function getAdapterConfig()
     {
-        if ( !$this->adapterConfig instanceof AbstractAdapter ) {
-            $this->adapterConfig = $this->factoryConfig ();
+        if ( ! $this->adapterConfig instanceof AbstractAdapter) {
+            $this->adapterConfig = $this->factoryConfig();
         }
 
         return $this->adapterConfig;
@@ -274,10 +274,10 @@ 
     /**
      * @return AdaptersDriver\AbsractAdapter
      */
-    public function getAdapterDriver ( AdapterConfig\AbstractAdapter $config )
+    public function getAdapterDriver(AdapterConfig\AbstractAdapter $config)
     {
-        if ( !$this->adapterDriver ) {
-            $this->adapterDriver = $this->factoryDriver ( $config );
+        if ( ! $this->adapterDriver) {
+            $this->adapterDriver = $this->factoryDriver($config);
         }
 
         return $this->adapterDriver;

build/Classes/AdapterConfig/AbstractAdapter.php

Spacing +93 added lines, -93 removed lines

@@ -14,7 +14,7 @@ 
 abstract class AbstractAdapter
 {
 
-    protected $arrConfig = array (
+    protected $arrConfig = array(
         ############################# DATABASE
         //Driver do banco de dados
         'driver'   => null,
@@ -29,7 +29,7 @@ 
         //senha do banco
         'password' => null,
         // lista de schemas do banco de dados
-        'schema'   => array (),
+        'schema'   => array(),
 
         'socket'          => null,
 
@@ -61,13 +61,13 @@ 
         // flags para criar todas as tabelas ou nao
         'allTables'       => true,
         //Lista de tabelas a serem ignoradas
-        'ignoreTable'     => array (),
+        'ignoreTable'     => array(),
     );
 
     /**
      * @var string[] um array com todos os campos obrigatorios
      */
-    protected $attRequered = array (
+    protected $attRequered = array(
         'driver'   => true,
         'database' => true,
         'host'     => true,
@@ -75,11 +75,11 @@ 
         'path'     => true
     );
 
-    protected $arrFunc = array ();
+    protected $arrFunc = array();
 
-    private $framworkFiles = array ();
+    private $framworkFiles = array();
 
-    public $reservedWord = array ();
+    public $reservedWord = array();
 
     const SEPARETOR = "";
 
@@ -88,9 +88,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;
         }
 
@@ -102,33 +102,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'
         );
     }
@@ -139,47 +139,47 @@ 
      * @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 () ) {
-            $arrNames[] = $this->replaceReservedWord ( AbstractMaker::getClassName ( $table->getSchema () ) );
+        if ($table->hasSchema()) {
+            $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)
     {
-        $array += array (
-            'author'      => ucfirst ( get_current_user () ),
-            'last_modify' => date ( "d-m-Y H:i:s." )
+        $array += array(
+            '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 ();
-        if ( !$this->isValid () ) {
-            $var = array_diff_key ( $this->attRequered, array_filter ( $this->arrConfig ) );
-            throw new Exception( $var );
+        $this->setFrameworkFiles($array);
+        $this->parseFrameworkConfig();
+        $this->setParams($this->getParams());
+        $this->setParams($array);
+        $this->init();
+        if ( ! $this->isValid()) {
+            $var = array_diff_key($this->attRequered, array_filter($this->arrConfig));
+            throw new Exception($var);
         }
     }
 
@@ -188,36 +188,36 @@ 
      *
      * @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 (
+        set_include_path(
+            implode(
                 PATH_SEPARATOR,
-                array (
-                    realpath ( $this->framworkFiles[ 'library' ] ),
-                    get_include_path (),
+                array(
+                    realpath($this->framworkFiles['library']),
+                    get_include_path(),
                 )
             )
         );
@@ -225,110 +225,110 @@ 
         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 ) {
-            $this->arrConfig = array_filter ( $array ) + $this->arrConfig;
+        if (count($array) > 0) {
+            $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' ] ) ) {
-            return array ( $this->arrConfig[ 'schema' ] );
+        if (is_string($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'];
     }
 
     /**
@@ -336,10 +336,10 @@ 
      *
      * @return string
      */
-    public function replaceReservedWord ( $palavra )
+    public function replaceReservedWord($palavra)
     {
-        if ( isset( $this->reservedWord[ strtolower ( $palavra ) ] ) ) {
-            return $this->reservedWord[ strtolower ( $palavra ) ];
+        if (isset($this->reservedWord[strtolower($palavra)])) {
+            return $this->reservedWord[strtolower($palavra)];
         }
 
         return $palavra;
@@ -348,9 +348,9 @@ 
     /**
      * @return bool
      */
-    public function isStatusEnabled ()
+    public function isStatusEnabled()
     {
-        return (bool) $this->arrConfig[ 'status' ];
+        return (bool) $this->arrConfig['status'];
     }
 
     /**
@@ -358,9 +358,9 @@ 
      *
      * @return string
      */
-    public function __get ( $str )
+    public function __get($str)
     {
-        $arr = array (
+        $arr = array(
             'namespace',
             'framework',
             'author',
@@ -373,8 +373,8 @@ 
             'folder-name'
         );
 
-        if ( in_array ( $str, $arr ) ) {
-            return $this->arrConfig[ strtolower ( $str ) ];
+        if (in_array($str, $arr)) {
+            return $this->arrConfig[strtolower($str)];
         }
 
         return;