pedro151 / orm-generator

build/Classes/Update/Content/AbstractContent.php

Doc Comments +4 added lines

@@ -151,6 +151,10 @@
         return stream_get_contents ( $handle );
     }
 
+    /**
+     * @param string $url
+     * @param string $content
+     */
     public function putContent ( $url , $content )
     {
         switch ( $this->objProtocol->getProtocol () )

Indentation +5 added lines, -5 removed lines

@@ -227,11 +227,11 @@
     function progressCallback ( $download_size , $downloaded_size , $upload_size , $uploaded_size )
     {
         ProgressBar::getInstance ()
-                   ->clear ()
-                   ->setMaxByte ( $download_size )
-                   ->setProgress ( $downloaded_size )
-                   ->render ()
-                   ->finish ();
+                    ->clear ()
+                    ->setMaxByte ( $download_size )
+                    ->setProgress ( $downloaded_size )
+                    ->render ()
+                    ->finish ();
 
     }
 

Spacing +75 added lines, -75 removed lines

@@ -14,10 +14,10 @@ 
 abstract class AbstractContent
 {
 
-    private static $opts = array (
-        'http' => array (
-            'method' => 'GET' ,
-            'header' => array (
+    private static $opts = array(
+        'http' => array(
+            'method' => 'GET',
+            'header' => array(
                 'User-Agent: PHP'
             )
         )
@@ -35,22 +35,22 @@ 
     /**
      * @type array
      */
-    private $content = array ();
+    private $content = array();
 
-    protected function __construct ()
+    protected function __construct()
     {
-        $this->objProtocol = ProtocolFileContent::getInstance ();
-        $this->init ();
+        $this->objProtocol = ProtocolFileContent::getInstance();
+        $this->init();
     }
 
-    protected function init (){ }
+    protected function init() { }
 
     /**
      * @return \Classes\Update\Content
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
-        if ( empty( self::$objContent ) )
+        if (empty(self::$objContent))
         {
             self::$objContent = new static();
         }
@@ -63,26 +63,26 @@ 
      *
      * @return string
      */
-    public function getContent ( $url , $progress = false )
+    public function getContent($url, $progress = false)
     {
-        if ( ! isset( $this->content[ $url ] ) )
+        if ( ! isset($this->content[$url]))
         {
-            $this->content[ $url ] = '';
-            switch ( $this->objProtocol->getProtocol () )
+            $this->content[$url] = '';
+            switch ($this->objProtocol->getProtocol())
             {
                 case 'curl':
-                    $this->content[ $url ] = $this->getCurlContent ( $url , $progress );
+                    $this->content[$url] = $this->getCurlContent($url, $progress);
                     break;
                 case 'file_content':
-                    $this->content[ $url ] = $this->getFileContent ( $url , $progress );
+                    $this->content[$url] = $this->getFileContent($url, $progress);
                     break;
                 case 'steam_content':
-                    $this->content[ $url ] = $this->getStreamContent ( $url , $progress );
+                    $this->content[$url] = $this->getStreamContent($url, $progress);
                     break;
             }
         }
 
-        return $this->content[ $url ];
+        return $this->content[$url];
     }
 
     /**
@@ -90,21 +90,21 @@ 
      *
      * @return string
      */
-    protected function getCurlContent ( $url , $progress = false )
+    protected function getCurlContent($url, $progress = false)
     {
-        $conn = curl_init ( $url );
-        curl_setopt ( $conn , CURLOPT_RETURNTRANSFER , true );
-        curl_setopt ( $conn , CURLOPT_BINARYTRANSFER , true );
-        curl_setopt ( $conn , CURLOPT_USERAGENT , self::$opts[ 'http' ][ 'method' ] );
-        if ( $progress )
+        $conn = curl_init($url);
+        curl_setopt($conn, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($conn, CURLOPT_BINARYTRANSFER, true);
+        curl_setopt($conn, CURLOPT_USERAGENT, self::$opts['http']['method']);
+        if ($progress)
         {
-            curl_setopt ( $conn , CURLOPT_NOPROGRESS , false );
-            curl_setopt ( $conn , CURLOPT_PROGRESSFUNCTION , array (
-                $this , 'progressCallback'
-            ) );
+            curl_setopt($conn, CURLOPT_NOPROGRESS, false);
+            curl_setopt($conn, CURLOPT_PROGRESSFUNCTION, array(
+                $this, 'progressCallback'
+            ));
         }
-        $url_get_contents_data = ( curl_exec ( $conn ) );
-        curl_close ( $conn );
+        $url_get_contents_data = (curl_exec($conn));
+        curl_close($conn);
 
         return $url_get_contents_data;
     }
@@ -114,19 +114,19 @@ 
      *
      * @return string
      */
-    protected function getFileContent ( $url , $progress = false )
+    protected function getFileContent($url, $progress = false)
     {
-        $context = stream_context_create ( self::$opts );
-        if ( $progress )
+        $context = stream_context_create(self::$opts);
+        if ($progress)
         {
-            stream_context_set_params ( $context , array (
-                "notification" => array (
-                    $this , 'stream_notification_callback'
+            stream_context_set_params($context, array(
+                "notification" => array(
+                    $this, 'stream_notification_callback'
                 )
-            ) );
+            ));
         }
 
-        return file_get_contents ( $url , false , $context );
+        return file_get_contents($url, false, $context);
     }
 
     /**
@@ -134,52 +134,52 @@ 
      *
      * @return string
      */
-    protected function getStreamContent ( $url , $progress = false )
+    protected function getStreamContent($url, $progress = false)
     {
-        $context = stream_context_create ( self::$opts );
-        if ( $progress )
+        $context = stream_context_create(self::$opts);
+        if ($progress)
         {
-            stream_context_set_params ( $context , array (
-                "notification" => array (
-                    $this , 'stream_notification_callback'
+            stream_context_set_params($context, array(
+                "notification" => array(
+                    $this, 'stream_notification_callback'
                 )
-            ) );
+            ));
         }
 
-        $handle = fopen ( $url , "r" , null , $context );
+        $handle = fopen($url, "r", null, $context);
 
-        return stream_get_contents ( $handle );
+        return stream_get_contents($handle);
     }
 
-    public function putContent ( $url , $content )
+    public function putContent($url, $content)
     {
-        switch ( $this->objProtocol->getProtocol () )
+        switch ($this->objProtocol->getProtocol())
         {
             case 'curl':
-                $this->putFopen ( $url , $content );
+                $this->putFopen($url, $content);
                 break;
             case 'steam_content':
             case 'file_content':
-                $this->putFileContent ( $url , $content );
+                $this->putFileContent($url, $content);
                 break;
         }
 
     }
 
-    public function putFileContent ( $url , $content )
+    public function putFileContent($url, $content)
     {
         // check if all is OK
-        if ( file_put_contents ( $url , $content ) )
+        if (file_put_contents($url, $content))
         {
-            ProgressBar::getInstance ()->finish ();
+            ProgressBar::getInstance()->finish();
         }
     }
 
-    public function putFopen ( $url , $content )
+    public function putFopen($url, $content)
     {
-        $fp = fopen ( $url , "a" );
-        fwrite ( $fp , $content );
-        fclose ( $fp );
+        $fp = fopen($url, "a");
+        fwrite($fp, $content);
+        fclose($fp);
     }
 
     /**
@@ -192,46 +192,46 @@ 
      * @param $bytes_transferred
      * @param $bytes_max
      */
-    public function stream_notification_callback ( $notificationCode , $severity , $message , $messageCode , $bytesTransferred , $bytesMax )
+    public function stream_notification_callback($notificationCode, $severity, $message, $messageCode, $bytesTransferred, $bytesMax)
     {
-        $objProgress = ProgressBar::getInstance ();
-        switch ( $notificationCode )
+        $objProgress = ProgressBar::getInstance();
+        switch ($notificationCode)
         {
             case STREAM_NOTIFY_RESOLVE:
             case STREAM_NOTIFY_AUTH_REQUIRED:
             case STREAM_NOTIFY_FAILURE:
             case STREAM_NOTIFY_AUTH_RESULT:
-                var_dump ( $notificationCode , $severity , $message , $messageCode , $bytesTransferred , $bytesMax );
+                var_dump($notificationCode, $severity, $message, $messageCode, $bytesTransferred, $bytesMax);
                 /* Ignore */
                 break;
             case STREAM_NOTIFY_CONNECT:
                 echo "\033[1;32mConnected...\033[0m\n";
                 break;
             case STREAM_NOTIFY_REDIRECTED:
-                $objProgress->clear ();
+                $objProgress->clear();
                 break;
             case STREAM_NOTIFY_FILE_SIZE_IS:
-                $objProgress->clear ()->setMaxByte ( $bytesMax );
+                $objProgress->clear()->setMaxByte($bytesMax);
                 break;
             case STREAM_NOTIFY_PROGRESS:
-                $objProgress->setProgress ( $bytesTransferred )
-                            ->render ();
+                $objProgress->setProgress($bytesTransferred)
+                            ->render();
                 break;
             case STREAM_NOTIFY_COMPLETED:
-                $objProgress->finish ();
+                $objProgress->finish();
                 break;
         }
 
     }
 
-    function progressCallback ( $download_size , $downloaded_size , $upload_size , $uploaded_size )
+    function progressCallback($download_size, $downloaded_size, $upload_size, $uploaded_size)
     {
-        ProgressBar::getInstance ()
-                   ->clear ()
-                   ->setMaxByte ( $download_size )
-                   ->setProgress ( $downloaded_size )
-                   ->render ()
-                   ->finish ();
+        ProgressBar::getInstance()
+                   ->clear()
+                   ->setMaxByte($download_size)
+                   ->setProgress($downloaded_size)
+                   ->render()
+                   ->finish();
 
     }
 

build/Classes/Update/ProtocolFileContent.php

Doc Comments +1 added lines

@@ -72,6 +72,7 @@
     }
 
     /**
+     * @param string $type
      * @return bool
      */
     private function hasEnabled ( $type )

Spacing +16 added lines, -16 removed lines

@@ -20,17 +20,17 @@ 
      */
     private static $objProtocol;
 
-    private function __construct ()
+    private function __construct()
     {
-        $this->parseContentProtocol ();
+        $this->parseContentProtocol();
     }
 
     /**
      * @return \Classes\Update\ProtocolFileContent
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
-        if ( empty( self::$objProtocol ) )
+        if (empty(self::$objProtocol))
         {
             self::$objProtocol = new ProtocolFileContent();
         }
@@ -41,15 +41,15 @@ 
     /**
      * @return bool
      */
-    public function hasProtocol ()
+    public function hasProtocol()
     {
-        return ! empty( $this->protocol );
+        return ! empty($this->protocol);
     }
 
     /**
      * @return string
      */
-    public function getProtocol ()
+    public function getProtocol()
     {
         return $this->protocol;
     }
@@ -57,15 +57,15 @@ 
     /**
      *
      */
-    private function parseContentProtocol ()
+    private function parseContentProtocol()
     {
-        if ( $this->hasEnabled ( 'file_content' ) )
+        if ($this->hasEnabled('file_content'))
         {
             $this->protocol = 'file_content';
-        } elseif ( $this->hasEnabled ( 'steam_content' ) )
+        } elseif ($this->hasEnabled('steam_content'))
         {
             $this->protocol = 'steam_content';
-        } elseif ( $this->hasEnabled ( 'curl' ) )
+        } elseif ($this->hasEnabled('curl'))
         {
             $this->protocol = 'curl';
         }
@@ -74,18 +74,18 @@ 
     /**
      * @return bool
      */
-    private function hasEnabled ( $type )
+    private function hasEnabled($type)
     {
-        switch ( $type )
+        switch ($type)
         {
             case 'curl':
-                return function_exists ( 'fopen' ) && function_exists ( 'curl_exec' );
+                return function_exists('fopen') && function_exists('curl_exec');
                 break;
             case 'file_content':
-                return function_exists ( 'file_get_contents' ) && function_exists ( 'stream_get_contents' );
+                return function_exists('file_get_contents') && function_exists('stream_get_contents');
                 break;
             case 'steam_content':
-                return function_exists ( 'fopen' ) && function_exists ( 'stream_get_contents' );
+                return function_exists('fopen') && function_exists('stream_get_contents');
                 break;
         }
 

build/Classes/Update.php

Indentation +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@
 
         $this->versionUpdate = $version;
         $this->tempFileName = self::$fileName
-                              . self::$separador
-                              . $this->versionUpdate
-                              . self::$extencion;
+                                . self::$separador
+                                . $this->versionUpdate
+                                . self::$extencion;
 
     }
 

Spacing +26 added lines, -26 removed lines

@@ -28,12 +28,12 @@ 
      */
     private $objGitHub;
 
-    public function __construct ( $version = null )
+    public function __construct($version = null)
     {
-        $this->objGitHub = GitHub::getInstance ();
-        if ( is_null ( $version ) )
+        $this->objGitHub = GitHub::getInstance();
+        if (is_null($version))
         {
-            $version = $this->objGitHub->getLastVersion ();
+            $version = $this->objGitHub->getLastVersion();
         }
 
         $this->versionUpdate = $version;
@@ -44,59 +44,59 @@ 
 
     }
 
-    public function update ()
+    public function update()
     {
-        if ( Version::HasNewVersion () && ! Version::equalVersion ( $this->versionUpdate )
+        if (Version::HasNewVersion() && ! Version::equalVersion($this->versionUpdate)
         )
         {
-            $content = $this->objGitHub->getContent ( $this->objGitHub->getLastPhar () , true );
-            if ( $content )
+            $content = $this->objGitHub->getContent($this->objGitHub->getLastPhar(), true);
+            if ($content)
             {
-                $this->objGitHub->putContent ( $this->tempFileName , $content );
+                $this->objGitHub->putContent($this->tempFileName, $content);
             }
         } else
         {
-            printf ( "esta versão é a atual\n" );
+            printf("esta versão é a atual\n");
         }
 
         return $this;
     }
 
-    public function downloadVersion ( $version )
+    public function downloadVersion($version)
     {
-        if ( Version::existVersion ( $version )
-             && ! Version::equalVersion ( $this->versionUpdate )
+        if (Version::existVersion($version)
+             && ! Version::equalVersion($this->versionUpdate)
         )
         {
-            $content = $this->objGitHub->getContent ( $this->objGitHub->getPharByVersion ( $version ) , true );
-            if ( $content )
+            $content = $this->objGitHub->getContent($this->objGitHub->getPharByVersion($version), true);
+            if ($content)
             {
-                $this->objGitHub->putContent ( $this->tempFileName , $content );
+                $this->objGitHub->putContent($this->tempFileName, $content);
             }
         } else
         {
-            if ( ! Version::existVersion ( $version ) )
+            if ( ! Version::existVersion($version))
             {
-                throw new \Exception ( "\033[0;31mError: Esta versão não existe\033[0m\n" );
+                throw new \Exception("\033[0;31mError: Esta versão não existe\033[0m\n");
             }
-            throw new \Exception ( "\033[0;31mError: Esta versão é a atual\033[0m\n" );
+            throw new \Exception("\033[0;31mError: Esta versão é a atual\033[0m\n");
         }
 
         return $this;
     }
 
-    public function modifyTempName ()
+    public function modifyTempName()
     {
-        if ( file_exists ( realpath ( $this->tempFileName ) ) )
+        if (file_exists(realpath($this->tempFileName)))
         {
-            $fileName = realpath ( self::$fileName . self::$extencion );
-            if ( file_exists ( $fileName ) )
+            $fileName = realpath(self::$fileName . self::$extencion);
+            if (file_exists($fileName))
             {
-                unlink ( $fileName );
+                unlink($fileName);
             }
 
-            chmod ( $this->tempFileName , 0777 );
-            rename ( $this->tempFileName , self::$fileName . self::$extencion );
+            chmod($this->tempFileName, 0777);
+            rename($this->tempFileName, self::$fileName . self::$extencion);
 
         }
 

build/Classes/Update/ProgressBar.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             {
                 $length = $this->getProgress ();
                 printf ( "\r[%-100s] %d%%" , str_repeat ( "=" , $length )
-                                             . ">" , $length );
+                                                . ">" , $length );
             }
         }
 

Spacing +20 added lines, -20 removed lines

@@ -14,14 +14,14 @@ 
 
     private $progresslength = 0;
 
-    private function __construct (){ }
+    private function __construct() { }
 
     /**
      * @return \Classes\Update\ProgressBar
      */
-    public static function getInstance ()
+    public static function getInstance()
     {
-        if ( is_null ( self::$progressBar ) )
+        if (is_null(self::$progressBar))
         {
             self::$progressBar = new ProgressBar();
         }
@@ -29,38 +29,38 @@ 
         return self::$progressBar;
     }
 
-    public function setMaxByte ( $bytesMax )
+    public function setMaxByte($bytesMax)
     {
         $this->max = $bytesMax;
 
         return $this;
     }
 
-    public function setProgress ( $progress )
+    public function setProgress($progress)
     {
         $this->progress = $progress;
-        $this->calcule ();
+        $this->calcule();
 
         return $this;
     }
 
-    public function getProgress ()
+    public function getProgress()
     {
         return $this->progresslength;
     }
 
-    public function calcule ()
+    public function calcule()
     {
-        if ( $this->progress > 0 )
+        if ($this->progress > 0)
         {
-            $this->progresslength = round( $this->progress * 100 / $this->max );
+            $this->progresslength = round($this->progress * 100 / $this->max);
             //$this->progresslength = (int) ( ( $this->progress / $this->max ) * 100 );
         }
     }
 
-    public function finish ()
+    public function finish()
     {
-        if ( $this->getProgress () >= 99 && !self::$finished)
+        if ($this->getProgress() >= 99 && ! self::$finished)
         {
             echo "\n\033[1;32mDone!\033[0m\n";
             self::$finished = 1;
@@ -68,25 +68,25 @@ 
 
     }
 
-    public function render ()
+    public function render()
     {
-        if ( $this->progress > 0 && !self::$finished)
+        if ($this->progress > 0 && ! self::$finished)
         {
-            if ( ! isset( $this->max ) )
+            if ( ! isset($this->max))
             {
-                printf ( "\rUnknown filesize.. %2d kb done.." , $this->progress / 1024 );
+                printf("\rUnknown filesize.. %2d kb done..", $this->progress / 1024);
             } else
             {
-                $length = $this->getProgress ();
-                printf ( "\r[%-100s] %d%%" , str_repeat ( "=" , $length )
-                                             . ">" , $length );
+                $length = $this->getProgress();
+                printf("\r[%-100s] %d%%", str_repeat("=", $length)
+                                             . ">", $length);
             }
         }
 
         return $this;
     }
 
-    public function clear ()
+    public function clear()
     {
         $this->max = 0;
         $this->progress = 0;

build/Classes/Update/Content/GitHub.php

Spacing +16 added lines, -16 removed lines

@@ -13,28 +13,28 @@ 
 class GitHub extends AbstractContent
 {
     private static $tagsGithub  = "https://api.github.com/repos/pedro151/orm-generator/tags";
-    private static $listVersion = array ();
+    private static $listVersion = array();
     private        $phar        = "https://raw.githubusercontent.com/pedro151/orm-generator/%s/bin/orm-generator.phar";
     //private        $phar        = "https://github.com/pedro151/orm-generator/blob/%s/bin/orm-generator.phar?raw=true";
 
     /**
      * @return mixed
      */
-    public function getInfo ()
+    public function getInfo()
     {
-        return json_decode ( $this->getContent ( self::$tagsGithub ) );
+        return json_decode($this->getContent(self::$tagsGithub));
     }
 
     /**
      *
      */
-    protected function init ()
+    protected function init()
     {
-        if ( is_array ( $this->getInfo () ) )
+        if (is_array($this->getInfo()))
         {
-            foreach ( $this->getInfo () as $index => $objTag )
+            foreach ($this->getInfo() as $index => $objTag)
             {
-                self::$listVersion[ preg_replace ( "/[^0-9.]/" , "" , $objTag->name ) ] = sprintf ( $this->phar , $objTag->name );
+                self::$listVersion[preg_replace("/[^0-9.]/", "", $objTag->name)] = sprintf($this->phar, $objTag->name);
             }
         }
     }
@@ -42,19 +42,19 @@ 
     /**
      * @return mixed
      */
-    public function getLastVersion ()
+    public function getLastVersion()
     {
-        return current ( array_keys ( self::$listVersion ) );
+        return current(array_keys(self::$listVersion));
     }
 
     /**
      * @return mixed
      */
-    public function getLastPhar ()
+    public function getLastPhar()
     {
-        reset ( self::$listVersion );
+        reset(self::$listVersion);
 
-        return current ( self::$listVersion );
+        return current(self::$listVersion);
     }
 
     /**
@@ -62,14 +62,14 @@ 
      *
      * @return mixed
      */
-    public function getPharByVersion ( $version )
+    public function getPharByVersion($version)
     {
-        return self::$listVersion[ $version ];
+        return self::$listVersion[$version];
     }
 
-    public function hasPharByVersion ( $version )
+    public function hasPharByVersion($version)
     {
-        return isset( self::$listVersion[ $version ] );
+        return isset(self::$listVersion[$version]);
     }
 
 }
\ No newline at end of file

build/Classes/Update/Version.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if ( self::HasNewVersion () )
         {
             return "\033[0;31mThere is a new version " . self::$lastVersion
-                   . " available\033[0m \n";
+                    . " available\033[0m \n";
         }
     }
 

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @return string
      */
-    public static function getVersion ()
+    public static function getVersion()
     {
         return static::$_currentVersion;
     }
@@ -23,9 +23,9 @@ 
     /**
      * @return bool
      */
-    public static function HasNewVersion ()
+    public static function HasNewVersion()
     {
-        self::$lastVersion = GitHub::getInstance ()->getLastVersion ();
+        self::$lastVersion = GitHub::getInstance()->getLastVersion();
 
         return self::$lastVersion > static::$_currentVersion;
     }
@@ -33,9 +33,9 @@ 
     /**
      * @return string
      */
-    public function messageHasNewVersion ()
+    public function messageHasNewVersion()
     {
-        if ( self::HasNewVersion () )
+        if (self::HasNewVersion())
         {
             return "\033[0;31mThere is a new version " . self::$lastVersion
                    . " available\033[0m \n";
@@ -47,14 +47,14 @@ 
      *
      * @return bool
      */
-    public static function equalVersion ( $version )
+    public static function equalVersion($version)
     {
-        return $version === self::getVersion ();
+        return $version === self::getVersion();
     }
 
-    public static function existVersion ( $version )
+    public static function existVersion($version)
     {
-        return GitHub::getInstance ()->hasPharByVersion ( $version );
+        return GitHub::getInstance()->hasPharByVersion($version);
     }
 
 }
\ No newline at end of file

build/Classes/MakerFile.php

Indentation +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
         foreach ( $arrFoldersName as $index => $folderName )
         {
             $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+                                                ->replaceReservedWord ( $folderName );
         }
 
         return implode ( DIRECTORY_SEPARATOR , array_filter ( $arrFoldersName ) );
@@ -157,7 +157,7 @@ 
                 $folderName ,
                 $this->getClassName (
                     $this->getConfig ()
-                         ->getDatabase ()
+                            ->getDatabase ()
                 )
             );
             $this->location = array ( $this->filterLocation ( $url ) );

Spacing +122 added lines, -122 removed lines

@@ -22,7 +22,7 @@ 
     /**
      * @type string[]
      */
-    public $location = array ();
+    public $location = array();
 
     /**
      * caminho de pastas Base
@@ -46,46 +46,46 @@ 
 
     private $msgReservedWord = "\033[0mPlease enter the value for reserved word \033[0;31m'%index%' \033[1;33m[%config%]:\033[0m ";
 
-    public function __construct ( Config $config )
+    public function __construct(Config $config)
     {
-        $this->config = $config->getAdapterConfig ();
-        $this->parseReservedWord ( $this->getConfig () );
-        $this->driver = $config->getAdapterDriver ( $this->getConfig () );
-        $this->parseLocation ( $config->_basePath );
+        $this->config = $config->getAdapterConfig();
+        $this->parseReservedWord($this->getConfig());
+        $this->driver = $config->getAdapterDriver($this->getConfig());
+        $this->parseLocation($config->_basePath);
     }
 
     /**
      * @param AdapterConfig\AbstractAdapter $config
      */
-    public function parseReservedWord ( AdapterConfig\AbstractAdapter $config )
+    public function parseReservedWord(AdapterConfig\AbstractAdapter $config)
     {
         $palavrasReservadas = $config->reservedWord;
-        if ( ! $palavrasReservadas )
+        if ( ! $palavrasReservadas)
         {
             return;
         }
 
-        $schema = $config->getSchemas ();
-        $db = $config->getDatabase ();
-        $hasSchema = array_intersect ( $schema , array_flip ( $palavrasReservadas ) );
-        $hasDatabase = in_array ( $db , $palavrasReservadas );
-        if ( ! ( $hasSchema or $hasDatabase ) )
+        $schema = $config->getSchemas();
+        $db = $config->getDatabase();
+        $hasSchema = array_intersect($schema, array_flip($palavrasReservadas));
+        $hasDatabase = in_array($db, $palavrasReservadas);
+        if ( ! ($hasSchema or $hasDatabase))
         {
             return;
         }
 
         echo "- database has reserved words\n";
-        foreach ( $palavrasReservadas as $index => $config )
+        foreach ($palavrasReservadas as $index => $config)
         {
-            $attribs = array (
-                "%index%"  => $index ,
+            $attribs = array(
+                "%index%"  => $index,
                 "%config%" => $config
             );
-            echo strtr ( $this->msgReservedWord , $attribs );
-            $line = trim ( fgets ( STDIN ) );
-            if ( ! empty( $line ) )
+            echo strtr($this->msgReservedWord, $attribs);
+            $line = trim(fgets(STDIN));
+            if ( ! empty($line))
             {
-                $this->getConfig ()->reservedWord[ $index ] = $line;
+                $this->getConfig()->reservedWord[$index] = $line;
             }
         }
     }
@@ -95,199 +95,199 @@ 
      *
      * @return string
      */
-    private function filterLocation ( $arrFoldersName )
+    private function filterLocation($arrFoldersName)
     {
-        foreach ( $arrFoldersName as $index => $folderName )
+        foreach ($arrFoldersName as $index => $folderName)
         {
-            $arrFoldersName[ $index ] = $this->getConfig ()
-                                             ->replaceReservedWord ( $folderName );
+            $arrFoldersName[$index] = $this->getConfig()
+                                             ->replaceReservedWord($folderName);
         }
 
-        return implode ( DIRECTORY_SEPARATOR , array_filter ( $arrFoldersName ) );
+        return implode(DIRECTORY_SEPARATOR, array_filter($arrFoldersName));
     }
 
     /**
      * Analisa os caminhos das pastas base
      */
-    public function parseLocation ( $basePath )
+    public function parseLocation($basePath)
     {
 
-        $arrBase = array (
-            $basePath ,
+        $arrBase = array(
+            $basePath,
             $this->config->path
         );
 
-        $this->baseLocation = $this->filterLocation ( $arrBase );
+        $this->baseLocation = $this->filterLocation($arrBase);
 
         # pasta com nome do driver do banco
         $driverBase = '';
-        if ( (bool) @$this->config->{"folder-database"} )
+        if ((bool) @$this->config->{"folder-database"} )
         {
-            $classDriver = explode ( '\\' , get_class ( $this->driver ) );
-            $driverBase = end ( $classDriver );
+            $classDriver = explode('\\', get_class($this->driver));
+            $driverBase = end($classDriver);
         }
         $folderName = '';
-        if ( (bool) @$this->config->{"folder-name"} )
+        if ((bool) @$this->config->{"folder-name"} )
         {
-            $folderName = $this->getClassName ( trim ( $this->config->{"folder-name"} ) );
+            $folderName = $this->getClassName(trim($this->config->{"folder-name"} ));
         }
 
-        if ( $this->config->hasSchemas () )
+        if ($this->config->hasSchemas())
         {
 
-            $schemas = $this->config->getSchemas ();
-            foreach ( $schemas as $schema )
+            $schemas = $this->config->getSchemas();
+            foreach ($schemas as $schema)
             {
-                $arrUrl = array (
-                    $this->baseLocation ,
-                    $driverBase ,
-                    $folderName ,
-                    $this->getClassName ( $schema )
+                $arrUrl = array(
+                    $this->baseLocation,
+                    $driverBase,
+                    $folderName,
+                    $this->getClassName($schema)
                 );
 
-                $this->location[ $schema ] = $this->filterLocation ( $arrUrl );
-                unset( $arrUrl );
+                $this->location[$schema] = $this->filterLocation($arrUrl);
+                unset($arrUrl);
             }
 
         } else
         {
-            $url = array (
-                $this->baseLocation ,
-                $driverBase ,
-                $folderName ,
-                $this->getClassName (
-                    $this->getConfig ()
-                         ->getDatabase ()
+            $url = array(
+                $this->baseLocation,
+                $driverBase,
+                $folderName,
+                $this->getClassName(
+                    $this->getConfig()
+                         ->getDatabase()
                 )
             );
-            $this->location = array ( $this->filterLocation ( $url ) );
-            unset( $url );
+            $this->location = array($this->filterLocation($url));
+            unset($url);
         }
     }
 
     /**
      * @return AdapterConfig\AbstractAdapter
      */
-    public function getConfig ()
+    public function getConfig()
     {
         return $this->config;
     }
 
     /* Get current time */
-    public function startTime ()
+    public function startTime()
     {
         echo "\033[1;32mStarting..\033[0m\n";
-        $this->startTime = microtime ( true );
+        $this->startTime = microtime(true);
     }
 
-    private function getRunTime ()
+    private function getRunTime()
     {
-        return round ( ( microtime ( true ) - $this->startTime ) , 3 );
+        return round((microtime(true) - $this->startTime), 3);
     }
 
     /**
      * @param $objMakeFile
      */
-    private function generateFilesFixed ( FilesFixeds $objFilesFixeds )
+    private function generateFilesFixed(FilesFixeds $objFilesFixeds)
     {
-        if ( $objFilesFixeds->hasData () )
+        if ($objFilesFixeds->hasData())
         {
             $file = $this->baseLocation
                     . DIRECTORY_SEPARATOR
-                    . $objFilesFixeds->getFileName ()
+                    . $objFilesFixeds->getFileName()
                     . '.php';
 
-            $tpl = $this->getParsedTplContents ( $objFilesFixeds->getTpl () );
-            self::makeSourcer ( $file , $tpl , true );
+            $tpl = $this->getParsedTplContents($objFilesFixeds->getTpl());
+            self::makeSourcer($file, $tpl, true);
         }
     }
 
     /**
      * Executa o Make, criando arquivos e Diretorios
      */
-    public function run ()
+    public function run()
     {
         $cur = 0;
         $numFilesCreated = 0;
         $numFilesIgnored = 0;
 
-        $this->startTime ();
-        $this->waitOfDatabase ( $cur );
+        $this->startTime();
+        $this->waitOfDatabase($cur);
 
-        $this->max = $this->driver->getTotalTables () * $this->countDiretory ();
-        $progressBar = ProgressBar::getInstance ()->setMaxByte ( $this->max );
+        $this->max = $this->driver->getTotalTables() * $this->countDiretory();
+        $progressBar = ProgressBar::getInstance()->setMaxByte($this->max);
 
-        foreach ( $this->location as $schema => $location )
+        foreach ($this->location as $schema => $location)
         {
-            foreach ( $this->factoryMakerFile () as $objMakeFile )
+            foreach ($this->factoryMakerFile() as $objMakeFile)
             {
-                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName ();
-                if ( $this->config->isCleanTrash () )
+                $path = $location . DIRECTORY_SEPARATOR . $objMakeFile->getPastName();
+                if ($this->config->isCleanTrash())
                 {
-                    CleanTrash::getInstance ()->run ( $path , $this->driver , $schema );
+                    CleanTrash::getInstance()->run($path, $this->driver, $schema);
                 }
-                self::makeDir ( $path );
+                self::makeDir($path);
 
                 #Cria as Classes de Exceção e Abstratas
-                foreach ( $objMakeFile->getListFilesFixed () as $nameObject )
+                foreach ($objMakeFile->getListFilesFixed() as $nameObject)
                 {
-                    $this->generateFilesFixed ( $objMakeFile->getFilesFixeds ( $nameObject ) );
+                    $this->generateFilesFixed($objMakeFile->getFilesFixeds($nameObject));
                 }
 
                 #Cria as Classes do Banco
-                foreach ( $this->driver->getTables ( $schema ) as $key => $objTables )
+                foreach ($this->driver->getTables($schema) as $key => $objTables)
                 {
                     $file = $path . DIRECTORY_SEPARATOR
-                            . self::getClassName ( $objTables->getName () ) . '.php';
+                            . self::getClassName($objTables->getName()) . '.php';
 
-                    $tpl = $this->getParsedTplContents (
-                        $objMakeFile->getFileTpl () ,
-                        $objMakeFile->parseRelation ( $this , $objTables ) ,
-                        $objTables ,
+                    $tpl = $this->getParsedTplContents(
+                        $objMakeFile->getFileTpl(),
+                        $objMakeFile->parseRelation($this, $objTables),
+                        $objTables,
                         $objMakeFile
 
                     );
-                    if ( self::makeSourcer ( $file , $tpl , $objMakeFile->isOverwrite () ) )
+                    if (self::makeSourcer($file, $tpl, $objMakeFile->isOverwrite()))
                     {
-                        ++ $numFilesCreated;
+                        ++$numFilesCreated;
                     } else
                     {
-                        ++ $numFilesIgnored;
+                        ++$numFilesIgnored;
                     }
 
                     ++$cur;
-                    $progressBar->setProgress ( $cur )->render();
+                    $progressBar->setProgress($cur)->render();
                 }
             }
         }
 
-        $this->reportProcess ( $numFilesCreated , $numFilesIgnored );
+        $this->reportProcess($numFilesCreated, $numFilesIgnored);
         $progressBar->finish();
     }
 
-    private function waitOfDatabase ( &$cur )
+    private function waitOfDatabase(&$cur)
     {
-        printf ( "\033[1;33mWait, the database is being analyzed..\033[0m\n" );
-        $this->driver->runDatabase ();
+        printf("\033[1;33mWait, the database is being analyzed..\033[0m\n");
+        $this->driver->runDatabase();
     }
 
-    private function reportProcess ( $numFilesCreated = 0 , $numFilesIgnored = 0 )
+    private function reportProcess($numFilesCreated = 0, $numFilesIgnored = 0)
     {
-        if ( $this->config->isStatusEnabled () )
+        if ($this->config->isStatusEnabled())
         {
-            $databases = count ( $this->location );
-            $countDir = $this->countDiretory ();
-            $totalTable = $this->driver->getTotalTables ();
+            $databases = count($this->location);
+            $countDir = $this->countDiretory();
+            $totalTable = $this->driver->getTotalTables();
             $totalFiles = $numFilesIgnored + $numFilesCreated;
-            $totalFilesDeleted = CleanTrash::getInstance ()->getNumFilesDeleted ();
+            $totalFilesDeleted = CleanTrash::getInstance()->getNumFilesDeleted();
             echo "\n------";
-            printf ( "\n\r-Files generated/updated: \033[1;33m%s\033[0m" , $numFilesCreated );
-            printf ( "\n\r-Files not upgradeable: \033[1;33m%s\033[0m" , $numFilesIgnored );
-            printf ( "\n\r-Files deleted: \033[1;33m%s\033[0m" , $totalFilesDeleted );
-            printf ( "\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m" , $totalFiles , $this->max );
-            printf ( "\n\r-Diretories: \033[1;33m%s\033[0m" , $databases * $countDir );
-            printf ( "\n\r-Scanned tables: \033[1;33m%s\033[0m" , $totalTable );
-            printf ( "\n\r-Execution time: \033[1;33m%ssec\033[0m" , $this->getRunTime () );
+            printf("\n\r-Files generated/updated: \033[1;33m%s\033[0m", $numFilesCreated);
+            printf("\n\r-Files not upgradeable: \033[1;33m%s\033[0m", $numFilesIgnored);
+            printf("\n\r-Files deleted: \033[1;33m%s\033[0m", $totalFilesDeleted);
+            printf("\n\r-Total files analyzed: \033[1;33m%s of %s\033[0m", $totalFiles, $this->max);
+            printf("\n\r-Diretories: \033[1;33m%s\033[0m", $databases * $countDir);
+            printf("\n\r-Scanned tables: \033[1;33m%s\033[0m", $totalTable);
+            printf("\n\r-Execution time: \033[1;33m%ssec\033[0m", $this->getRunTime());
             echo "\n------";
         }
     }
@@ -297,9 +297,9 @@ 
      *
      * @return AbstractAdapter[]
      */
-    public function factoryMakerFile ()
+    public function factoryMakerFile()
     {
-        return $this->config->getMakeFileInstances ();
+        return $this->config->getMakeFileInstances();
     }
 
     /**
@@ -307,16 +307,16 @@ 
      *
      * @return int
      */
-    public function countDiretory ()
+    public function countDiretory()
     {
-        if ( null === $this->countDir )
+        if (null === $this->countDir)
         {
             $this->countDir = 1;
-            foreach ( $this->factoryMakerFile () as $abstractAdapter )
+            foreach ($this->factoryMakerFile() as $abstractAdapter)
             {
-                if ( $abstractAdapter->hasDiretory () )
+                if ($abstractAdapter->hasDiretory())
                 {
-                    ++ $this->countDir;
+                    ++$this->countDir;
                 }
             }
         }
@@ -332,25 +332,25 @@ 
      *
      * @return String
      */
-    protected function getParsedTplContents (
-        $tplFile , $vars = array () , \Classes\Db\DbTable $objTables = null ,
+    protected function getParsedTplContents(
+        $tplFile, $vars = array(), \Classes\Db\DbTable $objTables = null,
         $objMakeFile = null
-    ){
+    ) {
 
-        $arrUrl = array (
-            __DIR__ ,
-            'templates' ,
-            $this->config->framework ,
+        $arrUrl = array(
+            __DIR__,
+            'templates',
+            $this->config->framework,
             $tplFile
         );
 
-        $filePath = implode ( DIRECTORY_SEPARATOR , filter_var_array ( $arrUrl ) );
+        $filePath = implode(DIRECTORY_SEPARATOR, filter_var_array($arrUrl));
 
-        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 +4 added lines, -4 removed lines

@@ -160,14 +160,14 @@ 
     {
         $update = new Update();
         $update->update ()
-               ->modifyTempName ();
+                ->modifyTempName ();
     }
 
     public function download ( $version )
     {
         $update = new Update();
         $update->downloadVersion ( $version )
-               ->modifyTempName ();
+                ->modifyTempName ();
     }
 
     public function getVersion ()
@@ -193,7 +193,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 );
@@ -207,7 +207,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

@@ -55,7 +55,7 @@ 
     /**
      * @var array
      */
-    private $argv = array ();
+    private $argv = array();
 
     /**
      * @var \Classes\AdapterConfig\AbstractAdapter
@@ -67,56 +67,56 @@ 
      */
     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).",
         'update'      => ".",
         'download'    => ""
     );
 
-    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;
         }
-        if ( array_key_exists ( 'update' , $argv ) )
+        if (array_key_exists('update', $argv))
         {
-            die ( $this->update () );
+            die ($this->update());
         }
-        if ( array_key_exists ( 'download' , $argv ) )
+        if (array_key_exists('download', $argv))
         {
-            die ( $this->download ( $argv[ 'download' ] ) );
+            die ($this->download($argv['download']));
         }
 
-        $this->argv = $this->parseConfig ( $basePath , $argv );
+        $this->argv = $this->parseConfig($basePath, $argv);
     }
 
     /**
@@ -124,10 +124,10 @@ 
      *
      * @return string
      */
-    public function getUsage ()
+    public function getUsage()
     {
-        $version = $this->getVersion ();
-        $list = $this->renderParam ();
+        $version = $this->getVersion();
+        $list = $this->renderParam();
 
         return <<<EOF
 parameters:
@@ -138,12 +138,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
@@ -156,21 +156,21 @@ 
         return $return;
     }
 
-    public function update ()
+    public function update()
     {
         $update = new Update();
-        $update->update ()
-               ->modifyTempName ();
+        $update->update()
+               ->modifyTempName();
     }
 
-    public function download ( $version )
+    public function download($version)
     {
         $update = new Update();
-        $update->downloadVersion ( $version )
-               ->modifyTempName ();
+        $update->downloadVersion($version)
+               ->modifyTempName();
     }
 
-    public function getVersion ()
+    public function getVersion()
     {
         $version = new Version();
 
@@ -186,31 +186,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);
     }
 
     /**
@@ -220,24 +220,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)];
     }
 
     /**
@@ -251,32 +251,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");
             }
         }
 
@@ -289,16 +289,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);
         }
 
     }
@@ -310,33 +310,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;
@@ -345,11 +345,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;