pedro151 / orm-generator

build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php

Spacing +25 added lines, -25 removed lines

@@ -28,68 +28,68 @@
      *
      * @return array
      */
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
         $referenceMap = '';
-        $references = array ();
+        $references = array();
         $dependentTables = '';
-        $dependents = array ();
-        foreach ( $dbTable->getForeingkeys () as $objColumn )
+        $dependents = array();
+        foreach ($dbTable->getForeingkeys() as $objColumn)
         {
-            $constrant = $objColumn->getFks ();
-            $variable =  $constrant->getNameConstrant () . ZendFrameworkOne::SEPARETOR . $objColumn->getName ();
+            $constrant = $objColumn->getFks();
+            $variable = $constrant->getNameConstrant() . ZendFrameworkOne::SEPARETOR . $objColumn->getName();
 
-            $arrClass = array (
-                $makerFile->getConfig ()->createClassNamespace ( $constrant ),
+            $arrClass = array(
+                $makerFile->getConfig()->createClassNamespace($constrant),
                 'DbTable',
-                AbstractMaker::getClassName ( $constrant->getTable () )
+                AbstractMaker::getClassName($constrant->getTable())
             );
-            $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+            $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
-            $references[] = sprintf (
+            $references[] = sprintf(
                 "
        '%s' => array (
             'columns'       => '%s' ,
             'refTableClass' => '%s',
             'refColumns'    =>'%s'
        )",
-                AbstractMaker::getClassName ( $variable ),
-                $objColumn->getName (),
+                AbstractMaker::getClassName($variable),
+                $objColumn->getName(),
                 $class,
-                $constrant->getColumn ()
+                $constrant->getColumn()
 
             );
         }
 
-        if ( sizeof ( $references ) > 0 )
+        if (sizeof($references) > 0)
         {
             $referenceMap = "protected \$_referenceMap = array(" .
-                join ( ',', $references ) . "\n    );";
+                join(',', $references) . "\n    );";
         }
 
-        foreach ( $dbTable->getDependences () as $objColumn )
+        foreach ($dbTable->getDependences() as $objColumn)
         {
-            foreach ( $objColumn->getDependences () as $dependence )
+            foreach ($objColumn->getDependences() as $dependence)
             {
-                $arrClass = array (
-                    $makerFile->getConfig ()->createClassNamespace ( $dependence ),
+                $arrClass = array(
+                    $makerFile->getConfig()->createClassNamespace($dependence),
                     'DbTable',
-                    AbstractMaker::getClassName ( $dependence->getTable () )
+                    AbstractMaker::getClassName($dependence->getTable())
                 );
-                $class = implode ( ZendFrameworkOne::SEPARETOR , array_filter ( $arrClass ) );
+                $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
                 $dependents[] = $class;
             }
         }
 
-        if ( sizeof ( $dependents ) > 0 )
+        if (sizeof($dependents) > 0)
         {
             $dependentTables = "protected \$_dependentTables = array(\n        '" .
-                join ( "',\n        '", $dependents ) . "'\n    );";
+                join("',\n        '", $dependents) . "'\n    );";
         }
 
 
-        return array (
+        return array(
             'referenceMap'    => $referenceMap,
             'dependentTables' => $dependentTables
         );

build/Classes/templates/zf1/model.php

Spacing +9 added lines, -9 removed lines

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

build/phar-generate.php

Braces +1 added lines, -2 removed lines

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

Spacing +29 added lines, -29 removed lines

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

build/Classes/CleanTrash.php

Doc Comments +3 added lines

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

Spacing +20 added lines, -20 removed lines

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

build/Classes/Maker/AbstractMaker.php

Spacing +16 added lines, -16 removed lines

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

build/Classes/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/Db/Iterators/DbTables.php

Indentation +1 added lines, -1 removed lines

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

Spacing +32 added lines, -32 removed lines

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

build/Classes/templates/zf1/entity_abstract.php

Spacing +10 added lines, -10 removed lines

@@ -3,19 +3,19 @@ 
 /**
  * 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"?>
- * @version   <?=$this->config->version."\n"?>
+ * @copyright <?=$this->config->copyright . "\n"?>
+ * @license   <?=$this->config->license . "\n"?>
+ * @link      <?=$this->config->link . "\n"?>
+ * @version   <?=$this->config->version . "\n"?>
  */
 
-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
 {
 
     /**
@@ -75,7 +75,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())
     {
@@ -242,7 +242,7 @@ 
     /**
      * Retorna o nome da coluna da primary key
      *
-     * @see <?=$this->config->namespace?$this->config->namespace."_":""?>Model_DbTable_TableAbstract::getPrimaryKeyName()
+     * @see <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_DbTable_TableAbstract::getPrimaryKeyName()
      * @return string|array The name or array of names which form the primary key
      */
     public function getPrimaryKeyName()
@@ -254,7 +254,7 @@ 
      * Retorna o objeto pela primary key
      *
      * @param int|array $primary_key
-     * @return <?=$this->config->namespace?$this->config->namespace."_":""?>Model_EntityAbstract
+     * @return <?=$this->config->namespace ? $this->config->namespace . "_" : ""?>Model_EntityAbstract
      */
     public static function retrieve ( $primary_key )
     {

generate.php

Spacing +37 added lines, -37 removed lines

@@ -6,26 +6,26 @@ 
  * @author Pedro Alarcao <phacl151@gmail.com>
  */
 
-if ( ! ini_get ( 'short_open_tag' ) )
+if ( ! ini_get('short_open_tag'))
 {
-    die( "\033[0;31mError: please enable short_open_tag directive in php.ini\033[0m\n" );
+    die("\033[0;31mError: please enable short_open_tag directive in php.ini\033[0m\n");
 }
 
-if ( ! ini_get ( 'register_argc_argv' ) )
+if ( ! ini_get('register_argc_argv'))
 {
-    die( "\033[0;31mError: please enable register_argc_argv directive in php.ini\033[0m\n" );
+    die("\033[0;31mError: please enable register_argc_argv directive in php.ini\033[0m\n");
 }
 
 
-if ( function_exists ( 'ini_set' ) )
+if (function_exists('ini_set'))
 {
-    @ini_set ( 'display_errors' , 1 );
+    @ini_set('display_errors', 1);
 
-    $memoryInBytes = function ( $value )
+    $memoryInBytes = function($value)
     {
-        $unit = strtolower ( substr ( $value , - 1 , 1 ) );
+        $unit = strtolower(substr($value, - 1, 1));
         $value = (int) $value;
-        switch ( $unit )
+        switch ($unit)
         {
             case 'g':
                 $value *= 1024;
@@ -40,21 +40,21 @@ 
         return $value;
     };
 
-    $memoryLimit = trim ( ini_get ( 'memory_limit' ) );
+    $memoryLimit = trim(ini_get('memory_limit'));
     // Increase memory_limit if it is lower than 1GB
-    if ( $memoryLimit != - 1 && $memoryInBytes( $memoryLimit ) < 1024 * 1024 * 1024 )
+    if ($memoryLimit != - 1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1024)
     {
-        @ini_set ( 'memory_limit' , '1G' );
+        @ini_set('memory_limit', '1G');
     }
-    unset( $memoryInBytes , $memoryLimit );
+    unset($memoryInBytes, $memoryLimit);
 }
 
-set_include_path (
-    implode (
-        PATH_SEPARATOR ,
-        array (
-            realpath ( dirname ( __FILE__ ) . "/build/" ) ,
-            get_include_path () ,
+set_include_path(
+    implode(
+        PATH_SEPARATOR,
+        array(
+            realpath(dirname(__FILE__) . "/build/"),
+            get_include_path(),
         )
     )
 );
@@ -65,35 +65,35 @@ 
 
 try
 {
-    $arrValid = array (
-        'version' ,
-        'help' ,
-        'status' ,
-        'init' ,
-        'config-env:' ,
-        'name-ini:' ,
-        'database:' ,
-        'schema:' ,
-        'driver:' ,
+    $arrValid = array(
+        'version',
+        'help',
+        'status',
+        'init',
+        'config-env:',
+        'name-ini:',
+        'database:',
+        'schema:',
+        'driver:',
         'tables:',
-        'framework:' ,
+        'framework:',
         'path:',
         'clean-trash:'
     );
 
     $_path = __DIR__;
-    $arg   = getopt ( null , $arrValid );
-    if ( array_key_exists ( 'init' , $arg ) )
+    $arg   = getopt(null, $arrValid);
+    if (array_key_exists('init', $arg))
     {
-        $maker = new \Classes\MakerConfigFile( $arg , $_path );
+        $maker = new \Classes\MakerConfigFile($arg, $_path);
     } else
     {
-        $maker = new \Classes\MakerFile( new \Classes\Config( $arg , $_path, count($argv) ) );
+        $maker = new \Classes\MakerFile(new \Classes\Config($arg, $_path, count($argv)));
     }
 
-    $maker->run ();
+    $maker->run();
 
-} catch ( \Exception $e )
+} catch (\Exception $e)
 {
-    die( $e->getMessage ()  );
+    die($e->getMessage());
 }