pedro151 / orm-generator

build/Classes/AdapterConfig/Phalcon.php

Spacing +13 added lines, -13 removed lines

@@ -22,16 +22,16 @@ 
      * @var string
      */
     protected $framework    = "phalcon";
-    public    $reservedWord = array ( 'public' => 'Main' );
+    public    $reservedWord = array('public' => 'Main');
 
-    protected $dataTypes = array (
+    protected $dataTypes = array(
         'int'    => 'integer',
         'float'  => 'decimal'
     );
 
     const SEPARETOR = "\\";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -40,12 +40,12 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
 
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
         // TODO: Implement parseFrameworkConfig() method.
     }
@@ -53,10 +53,10 @@ 
     /**
      * @inheritdoc
      */
-    protected function getBaseNamespace ()
+    protected function getBaseNamespace()
     {
-        return array (
-            $this->arrConfig[ 'namespace' ],
+        return array(
+            $this->arrConfig['namespace'],
             'Models'
         );
     }
@@ -66,12 +66,12 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
-        return array (
-            Entity::getInstance (),
-            Model::getInstance (),
-            Peer::getInstance ()
+        return array(
+            Entity::getInstance(),
+            Model::getInstance(),
+            Peer::getInstance()
         );
     }
 

build/Classes/AdapterMakerFile/ZendFrameworkOne/Entity.php

Spacing +43 added lines, -43 removed lines

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

build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php

Spacing +25 added lines, -25 removed lines

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

build/Classes/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/Classes/Config.php

Indentation +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 
         $configIni = isset( $argv[ 'config-ini' ] )
             ? $argv[ 'config-ini' ] : $this->_basePath
-                                      . $this->configIniDefault;
+                                        . $this->configIniDefault;
 
         $configTemp    = $this->loadIniFile ( realpath ( $configIni ) );
         $configCurrent = self::parseConfigEnv ( $configTemp, $argv );

Spacing +68 added lines, -68 removed lines

@@ -52,7 +52,7 @@ 
     /**
      * @var array
      */
-    private $argv = array ();
+    private $argv = array();
 
     /**
      * @var \Classes\AdapterConfig\AbstractAdapter
@@ -64,13 +64,13 @@ 
      */
     private $adapterDriver;
 
-    private $frameworkList = array (
+    private $frameworkList = array(
         'none',
         'zf1',
         'phalcon'
     );
 
-    private $parameterList = array (
+    private $parameterList = array(
         'init'       => 'Creates the necessary configuration file to start using the orm-generator.',
         'config-ini' => 'reference to another .ini file configuration (relative path).',
         'config-env' => 'orm-generator configuration environment.',
@@ -85,19 +85,19 @@ 
         '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 ) ) {
-            die ( $this->getUsage () );
+        if (array_key_exists('help', $argv) or ($numArgs > 1 && count($argv) < 1)) {
+            die ($this->getUsage());
         }
-        if ( array_key_exists ( 'version', $argv ) ) {
-            die ( $this->getVersion () );
+        if (array_key_exists('version', $argv)) {
+            die ($this->getVersion());
         }
-        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);
     }
 
     /**
@@ -105,10 +105,10 @@ 
      *
      * @return string
      */
-    public function getUsage ()
+    public function getUsage()
     {
-        $version = $this->getVersion ();
-        $list    = $this->renderParam ();
+        $version = $this->getVersion();
+        $list    = $this->renderParam();
 
         return <<<EOF
 parameters:
@@ -119,11 +119,11 @@ 
 EOF;
     }
 
-    public function renderParam ()
+    public function renderParam()
     {
         $return = "";
-        foreach ( $this->parameterList as $param => $desc ) {
-            if ( strlen ( $param ) < 5 ) {
+        foreach ($this->parameterList as $param => $desc) {
+            if (strlen($param) < 5) {
                 $return .= "\t--" . $param . "\t\t: " . $desc . "\n";
             }
             else {
@@ -135,7 +135,7 @@ 
         return $return;
     }
 
-    public function getVersion ()
+    public function getVersion()
     {
         $version = static::$version;
 
@@ -151,27 +151,27 @@ 
      * @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' ] : $this->_basePath
+        $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);
     }
 
     /**
@@ -181,20 +181,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)];
     }
 
     /**
@@ -208,29 +208,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");
             }
         }
 
@@ -243,15 +243,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);
         }
 
     }
@@ -263,31 +263,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;
@@ -296,10 +296,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;

Braces +1 added lines, -2 removed lines

@@ -359,8 +359,7 @@
         if ( is_null ( $this->_pdo ) ) {
             if ( !empty( $this->socket ) ) {
                 $pdoString = $this->getPDOSocketString ();
-            }
-            else {
+            } else {
                 $pdoString = $this->getPDOString ();
             }
 

build/phar-generate.php

Spacing +29 added lines, -29 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 
-if ( !ini_get ( 'short_open_tag' ) ) {
-    die( "please enable short_open_tag directive in php.ini\n" );
+if ( ! ini_get('short_open_tag')) {
+    die("please enable short_open_tag directive in php.ini\n");
 }
 
-if ( !ini_get ( 'register_argc_argv' ) ) {
-    die( "please enable register_argc_argv directive in php.ini\n" );
+if ( ! ini_get('register_argc_argv')) {
+    die("please enable register_argc_argv directive in php.ini\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)
@@ -28,22 +28,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(),
         )
     )
 );
@@ -53,15 +53,15 @@ 
 require_once 'Classes/MakerConfigFile.php';
 
 try {
-    $_path = realpath (
-        str_replace (
+    $_path = realpath(
+        str_replace(
             'phar://',
             '',
             __DIR__
         )
     );
 
-    $arrValid = array (
+    $arrValid = array(
         'version',
         'help',
         'status',
@@ -76,18 +76,18 @@ 
         'path:'
     );
 
-    $arg = getopt ( null, $arrValid );
-    if ( array_key_exists ( 'init', $arg ) ) {
-        $maker = new \Classes\MakerConfigFile( $arg, $_path );
+    $arg = getopt(null, $arrValid);
+    if (array_key_exists('init', $arg)) {
+        $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 ) {
-    die( $e->getMessage () );
+} catch (\Exception $e) {
+    die($e->getMessage());
 }
 
 __halt_compiler();
\ No newline at end of file

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

generate.php

Spacing +38 added lines, -38 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( "please enable short_open_tag directive in php.ini\n" );
+    die("please enable short_open_tag directive in php.ini\n");
 }
 
-if ( ! ini_get ( 'register_argc_argv' ) )
+if ( ! ini_get('register_argc_argv'))
 {
-    die( "please enable register_argc_argv directive in php.ini\n" );
+    die("please enable register_argc_argv directive in php.ini\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,34 +65,34 @@ 
 
 try
 {
-    $arrValid = array (
-        'version' ,
-        'help' ,
-        'status' ,
-        'init' ,
-        'config-env:' ,
-        'config-ini:' ,
-        'database:' ,
-        'schema:' ,
-        'driver:' ,
+    $arrValid = array(
+        'version',
+        'help',
+        'status',
+        'init',
+        'config-env:',
+        'config-ini:',
+        'database:',
+        'schema:',
+        'driver:',
         'tables:',
-        'framework:' ,
+        'framework:',
         'path:'
     );
 
-    $_path = realpath ( __FILE__ );
-    $arg   = getopt ( null , $arrValid );
-    if ( array_key_exists ( 'init' , $arg ) )
+    $_path = realpath(__FILE__);
+    $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());
 }