pedro151 / orm-generator

build/Classes/Config.php

Indentation +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
         $configIni = isset( $argv[ 'name-ini' ] )
             ? $argv[ 'name-ini' ]
             : $this->_basePath
-              . $this->configIniDefault;
+                . $this->configIniDefault;
 
         $configTemp = $this->loadIniFile ( realpath ( $configIni ) );
         $configCurrent = self::parseConfigEnv ( $configTemp , $argv );
@@ -206,7 +206,7 @@ 
         {
             $frameworks = implode ( "\n\t" , $this->frameworkList );
             throw new \Exception( "list of frameworks: \n\t\033[1;33m" . $frameworks
-                                  . "\n\033[0m" );
+                                    . "\n\033[0m" );
         }
 
         return $argv + array_filter ( $configCurrent );

Spacing +96 added lines, -96 removed lines

@@ -52,7 +52,7 @@ 
     /**
      * @var array
      */
-    private $argv = array ();
+    private $argv = array();
 
     /**
      * @var \Classes\AdapterConfig\AbstractAdapter
@@ -64,46 +64,46 @@ 
      */
     private $adapterDriver;
 
-    private $frameworkList = array (
-        'none' ,
-        'zf1' ,
+    private $frameworkList = array(
+        'none',
+        'zf1',
         'phalcon'
     );
 
-    private $parameterList = array (
-        'init'        => 'Creates the necessary configuration file to start using the orm-generator.' ,
-        'name-ini'  => 'reference to another .ini file configuration (relative path).' ,
-        'config-env'  => 'orm-generator configuration environment.' ,
-        'framework'   => 'name framework used, which has the contents of the database configurations and framework template.' ,
-        'driver'      => 'database driver name (Ex.: pgsql).' ,
-        'database'    => 'database name.' ,
-        'schema'      => 'database schema name (one or more than one).' ,
-        'tables'      => 'table name (parameter can be used more then once).' ,
-        'clean-trash' => 'delete all files that do not belong to your Database due' ,
-        'status'      => 'show status of implementation carried out after completing the process.' ,
-        'version'     => 'shows the version of orm-generator.' ,
-        'help'        => "help command explaining all the options and manner of use." ,
-        'path'        => "specify where to create the files (default is current directory)." ,
+    private $parameterList = array(
+        'init'        => 'Creates the necessary configuration file to start using the orm-generator.',
+        'name-ini'  => 'reference to another .ini file configuration (relative path).',
+        'config-env'  => 'orm-generator configuration environment.',
+        'framework'   => 'name framework used, which has the contents of the database configurations and framework template.',
+        'driver'      => 'database driver name (Ex.: pgsql).',
+        'database'    => 'database name.',
+        'schema'      => 'database schema name (one or more than one).',
+        'tables'      => 'table name (parameter can be used more then once).',
+        'clean-trash' => 'delete all files that do not belong to your Database due',
+        'status'      => 'show status of implementation carried out after completing the process.',
+        'version'     => 'shows the version of orm-generator.',
+        'help'        => "help command explaining all the options and manner of use.",
+        'path'        => "specify where to create the files (default is current directory).",
     );
 
-    public function __construct ( $argv , $basePath , $numArgs )
+    public function __construct($argv, $basePath, $numArgs)
     {
-        if ( array_key_exists ( 'help' , $argv ) or ( $numArgs > 1
-                                                      && count ( $argv ) < 1 )
+        if (array_key_exists('help', $argv) or ($numArgs > 1
+                                                      && count($argv) < 1)
         )
         {
-            die ( $this->getUsage () );
+            die ($this->getUsage());
         }
-        if ( array_key_exists ( 'version' , $argv ) )
+        if (array_key_exists('version', $argv))
         {
-            die ( $this->getVersion () );
+            die ($this->getVersion());
         }
-        if ( array_key_exists ( 'status' , $argv ) )
+        if (array_key_exists('status', $argv))
         {
-            $argv[ 'status' ] = true;
+            $argv['status'] = true;
         }
 
-        $this->argv = $this->parseConfig ( $basePath , $argv );
+        $this->argv = $this->parseConfig($basePath, $argv);
     }
 
     /**
@@ -111,10 +111,10 @@ 
      *
      * @return string
      */
-    public function getUsage ()
+    public function getUsage()
     {
-        $version = $this->getVersion ();
-        $list = $this->renderParam ();
+        $version = $this->getVersion();
+        $list = $this->renderParam();
 
         return <<<EOF
 parameters:
@@ -125,12 +125,12 @@ 
 EOF;
     }
 
-    public function renderParam ()
+    public function renderParam()
     {
         $return = "";
-        foreach ( $this->parameterList as $param => $desc )
+        foreach ($this->parameterList as $param => $desc)
         {
-            if ( strlen ( $param ) < 5 )
+            if (strlen($param) < 5)
             {
                 $return .= "\t--" . $param . "\t\t: " . $desc . "\n";
             } else
@@ -143,37 +143,37 @@ 
         return $return;
     }
 
-    public function checkHasNewVersion ()
+    public function checkHasNewVersion()
     {
-        if ( ! ini_get ( 'file_get_contents' ) )
+        if ( ! ini_get('file_get_contents'))
         {
             return;
         }
 
-        $opts = array (
-            'http' => array (
-                'method' => 'GET' ,
-                'header' => array (
+        $opts = array(
+            'http' => array(
+                'method' => 'GET',
+                'header' => array(
                     'User-Agent: PHP'
                 )
             )
         );
         $context = stream_context_create($opts);
-        $tags = json_decode ( file_get_contents ( "https://api.github.com/repos/pedro151/orm-generator/tags" , false, $context) );
+        $tags = json_decode(file_get_contents("https://api.github.com/repos/pedro151/orm-generator/tags", false, $context));
 
 
-        $lastVersion = preg_replace("/[^0-9.]/", "", $tags[ 0 ]->name);
-        if ( $lastVersion > static::$version )
+        $lastVersion = preg_replace("/[^0-9.]/", "", $tags[0]->name);
+        if ($lastVersion > static::$version)
         {
             return "\033[0;31mThere is a new version $lastVersion available:\033[0m https://github.com/pedro151/orm-generator\n";
         }
     }
 
-    public function getVersion ()
+    public function getVersion()
     {
         $version = static::$version;
 
-        return "ORM Generator By: Pedro Alarcao Version: $version\n".$this->checkHasNewVersion();
+        return "ORM Generator By: Pedro Alarcao Version: $version\n" . $this->checkHasNewVersion();
     }
 
     /**
@@ -185,31 +185,31 @@ 
      * @return array
      * @throws \Exception
      */
-    private function parseConfig ( $basePath , $argv )
+    private function parseConfig($basePath, $argv)
     {
         $this->_basePath = $basePath;
 
-        $configIni = isset( $argv[ 'name-ini' ] )
-            ? $argv[ 'name-ini' ]
+        $configIni = isset($argv['name-ini'])
+            ? $argv['name-ini']
             : $this->_basePath
               . $this->configIniDefault;
 
-        $configTemp = $this->loadIniFile ( realpath ( $configIni ) );
-        $configCurrent = self::parseConfigEnv ( $configTemp , $argv );
+        $configTemp = $this->loadIniFile(realpath($configIni));
+        $configCurrent = self::parseConfigEnv($configTemp, $argv);
 
-        if ( ! isset( $configCurrent[ 'framework' ] ) )
+        if ( ! isset($configCurrent['framework']))
         {
-            throw new \Exception( "configure which framework you want to use! \n" );
+            throw new \Exception("configure which framework you want to use! \n");
         }
 
-        if ( ! in_array ( $configCurrent[ 'framework' ] , $this->frameworkList ) )
+        if ( ! in_array($configCurrent['framework'], $this->frameworkList))
         {
-            $frameworks = implode ( "\n\t" , $this->frameworkList );
-            throw new \Exception( "list of frameworks: \n\t\033[1;33m" . $frameworks
-                                  . "\n\033[0m" );
+            $frameworks = implode("\n\t", $this->frameworkList);
+            throw new \Exception("list of frameworks: \n\t\033[1;33m" . $frameworks
+                                  . "\n\033[0m");
         }
 
-        return $argv + array_filter ( $configCurrent );
+        return $argv + array_filter($configCurrent);
     }
 
     /**
@@ -219,24 +219,24 @@ 
      *
      * @return string
      */
-    private static function parseConfigEnv ( $configTemp , $argv )
+    private static function parseConfigEnv($configTemp, $argv)
     {
-        $thisSection = isset( $configTemp[ key ( $configTemp ) ][ 'config-env' ] )
-            ? $configTemp[ key (
+        $thisSection = isset($configTemp[key($configTemp)]['config-env'])
+            ? $configTemp[key(
                 $configTemp
-            ) ][ 'config-env' ] : null;
+            )]['config-env'] : null;
 
-        $thisSection = isset( $argv[ 'config-env' ] ) ? $argv[ 'config-env' ]
+        $thisSection = isset($argv['config-env']) ? $argv['config-env']
             : $thisSection;
 
-        if ( isset( $configTemp[ $thisSection ][ 'extends' ] ) )
+        if (isset($configTemp[$thisSection]['extends']))
         {
             #faz marge da config principal com a config extendida
-            return $configTemp[ $thisSection ]
-                   + $configTemp[ $configTemp[ $thisSection ][ 'extends' ] ];
+            return $configTemp[$thisSection]
+                   + $configTemp[$configTemp[$thisSection]['extends']];
         }
 
-        return $configTemp[ key ( $configTemp ) ];
+        return $configTemp[key($configTemp)];
     }
 
     /**
@@ -250,32 +250,32 @@ 
      * @throws \Exception
      * @return array
      */
-    protected function loadIniFile ( $filename )
+    protected function loadIniFile($filename)
     {
-        if ( ! is_file ( $filename ) )
+        if ( ! is_file($filename))
         {
-            throw new \Exception( "\033[0;31mError: configuration file does not exist! \033[0m\n" );
+            throw new \Exception("\033[0;31mError: configuration file does not exist! \033[0m\n");
         }
 
-        $loaded = parse_ini_file ( $filename , true );
-        $iniArray = array ();
-        foreach ( $loaded as $key => $data )
+        $loaded = parse_ini_file($filename, true);
+        $iniArray = array();
+        foreach ($loaded as $key => $data)
         {
-            $pieces = explode ( $this->sectionSeparator , $key );
-            $thisSection = trim ( $pieces[ 0 ] );
-            switch ( count ( $pieces ) )
+            $pieces = explode($this->sectionSeparator, $key);
+            $thisSection = trim($pieces[0]);
+            switch (count($pieces))
             {
                 case 1:
-                    $iniArray[ $thisSection ] = $data;
+                    $iniArray[$thisSection] = $data;
                     break;
 
                 case 2:
-                    $extendedSection = trim ( $pieces[ 1 ] );
-                    $iniArray[ $thisSection ] = array_merge ( array ( 'extends' => $extendedSection ) , $data );
+                    $extendedSection = trim($pieces[1]);
+                    $iniArray[$thisSection] = array_merge(array('extends' => $extendedSection), $data);
                     break;
 
                 default:
-                    throw new \Exception( "Section '$thisSection' may not extend multiple sections in $filename" );
+                    throw new \Exception("Section '$thisSection' may not extend multiple sections in $filename");
             }
         }
 
@@ -288,16 +288,16 @@ 
      * @return \Classes\AdapterConfig\AbstractAdapter
      *
      */
-    private function factoryConfig ()
+    private function factoryConfig()
     {
-        switch ( strtolower ( $this->argv[ 'framework' ] ) )
+        switch (strtolower($this->argv['framework']))
         {
             case 'zf1':
-                return new ZendFrameworkOne( $this->argv );
+                return new ZendFrameworkOne($this->argv);
             case 'phalcon':
-                return new Phalcon( $this->argv );
+                return new Phalcon($this->argv);
             default:
-                return new None( $this->argv );
+                return new None($this->argv);
         }
 
     }
@@ -309,33 +309,33 @@ 
      *
      * @return AdaptersDriver\AbsractAdapter
      */
-    private function factoryDriver ( AdapterConfig\AbstractAdapter $config )
+    private function factoryDriver(AdapterConfig\AbstractAdapter $config)
     {
-        switch ( $this->argv[ 'driver' ] )
+        switch ($this->argv['driver'])
         {
             case 'pgsql':
             case 'pdo_pgsql':
-                return new Pgsql( $config );
+                return new Pgsql($config);
             case 'mysql':
             case 'pdo_mysql':
-                return new Mysql( $config );
+                return new Mysql($config);
             case 'mssql':
-                return new Mssql( $config );
+                return new Mssql($config);
             case 'dblib':
-                return new Dblib( $config );
+                return new Dblib($config);
             case 'sqlsrv':
-                return new Sqlsrv( $config );
+                return new Sqlsrv($config);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getAdapterConfig ()
+    public function getAdapterConfig()
     {
-        if ( ! $this->adapterConfig instanceof AbstractAdapter )
+        if ( ! $this->adapterConfig instanceof AbstractAdapter)
         {
-            $this->adapterConfig = $this->factoryConfig ();
+            $this->adapterConfig = $this->factoryConfig();
         }
 
         return $this->adapterConfig;
@@ -344,11 +344,11 @@ 
     /**
      * @return AdaptersDriver\AbsractAdapter
      */
-    public function getAdapterDriver ( AdapterConfig\AbstractAdapter $config )
+    public function getAdapterDriver(AdapterConfig\AbstractAdapter $config)
     {
-        if ( ! $this->adapterDriver )
+        if ( ! $this->adapterDriver)
         {
-            $this->adapterDriver = $this->factoryDriver ( $config );
+            $this->adapterDriver = $this->factoryDriver($config);
         }
 
         return $this->adapterDriver;

build/Classes/templates/zf1/entity.php

Spacing +88 added lines, -88 removed lines

@@ -1,7 +1,7 @@ 
 <?= "<?php\n" ?>
-<?php $classNameModel = $objTables->getNamespace () . '_' . \Classes\Maker\AbstractMaker::getClassName ( $objTables->getName () ) ?>
-<?php $className = $objTables->getNamespace () . '_Entity_' . \Classes\Maker\AbstractMaker::getClassName (
-        $objTables->getName ()
+<?php $classNameModel = $objTables->getNamespace() . '_' . \Classes\Maker\AbstractMaker::getClassName($objTables->getName()) ?>
+<?php $className = $objTables->getNamespace() . '_Entity_' . \Classes\Maker\AbstractMaker::getClassName(
+        $objTables->getName()
     ) ?>
 
 /**
@@ -9,7 +9,7 @@ 
  *
  * <?= $this->config->last_modify . "\n" ?>
  *
- * @package <?= $objTables->getNamespace () . "\n" ?>
+ * @package <?= $objTables->getNamespace() . "\n" ?>
  * @subpackage Entity
  *
  * @author    <?= $this->config->author . "\n" ?>
@@ -25,16 +25,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; ?>
 
     /**
@@ -43,17 +43,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; ?>
     );
@@ -62,10 +62,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 ( strtolower ( $column->getType () ) ) {
+    switch (strtolower($column->getType())) {
         case 'string':
             $filters = 'StripTags", "StringTrim';
             break;
@@ -77,12 +77,12 @@ 
         case 'boolean':
             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; ?>
     );
@@ -91,34 +91,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 ( strtolower ( $column->getType () ) ) {
+    switch (strtolower($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
     *
@@ -126,39 +126,39 @@ 
     * @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; ?>
 
     /**
      * @param int $primarykey
      *
-     * @return <?=$classNameModel."\n"?>
+     * @return <?=$classNameModel . "\n"?>
      */
     public function find ( $primarykey )
     {
@@ -176,53 +176,53 @@ 
        return <?=$classNameModel?>::retrieveAll ( $where , $order , $count , $offset );
     }
 
-<?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 ( strtolower( $column->getType () ) ):
+<?php switch (strtolower($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;
         default: ?>
-<?php if(!$column->isNullable () && strtolower( $column->getType () ) != 'boolean'):?>
-            $<?= $column->getName () ?> = (<?= ucfirst ( $column->getType () ) ?>) $<?= $column->getName () ?> ;
+<?php if ( ! $column->isNullable() && strtolower($column->getType()) != 'boolean'):?>
+            $<?= $column->getName() ?> = (<?= ucfirst($column->getType()) ?>) $<?= $column->getName() ?> ;
 <?php endif ?>
-            $input = new Zend_Filter_Input($this->_filters, $this->_validators, array('<?= $column->getName (
-            ) ?>'=>$<?= $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 ?>
@@ -230,71 +230,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/AdaptersDriver/AbsractAdapter.php

Indentation +36 added lines, -36 removed lines

@@ -115,32 +115,32 @@ 
             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
-                                             )
-                                         );
+                                            ->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' ] )
                 {
                     case "FOREIGN KEY":
                         $table->getColumn ( $constrant[ "column_name" ] )
-                              ->addRefFk ( $objConstrant );
+                                ->addRefFk ( $objConstrant );
                         break;
                     case"PRIMARY KEY":
                         $table->getColumn ( $constrant[ "column_name" ] )
-                              ->setPrimaryKey ( $objConstrant )
-                              ->setSequence (
-                                  $this->getSequence (
-                                      $table_name ,
-                                      $constrant[ "column_name" ] ,
-                                      $schema
-                                  )
-                              );
+                                ->setPrimaryKey ( $objConstrant )
+                                ->setSequence (
+                                    $this->getSequence (
+                                        $table_name ,
+                                        $constrant[ "column_name" ] ,
+                                        $schema
+                                    )
+                                );
                         break;
                 }
             }
@@ -160,13 +160,13 @@ 
             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' ]
-                      );
+                        ->createDependece (
+                            $constrant[ 'constraint_name' ] ,
+                            $constrant[ 'table_name' ] ,
+                            $constrant[ 'column_name' ] ,
+                            $this->database ,
+                            $constrant[ 'table_schema' ]
+                        );
             }
         }
     }
@@ -201,10 +201,10 @@ 
                             );
 
             $this->getTable ( $key , $schema )
-                 ->addColumn ( $column )
-                 ->setNamespace (
-                     $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
-                 );
+                    ->addColumn ( $column )
+                    ->setNamespace (
+                        $this->config->createClassNamespace ( $this->getTable ( $key , $schema ) )
+                    );
         }
     }
 
@@ -279,13 +279,13 @@ 
         }
 
         $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
-                                                                              'table'    => $nameTable ,
-                                                                              'schema'   => $schema ,
-                                                                              'database' => $this->database
-                                                                          )
-                                                                      );
+                                                                        ->populate (
+                                                                            array (
+                                                                                'table'    => $nameTable ,
+                                                                                'schema'   => $schema ,
+                                                                                'database' => $this->database
+                                                                            )
+                                                                        );
 
         return $this;
     }

Spacing +115 added lines, -115 removed lines

@@ -67,7 +67,7 @@ 
     /**
      * @type \Classes\Db\Iterators\DbTables[]
      */
-    private $objDbTables = array ();
+    private $objDbTables = array();
 
     /**
      * @var AbstractAdapter
@@ -82,22 +82,22 @@ 
     /**
      * 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 )
+        foreach ($this->getListConstrant() as $constrant)
         {
 
-            $schema = $constrant[ 'table_schema' ];
-            $table_name = $constrant [ 'table_name' ];
-            $this->populateForeignAndPrimaryKeys ( $constrant , $table_name , $schema );
-            unset( $table_name , $schema );
+            $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" )
+            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 );
+                $schema = $constrant['foreign_schema'];
+                $table_name = $constrant ['foreign_table'];
+                $this->populateDependece($constrant, $table_name, $schema);
+                unset($table_name, $schema);
             }
         }
     }
@@ -107,37 +107,37 @@ 
      * @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 ) )
+        if ($this->hasTable($table_name, $schema))
         {
-            $table = $this->getTable ( $table_name , $schema );
-            if ( $table->hasColumn ( $constrant[ "column_name" ] ) )
+            $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' ] ,
+                $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_name ,
-                                      $constrant[ "column_name" ] ,
+                        $table->getColumn($constrant["column_name"])
+                              ->setPrimaryKey($objConstrant)
+                              ->setSequence(
+                                  $this->getSequence(
+                                      $table_name,
+                                      $constrant["column_name"],
                                       $schema
                                   )
                               );
@@ -152,20 +152,20 @@ 
      * @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 ) )
+        if ($this->hasTable($table_name, $schema))
         {
-            $table = $this->getTable ( $table_name , $schema );
-            if ( $table->hasColumn ( $constrant[ "foreign_column" ] ) )
+            $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' ]
+                $table->getColumn($constrant["foreign_column"])
+                      ->createDependece(
+                          $constrant['constraint_name'],
+                          $constrant['table_name'],
+                          $constrant['column_name'],
+                          $this->database,
+                          $constrant['table_schema']
                       );
             }
         }
@@ -174,36 +174,36 @@ 
     /**
      * cria um Array com nome das tabelas
      */
-    public function parseTables ()
+    public function parseTables()
     {
-        if ( $this->hasTables () )
+        if ($this->hasTables())
         {
-            return $this->getAllTables ();
+            return $this->getAllTables();
         }
 
-        foreach ( $this->getListColumns () as $table )
+        foreach ($this->getListColumns() as $table)
         {
-            $schema = $table[ 'table_schema' ];
-            $key = $table [ 'table_name' ];
-            if ( ! $this->hasTable ( $key , $schema ) )
+            $schema = $table['table_schema'];
+            $key = $table ['table_name'];
+            if ( ! $this->hasTable($key, $schema))
             {
-                $this->createTable ( $key , $schema );
+                $this->createTable($key, $schema);
             }
 
-            $column = Column::getInstance ()
-                            ->populate (
-                                array (
-                                    'name'       => $table [ 'column_name' ] ,
-                                    'type'       => $this->convertTypeToSimple ( $table[ 'data_type' ] ) ,
-                                    'nullable'   => (is_string($table[ 'is_nullable' ]) && strtolower($table[ 'is_nullable' ]) != 'no' ) ,
-                                    'max_length' => $table[ 'max_length' ]
+            $column = Column::getInstance()
+                            ->populate(
+                                array(
+                                    'name'       => $table ['column_name'],
+                                    'type'       => $this->convertTypeToSimple($table['data_type']),
+                                    'nullable'   => (is_string($table['is_nullable']) && strtolower($table['is_nullable']) != 'no'),
+                                    '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))
                  );
         }
     }
@@ -213,7 +213,7 @@ 
      *
      * @return int
      */
-    abstract public function getTotalTables ();
+    abstract public function getTotalTables();
 
     /**
      * Retorna o Nome da Sequence da tabela
@@ -223,33 +223,33 @@ 
      *
      * @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 ] ) )
+        if (isset($this->dataTypesToPhp[$str]))
         {
-            return $this->dataTypesToPhp[ $str ];
+            return $this->dataTypesToPhp[$str];
         }
 
         return 'string';
     }
 
-    protected function convertTypeToSimple ( $str )
+    protected function convertTypeToSimple($str)
     {
-        if ( isset( $this->dataTypesToSimple[ $str ] ) )
+        if (isset($this->dataTypesToSimple[$str]))
         {
-            return $this->dataTypesToSimple[ $str ];
+            return $this->dataTypesToSimple[$str];
         }
 
         return 'string';
@@ -258,12 +258,12 @@ 
     /**
      * @return string
      */
-    abstract public function getPDOString ();
+    abstract public function getPDOString();
 
     /**
      * @return string
      */
-    abstract public function getPDOSocketString ();
+    abstract public function getPDOSocketString();
 
     /**
      * @param     $nameTable
@@ -271,18 +271,18 @@ 
      *
      * @return \Classes\Db\DbTable
      */
-    public function createTable ( $nameTable , $schema = 0 )
+    public function createTable($nameTable, $schema = 0)
     {
-        if ( ! isset( $this->objDbTables[ $schema ] ) )
+        if ( ! isset($this->objDbTables[$schema]))
         {
-            $this->objDbTables[ $schema ] = new DbTables();
+            $this->objDbTables[$schema] = new DbTables();
         }
 
-        $this->objDbTables[ $schema ][ trim ( $nameTable ) ] = DbTable::getInstance ()
-                                                                      ->populate (
-                                                                          array (
-                                                                              'table'    => $nameTable ,
-                                                                              'schema'   => $schema ,
+        $this->objDbTables[$schema][trim($nameTable)] = DbTable::getInstance()
+                                                                      ->populate(
+                                                                          array(
+                                                                              'table'    => $nameTable,
+                                                                              'schema'   => $schema,
                                                                               'database' => $this->database
                                                                           )
                                                                       );
@@ -295,24 +295,24 @@ 
      *
      * @return \Classes\Db\Iterators\DbTables
      */
-    public function getTables ( $schema = 0 )
+    public function getTables($schema = 0)
     {
-        if ( ! isset( $this->objDbTables[ $schema ] ) )
+        if ( ! isset($this->objDbTables[$schema]))
         {
-            return array ();
+            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);
     }
 
     /**
@@ -322,9 +322,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)];
     }
 
     /**
@@ -333,9 +333,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)]);
     }
 
     /**
@@ -343,66 +343,66 @@ 
      *
      * @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->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->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 (is_null($this->_pdo))
         {
-            if ( ! empty( $this->socket ) )
+            if ( ! empty($this->socket))
             {
-                $pdoString = $this->getPDOSocketString ();
+                $pdoString = $this->getPDOSocketString();
             } else
             {
-                $pdoString = $this->getPDOString ();
+                $pdoString = $this->getPDOString();
             }
 
             try
             {
-                $this->_pdo = new \PDO (
-                    $pdoString , $this->username , $this->password
+                $this->_pdo = new \PDO(
+                    $pdoString, $this->username, $this->password
                 );
-            } catch ( \Exception $e )
+            } catch (\Exception $e)
             {
-                die ( "\033[0;31mPDO error: " . $e->getMessage () . "\033[0m\n" );
+                die ("\033[0;31mPDO error: " . $e->getMessage() . "\033[0m\n");
             }
         }