pedro151 / orm-generator

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:' ,
-        'framework:' ,
+    $arrValid = array(
+        'version',
+        'help',
+        'status',
+        'init',
+        'config-env:',
+        'config-ini:',
+        'database:',
+        'schema:',
+        'driver:',
+        'framework:',
         'path:'
     );
 
-    $_path = realpath ( __FILE__ );
-    $argv = getopt ( null , $arrValid );
+    $_path = realpath(__FILE__);
+    $argv = getopt(null, $arrValid);
 
-    if ( array_key_exists ( 'init' , $argv ) )
+    if (array_key_exists('init', $argv))
     {
-        $maker = new \Classes\MakerConfigFile( $argv , $_path );
+        $maker = new \Classes\MakerConfigFile($argv, $_path);
     } else
     {
-        $maker = new \Classes\MakerFile( new \Classes\Config( $argv , $_path ) );
+        $maker = new \Classes\MakerFile(new \Classes\Config($argv, $_path));
     }
 
-    $maker->run ();
+    $maker->run();
 
-} catch ( \Exception $e )
+} catch (\Exception $e)
 {
-    die( $e->getMessage () );
+    die($e->getMessage());
 }

build/Classes/AdaptersDriver/Pgsql.php

Doc Comments -1 removed lines

@@ -71,7 +71,6 @@
     /**
      * Retorna um Array com nome das tabelas
      *
-     * @param void $schema
      *
      * @return string[]
      */

Indentation +5 added lines, -5 removed lines

@@ -171,7 +171,7 @@ 
 
         $pdo     = $this->getPDO ();
         $return1 = $pdo->query ( "SELECT pg_get_serial_sequence('$tableTemp', '$column');" )
-                       ->fetchColumn ();
+                        ->fetchColumn ();
 
         if ( !is_null ( $return1 ) ) {
             return $return1;
@@ -247,14 +247,14 @@ 
             $strSchema = implode ( "', '", $this->schema );
 
             $this->totalTables = $this->getPDO ()
-                                      ->query (
-                                          "SELECT COUNT(table_name)  AS total
+                                        ->query (
+                                            "SELECT COUNT(table_name)  AS total
              FROM information_schema.tables
              WHERE
               table_type = 'BASE TABLE'
               AND table_schema IN ( '" . $strSchema . "' )"
-                                      )
-                                      ->fetchColumn ();
+                                        )
+                                        ->fetchColumn ();
         }
 
         return (int) $this->totalTables;

Spacing +47 added lines, -47 removed lines

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

build/Classes/AdapterConfig/ZendFrameworkOne.php

Spacing +24 added lines, -24 removed lines

@@ -22,7 +22,7 @@ 
 
     const SEPARETOR = "_";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -31,50 +31,50 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
-        if ( ! $this->config or ! $this->isValidFrameworkFiles () )
+        if ( ! $this->config or ! $this->isValidFrameworkFiles())
         {
-            return array ();
+            return array();
         }
 
-        return array (
+        return array(
             //Driver do banco de dados
-            'driver'   => $this->config[ 'adapter' ] ,
+            'driver'   => $this->config['adapter'],
             //Nome do banco de dados
-            'database' => $this->config[ 'params' ][ 'dbname' ] ,
+            'database' => $this->config['params']['dbname'],
             //Host do banco
-            'host'     => $this->config[ 'params' ][ 'host' ] ,
+            'host'     => $this->config['params']['host'],
             //Port do banco
-            'port'     => isset( $this->config[ 'params' ][ 'port' ] )
-                ? $this->config[ 'params' ][ 'port' ] : '' ,
+            'port'     => isset($this->config['params']['port'])
+                ? $this->config['params']['port'] : '',
             //usuario do banco
-            'username' => $this->config[ 'params' ][ 'username' ] ,
+            'username' => $this->config['params']['username'],
             //senha do banco
-            'password' => $this->config[ 'params' ][ 'password' ] ,
+            'password' => $this->config['params']['password'],
         );
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
-        if ( ! $this->isValidFrameworkFiles () )
+        if ( ! $this->isValidFrameworkFiles())
         {
             return;
         }
 
-        $frameworkIni = $this->getFrameworkIni ();
+        $frameworkIni = $this->getFrameworkIni();
 
         require_once 'Zend/Config/Ini.php';
 
         $objConfig = new \Zend_Config_Ini(
-            realpath ( $frameworkIni ) , $this->getEnvironment ()
+            realpath($frameworkIni), $this->getEnvironment()
         );
 
-        $arrConfig = $objConfig->toArray ();
+        $arrConfig = $objConfig->toArray();
 
-        if ( isset( $arrConfig[ 'resources' ][ 'db' ] ) )
+        if (isset($arrConfig['resources']['db']))
         {
-            $this->config = $arrConfig[ 'resources' ][ 'db' ];
+            $this->config = $arrConfig['resources']['db'];
         }
     }
 
@@ -83,12 +83,12 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
-        return array (
-            DbTable::getInstance () ,
-            Entity::getInstance () ,
-            Model::getInstance ()
+        return array(
+            DbTable::getInstance(),
+            Entity::getInstance(),
+            Model::getInstance()
         );
     }
 

build/Classes/AdapterConfig/None.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
 
     const SEPARETOR = "_";
 
-    protected function init ()
+    protected function init()
     {
     }
 
@@ -31,12 +31,12 @@ 
      *
      * @return array
      */
-    protected function getParams ()
+    protected function getParams()
     {
 
     }
 
-    protected function parseFrameworkConfig ()
+    protected function parseFrameworkConfig()
     {
         // TODO: Implement parseFrameworkConfig() method.
     }
@@ -46,12 +46,12 @@ 
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    public function getMakeFileInstances ()
+    public function getMakeFileInstances()
     {
-        return array (
-            DbTable::getInstance (),
-            Entity::getInstance (),
-            Model::getInstance ()
+        return array(
+            DbTable::getInstance(),
+            Entity::getInstance(),
+            Model::getInstance()
         );
     }
 

build/Classes/AdapterMakerFile/Phalcon/Model.php

Indentation +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
 
     public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
     {
-       return array();
+        return array();
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
     /**
      * @var void
      */
-    protected $fileTpl       = "model.php";
+    protected $fileTpl = "model.php";
 
-    public function parseRelation ( \Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable )
+    public function parseRelation(\Classes\MakerFile $makerFile, \Classes\Db\DbTable $dbTable)
     {
        return array();
     }

build/Classes/Db/Constrant.php

Doc Comments +3 added lines

@@ -70,6 +70,9 @@
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getDatabase (){
         return $this->database;
     }

Spacing +15 added lines, -15 removed lines

@@ -21,11 +21,11 @@ 
      *
      * @author Pedro Alarcao <phacl151@gmail.com>
      */
-    final private function __construct ()
+    final private function __construct()
     {
     }
 
-    public static function getInstance ()
+    public static function getInstance()
     {
         return new self();
     }
@@ -55,34 +55,34 @@ 
      *
      * @return Constrant
      */
-    public function populate ( $array )
+    public function populate($array)
     {
-        if ( isset( $array[ 'schema' ] ) )
+        if (isset($array['schema']))
         {
-            $this->schema = $array[ 'schema' ];
+            $this->schema = $array['schema'];
         }
 
-        $this->database = $array[ 'database' ];
-        $this->constrant = $array[ 'constrant' ];
-        $this->table = $array[ 'table' ];
-        $this->column = $array[ 'column' ];
+        $this->database = $array['database'];
+        $this->constrant = $array['constrant'];
+        $this->table = $array['table'];
+        $this->column = $array['column'];
 
         return $this;
     }
 
-    public function getDatabase (){
+    public function getDatabase() {
         return $this->database;
     }
 
     /**
      * @return string
      */
-    public function getNameConstrant ()
+    public function getNameConstrant()
     {
         return $this->constrant;
     }
 
-    public function hasSchema ()
+    public function hasSchema()
     {
         return (bool) $this->schema;
     }
@@ -90,7 +90,7 @@ 
     /**
      * @return string
      */
-    public function getSchema ()
+    public function getSchema()
     {
         return $this->schema;
     }
@@ -98,7 +98,7 @@ 
     /**
      * @return string
      */
-    public function getTable ()
+    public function getTable()
     {
         return $this->table;
     }
@@ -106,7 +106,7 @@ 
     /**
      * @return string
      */
-    public function getColumn ()
+    public function getColumn()
     {
         return $this->column;
     }

build/Classes/AdapterMakerFile/ZendFrameworkOne/Entity.php

Spacing +40 added lines, -40 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,35 +44,35 @@ 
      *
      * @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();
 
-            $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 ) );
+            $class = implode(ZendFrameworkOne::SEPARETOR, array_filter($arrClass));
 
-            $parents[] = array (
-                'class'    => $class ,
-                'function' => AbstractMaker::getClassName ( $name ) ,
-                'table'    => $constrant->getTable () ,
-                'column'   => $objColumn->getName () ,
-                'name'     => $constrant->getNameConstrant () ,
+            $parents[] = array(
+                'class'    => $class,
+                'function' => AbstractMaker::getClassName($name),
+                'table'    => $constrant->getTable(),
+                'column'   => $objColumn->getName(),
+                'name'     => $constrant->getNameConstrant(),
             );
-            unset( $name );
+            unset($name);
         }
 
         return $parents;
@@ -84,40 +84,40 @@ 
      *
      * @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))
                 {
-                    $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()
                     );
                 }
-                unset( $name );
+                unset($name);
             }
         }
 

build/Classes/AdapterMakerFile/ZendFrameworkOne/DbTable.php

Spacing +24 added lines, -24 removed lines

@@ -28,67 +28,67 @@
      *
      * @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 ();
+            $constrant = $objColumn->getFks();
 
-            $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 ( $constrant->getNameConstrant () ),
-                $objColumn->getName (),
+                AbstractMaker::getClassName($constrant->getNameConstrant()),
+                $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/AdapterConfig/AbstractAdapter.php

Doc Comments +4 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
     /**
      * @param \Classes\Db\DbTable|\Classes\Db\Constrant $table
      *
-     * @return mixed
+     * @return string
      */
 
     public function createClassNamespace ( $table )
@@ -225,6 +225,9 @@ 
         return true;
     }
 
+    /**
+     * @return string
+     */
     protected function getFrameworkIni ()
     {
         return $this->framworkFiles[ 'ini' ];
@@ -332,7 +335,6 @@ 
     }
 
     /**
-     * @param string $schema
      *
      * @return string
      */

Braces +1 added lines, -2 removed lines

@@ -134,8 +134,7 @@
             }
 
 
-        }
-        else {
+        } else {
             $url            = array (
                 $this->baseLocation,
                 $driverBase,

Spacing +99 added lines, -99 removed lines

@@ -16,7 +16,7 @@ 
 abstract class AbstractAdapter
 {
 
-    protected $arrConfig = array (
+    protected $arrConfig = array(
         ############################# DATABASE
         //Driver do banco de dados
         'driver'          => null,
@@ -31,7 +31,7 @@ 
         //senha do banco
         'password'        => null,
         // lista de schemas do banco de dados
-        'schema'          => array (),
+        'schema'          => array(),
         'version'         => '',
         'socket'          => null,
 
@@ -64,13 +64,13 @@ 
         // flags para criar todas as tabelas ou nao
         'allTables'       => true,
         //Lista de tabelas a serem ignoradas
-        'ignoreTable'     => array (),
+        'ignoreTable'     => array(),
     );
 
     /**
      * @var string[] um array com todos os campos obrigatorios
      */
-    protected $attRequered = array (
+    protected $attRequered = array(
         'driver'   => true,
         'database' => true,
         'host'     => true,
@@ -78,14 +78,14 @@ 
         'path'     => true
     );
 
-    protected $arrFunc = array ();
+    protected $arrFunc = array();
 
-    private $framworkFiles = array ();
+    private $framworkFiles = array();
 
-    public $reservedWord = array ();
+    public $reservedWord = array();
 
 
-    private static $dataTypesDefault = array (
+    private static $dataTypesDefault = array(
         'int'      => 'int',
         'float'    => 'float',
         'string'   => 'string',
@@ -95,7 +95,7 @@ 
         'boolean'  => 'boolean'
     );
 
-    protected $dataTypes = array ();
+    protected $dataTypes = array();
 
     const SEPARETOR = "";
 
@@ -104,9 +104,9 @@ 
      *
      * @return bool
      */
-    protected function checkConfig ()
+    protected function checkConfig()
     {
-        if ( array_diff_key ( $this->attRequered, array_filter ( $this->arrConfig ) ) ) {
+        if (array_diff_key($this->attRequered, array_filter($this->arrConfig))) {
             return false;
         }
 
@@ -118,33 +118,33 @@ 
      *
      * @return array
      */
-    abstract protected function getParams ();
+    abstract protected function getParams();
 
     /**
      * Popula as config do generater com as configuraçoes do framework
      *
      * @return mixed
      */
-    abstract protected function parseFrameworkConfig ();
+    abstract protected function parseFrameworkConfig();
 
     /**
      * Cria Instancias dos arquivos que devem ser gerados
      *
      * @return \Classes\AdapterMakerFile\AbstractAdapter[]
      */
-    abstract public function getMakeFileInstances ();
+    abstract public function getMakeFileInstances();
 
-    abstract protected function init ();
+    abstract protected function init();
 
     /**
      * retorna a base do Namespace
      *
      * @return array
      */
-    protected function getBaseNamespace ()
+    protected function getBaseNamespace()
     {
-        return array (
-            $this->arrConfig[ 'namespace' ],
+        return array(
+            $this->arrConfig['namespace'],
             'Model'
         );
     }
@@ -155,49 +155,49 @@ 
      * @return mixed
      */
 
-    public function createClassNamespace ( $table )
+    public function createClassNamespace($table)
     {
-        $arrNames = $this->getBaseNamespace ();
+        $arrNames = $this->getBaseNamespace();
 
-        if ( isset( $this->arrConfig[ 'folder-database' ] )
-             && $this->arrConfig[ 'folder-database' ]
+        if (isset($this->arrConfig['folder-database'])
+             && $this->arrConfig['folder-database']
         ) {
-            $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'driver' ] );
+            $arrNames[] = AbstractMaker::getClassName($this->arrConfig['driver']);
         }
 
-        if ( isset( $this->arrConfig[ 'folder-name' ] )
-             && $this->arrConfig[ 'folder-name' ]
+        if (isset($this->arrConfig['folder-name'])
+             && $this->arrConfig['folder-name']
         ) {
-            $arrNames[] = AbstractMaker::getClassName ( $this->arrConfig[ 'folder-name' ] );
+            $arrNames[] = AbstractMaker::getClassName($this->arrConfig['folder-name']);
         }
 
-        if ( $table->hasSchema () ) {
-            $arrNames[] = $this->replaceReservedWord ( AbstractMaker::getClassName ( $table->getSchema () ) );
+        if ($table->hasSchema()) {
+            $arrNames[] = $this->replaceReservedWord(AbstractMaker::getClassName($table->getSchema()));
         }
         else {
-            $arrNames[] = $this->replaceReservedWord ( AbstractMaker::getClassName ( $table->getDatabase () ) );
+            $arrNames[] = $this->replaceReservedWord(AbstractMaker::getClassName($table->getDatabase()));
         }
 
-        return implode ( static::SEPARETOR, array_filter ( $arrNames ) );
+        return implode(static::SEPARETOR, array_filter($arrNames));
     }
 
-    public function __construct ( $array )
+    public function __construct($array)
     {
         $this->dataTypes = $this->dataTypes + self::$dataTypesDefault;
-        $array += array (
+        $array += array(
             'version'     => Config::$version,
-            'author'      => ucfirst ( get_current_user () ),
-            'last_modify' => date ( "d-m-Y H:i:s." )
+            'author'      => ucfirst(get_current_user()),
+            'last_modify' => date("d-m-Y H:i:s.")
         );
 
-        $this->setFrameworkFiles ( $array );
-        $this->parseFrameworkConfig ();
-        $this->setParams ( $this->getParams () );
-        $this->setParams ( $array );
-        $this->init ();
-        if ( !$this->isValid () ) {
-            $var = array_diff_key ( $this->attRequered, array_filter ( $this->arrConfig ) );
-            throw new Exception( $var );
+        $this->setFrameworkFiles($array);
+        $this->parseFrameworkConfig();
+        $this->setParams($this->getParams());
+        $this->setParams($array);
+        $this->init();
+        if ( ! $this->isValid()) {
+            $var = array_diff_key($this->attRequered, array_filter($this->arrConfig));
+            throw new Exception($var);
         }
     }
 
@@ -206,35 +206,35 @@ 
      *
      * @param $array
      */
-    public function setFrameworkFiles ( $array )
+    public function setFrameworkFiles($array)
     {
-        $this->framworkFiles[ 'library' ] = isset( $array[ 'framework-path-library' ] ) ? $array[ 'framework-path-library' ] : null;
+        $this->framworkFiles['library'] = isset($array['framework-path-library']) ? $array['framework-path-library'] : null;
 
-        $this->framworkFiles[ 'ini' ] = isset( $array[ 'framework-ini' ] ) ? $array[ 'framework-ini' ] : null;
+        $this->framworkFiles['ini'] = isset($array['framework-ini']) ? $array['framework-ini'] : null;
 
-        $this->framworkFiles[ 'environment' ] = isset( $array[ 'environment' ] ) ? $array[ 'environment' ] : 'production';
+        $this->framworkFiles['environment'] = isset($array['environment']) ? $array['environment'] : 'production';
 
     }
 
-    protected function isValidFrameworkFiles ()
+    protected function isValidFrameworkFiles()
     {
-        if ( !is_file ( $this->framworkFiles[ 'ini' ] ) ) {
+        if ( ! is_file($this->framworkFiles['ini'])) {
             return false;
         }
 
-        if ( !is_dir ( $this->framworkFiles[ 'library' ] ) ) {
+        if ( ! is_dir($this->framworkFiles['library'])) {
             return false;
         }
 
-        if ( !isset ( $this->framworkFiles[ 'environment' ] ) or empty( $this->framworkFiles[ 'environment' ] ) ) {
+        if ( ! isset ($this->framworkFiles['environment']) or empty($this->framworkFiles['environment'])) {
             return false;
         }
-        set_include_path (
-            implode (
+        set_include_path(
+            implode(
                 PATH_SEPARATOR,
-                array (
-                    realpath ( $this->framworkFiles[ 'library' ] ),
-                    get_include_path (),
+                array(
+                    realpath($this->framworkFiles['library']),
+                    get_include_path(),
                 )
             )
         );
@@ -242,110 +242,110 @@ 
         return true;
     }
 
-    protected function getFrameworkIni ()
+    protected function getFrameworkIni()
     {
-        return $this->framworkFiles[ 'ini' ];
+        return $this->framworkFiles['ini'];
     }
 
-    protected function getEnvironment ()
+    protected function getEnvironment()
     {
-        return $this->framworkFiles[ 'environment' ];
+        return $this->framworkFiles['environment'];
     }
 
     /**
      * Popula as variaveis de acordo com o arquivo de configuração do seu  framework
      */
-    protected function isValid ()
+    protected function isValid()
     {
-        return $this->checkConfig ();
+        return $this->checkConfig();
     }
 
-    private function setParams ( $array )
+    private function setParams($array)
     {
-        if ( count ( $array ) > 0 ) {
-            $this->arrConfig = array_filter ( $array ) + $this->arrConfig;
+        if (count($array) > 0) {
+            $this->arrConfig = array_filter($array) + $this->arrConfig;
         }
     }
 
     /**
      * @return string
      */
-    public function getDatabase ()
+    public function getDatabase()
     {
-        return $this->arrConfig[ 'database' ];
+        return $this->arrConfig['database'];
     }
 
     /**
      * @return bool
      */
-    public function hasSchemas ()
+    public function hasSchemas()
     {
-        return !empty ( $this->arrConfig[ 'schema' ] );
+        return ! empty ($this->arrConfig['schema']);
     }
 
     /**
      * @return string[]
      */
-    public function getSchemas ()
+    public function getSchemas()
     {
-        if ( is_string ( $this->arrConfig[ 'schema' ] ) ) {
-            return array ( $this->arrConfig[ 'schema' ] );
+        if (is_string($this->arrConfig['schema'])) {
+            return array($this->arrConfig['schema']);
         }
 
-        return $this->arrConfig[ 'schema' ];
+        return $this->arrConfig['schema'];
     }
 
-    public function setSchema ( $schema )
+    public function setSchema($schema)
     {
-        $this->arrConfig[ 'schema' ] = $schema;
+        $this->arrConfig['schema'] = $schema;
     }
 
     /**
      * @return string
      */
-    public function getHost ()
+    public function getHost()
     {
-        return $this->arrConfig[ 'host' ];
+        return $this->arrConfig['host'];
     }
 
     /**
      * @return int
      */
-    public function getPort ()
+    public function getPort()
     {
-        return $this->arrConfig[ 'port' ];
+        return $this->arrConfig['port'];
     }
 
     /**
      * @return boolean
      */
-    public function hasPort ()
+    public function hasPort()
     {
-        return !empty( $this->arrConfig[ 'port' ] );
+        return ! empty($this->arrConfig['port']);
     }
 
     /**
      * @return string
      */
-    public function getSocket ()
+    public function getSocket()
     {
-        return $this->arrConfig[ 'socket' ];
+        return $this->arrConfig['socket'];
     }
 
     /**
      * @return string
      */
-    public function getUser ()
+    public function getUser()
     {
-        return $this->arrConfig[ 'username' ];
+        return $this->arrConfig['username'];
     }
 
     /**
      * @return string
      */
-    public function getPassword ()
+    public function getPassword()
     {
-        return $this->arrConfig[ 'password' ];
+        return $this->arrConfig['password'];
     }
 
     /**
@@ -353,10 +353,10 @@ 
      *
      * @return string
      */
-    public function replaceReservedWord ( $palavra )
+    public function replaceReservedWord($palavra)
     {
-        if ( isset( $this->reservedWord[ strtolower ( $palavra ) ] ) ) {
-            return $this->reservedWord[ strtolower ( $palavra ) ];
+        if (isset($this->reservedWord[strtolower($palavra)])) {
+            return $this->reservedWord[strtolower($palavra)];
         }
 
         return $palavra;
@@ -365,9 +365,9 @@ 
     /**
      * @return bool
      */
-    public function isStatusEnabled ()
+    public function isStatusEnabled()
     {
-        return (bool) $this->arrConfig[ 'status' ];
+        return (bool) $this->arrConfig['status'];
     }
 
     /**
@@ -375,9 +375,9 @@ 
      *
      * @return string
      */
-    public function __get ( $str )
+    public function __get($str)
     {
-        $arr = array (
+        $arr = array(
             'namespace',
             'framework',
             'author',
@@ -391,8 +391,8 @@ 
             'folder-name'
         );
 
-        if ( in_array ( $str, $arr ) ) {
-            return $this->arrConfig[ strtolower ( $str ) ];
+        if (in_array($str, $arr)) {
+            return $this->arrConfig[strtolower($str)];
         }
 
         return;
@@ -403,9 +403,9 @@ 
      *
      * @return string
      */
-    public static function convertTypeToPHP ( $type )
+    public static function convertTypeToPHP($type)
     {
-        return self::$dataTypesDefault[ $type ];
+        return self::$dataTypesDefault[$type];
     }
 
     /**
@@ -413,8 +413,8 @@ 
      *
      * @return string
      */
-    public function convertTypeToTypeFramework ( $type )
+    public function convertTypeToTypeFramework($type)
     {
-        return $this->dataTypes[ $type ];
+        return $this->dataTypes[$type];
     }
 }