bb-drummer / my-application

module/Application/src/Application/Controller/Traits/ControllerActiontitlesTrait.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function getActionTitles() 
     {
-        return $this->actionTitles ;
+        return $this->actionTitles;
     }
 
     /**

module/Application/src/Application/Controller/Traits/ControllerToolbarTrait.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function getToolbarItems() 
     {
-        return $this->toolbarItems ;
+        return $this->toolbarItems;
     }
     
     /**

module/Application/src/Application/Controller/Traits/ControllerTranslatorTrait.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 trait ControllerTranslatorTrait {
 
-	/**
+    /**
      * 
      * @var \Zend\I18n\Translator\Translator
      */

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function translate($message, $textdomain = 'default', $locale = null) 
     {
-        return ( $this->getTranslator()->translate($message, $textdomain, $locale) );
+        return ($this->getTranslator()->translate($message, $textdomain, $locale));
     }
     
 }

module/Application/src/Application/Controller/BaseActionController.php

Indentation +18 added lines, -18 removed lines

@@ -34,10 +34,10 @@ 
  */
 class BaseActionController extends AbstractActionController implements Dispatchable
 {
-	//use ServiceLocatorAwareTrait;
-	use ControllerTranslatorTrait;
-	use ControllerActiontitlesTrait;
-	use ControllerToolbarTrait;
+    //use ServiceLocatorAwareTrait;
+    use ControllerTranslatorTrait;
+    use ControllerActiontitlesTrait;
+    use ControllerToolbarTrait;
     
     //protected $serviceLocator;
     
@@ -48,9 +48,9 @@ 
      */
     public function __construct( ServiceLocatorInterface $serviceLocator )
     {
-    	if ( $serviceLocator ) {
-    		$this->setServiceLocator($serviceLocator);
-    	}
+        if ( $serviceLocator ) {
+            $this->setServiceLocator($serviceLocator);
+        }
     }
     
     /**
@@ -147,17 +147,17 @@ 
      */
     public function isXHR()
     {
-    	/**
-    	 * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
-    	 */
-    	$request = $this->getRequest();
-    	if ( 
-    		($request instanceof \Zend\Http\PhpEnvironment\Request) ||
-    		($request instanceof \Zend\Http\Request) 
-    	) {
-    		return ( $request->isXmlHttpRequest() );
-    	}
-    	return (false);
+        /**
+         * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
+         */
+        $request = $this->getRequest();
+        if ( 
+            ($request instanceof \Zend\Http\PhpEnvironment\Request) ||
+            ($request instanceof \Zend\Http\Request) 
+        ) {
+            return ( $request->isXmlHttpRequest() );
+        }
+        return (false);
     }
     
     /**

Spacing +5 added lines, -5 removed lines

@@ -46,9 +46,9 @@ 
      * basic constructor injecting global service manager/locator
      * @return self
      */
-    public function __construct( ServiceLocatorInterface $serviceLocator )
+    public function __construct(ServiceLocatorInterface $serviceLocator)
     {
-    	if ( $serviceLocator ) {
+    	if ($serviceLocator) {
     		$this->setServiceLocator($serviceLocator);
     	}
     }
@@ -134,7 +134,7 @@ 
     {
 
         $oAuth = $this->getServiceLocator()->get('zfcuser_auth_service');
-        if ($oAuth->hasIdentity() ) {
+        if ($oAuth->hasIdentity()) {
             return $oAuth->getIdentity();
         }
         return null;
@@ -155,7 +155,7 @@ 
     		($request instanceof \Zend\Http\PhpEnvironment\Request) ||
     		($request instanceof \Zend\Http\Request) 
     	) {
-    		return ( $request->isXmlHttpRequest() );
+    		return ($request->isXmlHttpRequest());
     	}
     	return (false);
     }
@@ -179,7 +179,7 @@ 
      * @param array $vars [optional] additional variables
      * @return array
      */
-    public function getTemplateVars( $vars = array() ) 
+    public function getTemplateVars($vars = array()) 
     {
         $result = (array_merge( 
             $this->params()->fromRoute(), 

module/Application/src/Application/Model/DbStructUpdater.php

Indentation +90 added lines, -90 removed lines

@@ -60,20 +60,20 @@ 
     var $config = array();//updater configuration
 
     /**
-    * Constructor
+     * Constructor
      *
-    * @access public
-    */
+     * @access public
+     */
     public function __construct()
     {
         $this->init();
     }
 
     /**
-    * Constructor
+     * Constructor
      *
-    * @access public
-    */
+     * @access public
+     */
     public function dbStructUpdater()
     {
         $this->init();
@@ -96,10 +96,10 @@ 
     }
 
     /**
-    * merges current updater config with the given one
+     * merges current updater config with the given one
      *
-    * @param assoc_array $config new configuration values
-    */
+     * @param assoc_array $config new configuration values
+     */
     public function setConfig($config=array())
     {
         if (is_array($config)) {
@@ -108,14 +108,14 @@ 
     }
 
     /**
-    * Returns array of update SQL with default options, $source, $dest - database structures
+     * Returns array of update SQL with default options, $source, $dest - database structures
      *
-    * @access public
-    * @param  string $source   structure dump of database to update
-    * @param  string $dest     structure dump of the reference database
-    * @param  bool   $asString if true - result will be a string, otherwise - array
-    * @return array|string update sql statements - in array or string (separated with ';')
-    */
+     * @access public
+     * @param  string $source   structure dump of database to update
+     * @param  string $dest     structure dump of the reference database
+     * @param  bool   $asString if true - result will be a string, otherwise - array
+     * @return array|string update sql statements - in array or string (separated with ';')
+     */
     public function getUpdates($source, $dest, $asString=false)
     {
         $result = $asString?'':array();
@@ -135,8 +135,8 @@ 
     }
 
     /**
-    * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
-    */
+     * Filters comparison result and lefts only sync actions allowed by 'updateTypes' option
+     */
     public function filterDiffs($compRes)
     {
         $result = array();
@@ -185,9 +185,9 @@ 
     }
     

     /**
-    * Gets structured general info about the databases diff :
-    * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
-    */
+     * Gets structured general info about the databases diff :
+     * array(sourceOrphans=>array(...), destOrphans=>array(...), different=>array(...))
+     */
     public function getDiffInfo($compRes)
     {        

         if (!is_array($compRes)) {
@@ -211,20 +211,20 @@ 
     }
 
     /**
-    * Makes comparison of the given database structures, support some options
+     * Makes comparison of the given database structures, support some options
      *
-    * @access private
-    * @param  string $source and $dest are strings - database tables structures
-    * @return array
-    * - table (array)
-    *        - destOrphan (boolean)
-    *        - sourceOrphan (boolean)
-    *        - differs (array) OR (boolean) false if no diffs
-    *            - [0](array)
-    *                - source (string) structure definition line in the out-of-date table
-    *                - dest (string) structure definition line in the reference table
-    *            - [1](array) ...
-    */
+     * @access private
+     * @param  string $source and $dest are strings - database tables structures
+     * @return array
+     * - table (array)
+     *        - destOrphan (boolean)
+     *        - sourceOrphan (boolean)
+     *        - differs (array) OR (boolean) false if no diffs
+     *            - [0](array)
+     *                - source (string) structure definition line in the out-of-date table
+     *                - dest (string) structure definition line in the reference table
+     *            - [1](array) ...
+     */
     private function compare($source, $dest)
     {
         $this->sourceStruct = $source;
@@ -270,11 +270,11 @@ 
     }
 
     /**
-    * Retrieves list of table names from the database structure dump
+     * Retrieves list of table names from the database structure dump
      *
-    * @access private
-    * @param  string $struct database structure listing
-    */
+     * @access private
+     * @param  string $struct database structure listing
+     */
     private function getTableList($struct)
     {
         $result = array();
@@ -288,14 +288,14 @@ 
     }
 
     /**
-    * Retrieves table structure definition from the database structure dump
+     * Retrieves table structure definition from the database structure dump
      *
-    * @access private
-    * @param  string $struct         database structure listing
-    * @param  string $tab            table name
-    * @param  bool   $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
-    * @return string table structure definition
-    */
+     * @access private
+     * @param  string $struct         database structure listing
+     * @param  string $tab            table name
+     * @param  bool   $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
+     * @return string table structure definition
+     */
     private function getTabSql($struct, $tab, $removeDatabase=true)
     {
         $result = '';
@@ -323,8 +323,8 @@ 
     }
     

     /**
-    * Splits table sql into indexed array
-    */
+     * Splits table sql into indexed array
+     */
     public function splitTabSql($sql)
     {
         $result = array();
@@ -365,18 +365,18 @@ 
     }
 
     /**
-    * returns array of fields or keys definitions that differs in the given tables structure
+     * returns array of fields or keys definitions that differs in the given tables structure
      *
-    * @access private
-    * @param  sring $sourceSql table structure
-    * @param  sring $destSql   right table structure supports some $options
-    * supports some $options
-    * @return array
-    *     - [0]
-    *         - source (string) out-of-date table field definition
-    *         - dest (string) reference table field definition
-    *     - [1]...
-    */
+     * @access private
+     * @param  sring $sourceSql table structure
+     * @param  sring $destSql   right table structure supports some $options
+     * supports some $options
+     * @return array
+     *     - [0]
+     *         - source (string) out-of-date table field definition
+     *         - dest (string) reference table field definition
+     *     - [1]...
+     */
     private function compareSql($sourceSql, $destSql)//$sourceSql, $destSql
     {
         $result = array();        

@@ -439,14 +439,14 @@ 
     }
 
     /**
-    * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
-    * defines field or key desribed
+     * Transforms table structure defnition line into key=>value pair where the key is a string that uniquely
+     * defines field or key desribed
      *
-    * @access private
-    * @param  string $line field definition string
-    * @return array array with single key=>value pair as described in the description
-    * implements some options
-    */
+     * @access private
+     * @param  string $line field definition string
+     * @return array array with single key=>value pair as described in the description
+     * implements some options
+     */
     private function processLine($line)
     {
         $options = $this->config;
@@ -484,14 +484,14 @@ 
     }
 
     /**
-    * Takes an output of compare() method to generate the set of sql needed to update source table to make it
-    * look as a destination one
+     * Takes an output of compare() method to generate the set of sql needed to update source table to make it
+     * look as a destination one
      *
-    * @access private
-    * @param  array $diff compare() method output
-    * @return array list of sql statements
-    * supports query generation options
-    */
+     * @access private
+     * @param  array $diff compare() method output
+     * @return array list of sql statements
+     * supports query generation options
+     */
     private function getDiffSql($diff)//maybe add option to ommit or force 'IF NOT EXISTS', skip autoincrement
     {
         $options = $this->config;
@@ -548,14 +548,14 @@ 
     }
 
     /**
-    * Compiles update sql
+     * Compiles update sql
      *
-    * @access private
-    * @param  string $action - 'drop', 'add' or 'modify'
-    * @param  string $tab    table name
-    * @param  string $sql    definition of the element to change
-    * @return string update sql
-    */
+     * @access private
+     * @param  string $action - 'drop', 'add' or 'modify'
+     * @param  string $tab    table name
+     * @param  string $sql    definition of the element to change
+     * @return string update sql
+     */
     private function getActionSql($action, $tab, $sql)
     {
         $result = 'ALTER TABLE `'.$tab.'` ';
@@ -621,14 +621,14 @@ 
     }
 
     /**
-    * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
-    * like "this ; ".
-    *
-    * Handles escaped \" and \'. Also handles sql comments.
-    * Actualy it is regex-based Finit State Machine (FSN)
-    *
-    * $skipInBrackets - if true, delimiter will be skipped if located inside (brackets) which are not string literals or comment parts
-    */
+     * Searches for the position of the next delimiter which is not inside string literal like 'this ; ' or
+     * like "this ; ".
+     *
+     * Handles escaped \" and \'. Also handles sql comments.
+     * Actualy it is regex-based Finit State Machine (FSN)
+     *
+     * $skipInBrackets - if true, delimiter will be skipped if located inside (brackets) which are not string literals or comment parts
+     */
     public function getDelimPos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $stack = array();
@@ -701,9 +701,9 @@ 
     }
     

     /**
-    * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
-    * the end of the string
-    */
+     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
+     * the end of the string
+     */
     public function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);

Switch Indentation +33 added lines, -33 removed lines

@@ -568,39 +568,39 @@
             $fields = trim($m[3]);
             switch($action)
             {
-            case 'drop':
-                if ($type=='primary') {
-                    $result.= 'DROP PRIMARY KEY';
-                }
-                else
-                {
-                    $result.= 'DROP INDEX `'.$name.'`';
-                }
-                break;
-            case 'add':
-                if ($type=='primary') {
-                    $result.= 'ADD PRIMARY KEY '.$fields;
-                }
-                elseif ($type=='') {
-                    $result.= 'ADD INDEX `'.$name.'` '.$fields;
-                }
-                else
-                {
-                    $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
-                }
-                break;
-            case 'modify':
-                if ($type=='primary') {
-                    $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
-                }
-                elseif ($type=='') {
-                    $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
-                }
-                else
-                {
-                    $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
-                }
-                break;
+                case 'drop':
+                    if ($type=='primary') {
+                        $result.= 'DROP PRIMARY KEY';
+                    }
+                    else
+                    {
+                        $result.= 'DROP INDEX `'.$name.'`';
+                    }
+                    break;
+                case 'add':
+                    if ($type=='primary') {
+                        $result.= 'ADD PRIMARY KEY '.$fields;
+                    }
+                    elseif ($type=='') {
+                        $result.= 'ADD INDEX `'.$name.'` '.$fields;
+                    }
+                    else
+                    {
+                        $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                    }
+                    break;
+                case 'modify':
+                    if ($type=='primary') {
+                        $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
+                    }
+                    elseif ($type=='') {
+                        $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
+                    }
+                    else
+                    {
+                        $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                    }
+                    break;
 
             }
         }

Spacing +74 added lines, -74 removed lines

@@ -55,9 +55,9 @@ 
 */
 class DbStructUpdater
 {
-    var $sourceStruct = '';//structure dump of the reference database
-    var $destStruct = '';//structure dump of database to update
-    var $config = array();//updater configuration
+    var $sourceStruct = ''; //structure dump of the reference database
+    var $destStruct = ''; //structure dump of database to update
+    var $config = array(); //updater configuration
 
     /**
     * Constructor
@@ -100,7 +100,7 @@ 
      *
     * @param assoc_array $config new configuration values
     */
-    public function setConfig($config=array())
+    public function setConfig($config = array())
     {
         if (is_array($config)) {
             $this->config = array_merge($this->config, $config);
@@ -116,9 +116,9 @@ 
     * @param  bool   $asString if true - result will be a string, otherwise - array
     * @return array|string update sql statements - in array or string (separated with ';')
     */
-    public function getUpdates($source, $dest, $asString=false)
+    public function getUpdates($source, $dest, $asString = false)
     {
-        $result = $asString?'':array();
+        $result = $asString ? '' : array();
         $compRes = $this->compare($source, $dest);
         if (empty($compRes)) {
             return $result;
@@ -149,7 +149,7 @@ 
         }
         $allowedActions = array('create', 'drop', 'add', 'remove', 'modify');
         $updateActions = array_intersect($updateActions, $allowedActions);
-        foreach($compRes as $table=>$info)
+        foreach ($compRes as $table=>$info)
         {
             if ($info['sourceOrphan']) {
                 if (in_array('create', $updateActions)) {
@@ -161,7 +161,7 @@ 
                     $result[$table] = $info;
                 }
             }
-            elseif($info['differs']) {
+            elseif ($info['differs']) {
                 $resultInfo = $info;
                 unset($resultInfo['differs']);
                 foreach ($info['differs'] as $diff)
@@ -172,7 +172,7 @@ 
                     elseif (empty($diff['source']) && in_array('remove', $updateActions)) {
                         $resultInfo['differs'][] = $diff;
                     }
-                    elseif(in_array('modify', $updateActions)) {
+                    elseif (in_array('modify', $updateActions)) {
                         $resultInfo['differs'][] = $diff;
                     }
                 }
@@ -194,7 +194,7 @@ 
             return false;
         }
         $result = array('sourceOrphans'=>array(), 'destOrphans'=>array(), 'different'=>array());
-        foreach($compRes as $table=>$info)
+        foreach ($compRes as $table=>$info)
         {
             if ($info['sourceOrphan']) {
                 $result['sourceOrphans'][] = $table;
@@ -242,7 +242,7 @@ 
         foreach ($all as $tab)
         {
             $info = array('destOrphan'=>false, 'sourceOrphan'=>false, 'differs'=>false);
-            if(in_array($tab, $destOrphans)) {
+            if (in_array($tab, $destOrphans)) {
                 $info['destOrphan'] = true;
             }
             elseif (in_array($tab, $sourceOrphans)) {
@@ -253,7 +253,7 @@ 
                 $destSql = $this->getTabSql($this->destStruct, $tab, true);
                 $sourceSql = $this->getTabSql($this->sourceStruct, $tab, true);
                 $diffs = $this->compareSql($sourceSql, $destSql);                

-                if ($diffs===false) {
+                if ($diffs === false) {
                     trigger_error('[WARNING] error parsing definition of table "'.$tab.'" - skipped');
                     continue;
                 }
@@ -261,7 +261,7 @@ 
                 {
                     $info['differs'] = $diffs;                    

                 }                

-                else { continue;//empty array
+                else { continue; //empty array
                 }         
             }
             $result[$tab] = $info;
@@ -279,7 +279,7 @@ 
     {
         $result = array();
         if (preg_match_all('/CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?(?:`?(\w+)`?\.)?`?(\w+)`?/i', $struct, $m)) {
-            foreach($m[2] as $match)//m[1] is a database name if any
+            foreach ($m[2] as $match)//m[1] is a database name if any
             {
                 $result[] = $match;
             }
@@ -296,7 +296,7 @@ 
     * @param  bool   $removeDatabase - either to remove database name in "CREATE TABLE database.tab"-like declarations
     * @return string table structure definition
     */
-    private function getTabSql($struct, $tab, $removeDatabase=true)
+    private function getTabSql($struct, $tab, $removeDatabase = true)
     {
         $result = '';
         /* create table should be single line in this case*/
@@ -305,14 +305,14 @@ 
             $tableDef = $m[0][0];
             $start = $m[0][1];
             $database = $m[2][0];
-            $offset = $start+strlen($m[0][0]);
+            $offset = $start + strlen($m[0][0]);
             $end = $this->getDelimPos($struct, $offset);
             if ($end === false) {
                 $result = substr($struct, $start);
             }
             else
             {
-                $result = substr($struct, $start, $end-$start);//already without ';'
+                $result = substr($struct, $start, $end - $start); //already without ';'
             }
         }
         $result = trim($result);
@@ -330,25 +330,25 @@ 
         $result = array();
         //find opening bracket, get the prefix along with it
         $openBracketPos = $this->getDelimPos($sql, 0, '(');
-        if ($openBracketPos===false) {
+        if ($openBracketPos === false) {
             trigger_error('[WARNING] can not find opening bracket in table definition');
             return false;
         }
-        $prefix = substr($sql, 0, $openBracketPos+1);//prefix can not be empty, so do not check it, just trim
+        $prefix = substr($sql, 0, $openBracketPos + 1); //prefix can not be empty, so do not check it, just trim
         $result[] = trim($prefix);
-        $body = substr($sql, strlen($prefix));//fields, indexes and part after closing bracket
+        $body = substr($sql, strlen($prefix)); //fields, indexes and part after closing bracket
         //split by commas, get part by part
-        while(($commaPos = $this->getDelimPos($body, 0, ',', true))!==false)
+        while (($commaPos = $this->getDelimPos($body, 0, ',', true)) !== false)
         {
-            $part = trim(substr($body, 0, $commaPos+1));//read another part and shorten $body
+            $part = trim(substr($body, 0, $commaPos + 1)); //read another part and shorten $body
             if ($part) {
                 $result[] = $part;
             }
-            $body = substr($body, $commaPos+1);
+            $body = substr($body, $commaPos + 1);
         }
         //here we have last field (or index) definition + part after closing bracket (ENGINE, ect)
         $closeBracketPos = $this->getDelimRpos($body, 0, ')');
-        if ($closeBracketPos===false) {
+        if ($closeBracketPos === false) {
             trigger_error('[WARNING] can not find closing bracket in table definition');
             return false;
         }
@@ -381,27 +381,27 @@ 
     {
         $result = array();        

         //split with comma delimiter, not line breaks
-        $sourceParts =  $this->splitTabSql($sourceSql);
-        if ($sourceParts===false)//error parsing sql
+        $sourceParts = $this->splitTabSql($sourceSql);
+        if ($sourceParts === false)//error parsing sql
         {
             trigger_error('[WARNING] error parsing source sql');
             return false;
         }
         $destParts = $this->splitTabSql($destSql);
-        if ($destParts===false) {
+        if ($destParts === false) {
             trigger_error('[WARNING] error parsing destination sql');
             return false;
         }
         $sourcePartsIndexed = array();
         $destPartsIndexed = array();
-        foreach($sourceParts as $line)
+        foreach ($sourceParts as $line)
         {            

             $lineInfo = $this->processLine($line);
             if (!$lineInfo) { continue; 
             }
             $sourcePartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
-        foreach($destParts as $line)
+        foreach ($destParts as $line)
         {            

             $lineInfo = $this->processLine($line);
             if (!$lineInfo) { continue; 
@@ -411,16 +411,16 @@ 
         $sourceKeys = array_keys($sourcePartsIndexed);
         $destKeys = array_keys($destPartsIndexed);
         $all = array_unique(array_merge($sourceKeys, $destKeys));
-        sort($all);//fields first, then indexes - because fields are prefixed with '!'
+        sort($all); //fields first, then indexes - because fields are prefixed with '!'
 
         foreach ($all as $key)
         {
             $info = array('source'=>'', 'dest'=>'');
-            $inSource= in_array($key, $sourceKeys);
-            $inDest= in_array($key, $destKeys);
+            $inSource = in_array($key, $sourceKeys);
+            $inDest = in_array($key, $destKeys);
             $sourceOrphan = $inSource && !$inDest;
             $destOrphan = $inDest && !$inSource;
-            $different =  $inSource && $inDest && $destPartsIndexed[$key]!=$sourcePartsIndexed[$key];
+            $different = $inSource && $inDest && $destPartsIndexed[$key] != $sourcePartsIndexed[$key];
             if ($sourceOrphan) {
                 $info['source'] = $sourcePartsIndexed[$key];
             }
@@ -462,11 +462,11 @@ 
         }
         elseif (preg_match('/^`?\w+`?/i', $line, $m))//field definition
         {
-            $key = '!'.$m[0];//to make sure fields will be synchronised before the keys
+            $key = '!'.$m[0]; //to make sure fields will be synchronised before the keys
         }
         else
         {
-            return false;//line has no valuable info (empty or comment)
+            return false; //line has no valuable info (empty or comment)
         }
         //$key = str_replace('`', '', $key);
         if (!empty($options['varcharDefaultIgnore'])) {
@@ -479,7 +479,7 @@ 
             $line = preg_replace("/ AUTO_INCREMENT=[0-9]+/i", '', $line);
         }
         $result['key'] = $key;
-        $result['line']= $line;
+        $result['line'] = $line;
         return $result;
     }
 
@@ -499,7 +499,7 @@ 
         if (!is_array($diff) || empty($diff)) {
             return $sqls;
         }
-        foreach($diff as $tab=>$info)
+        foreach ($diff as $tab=>$info)
         {
             if ($info['sourceOrphan'])//delete it
             {
@@ -522,7 +522,7 @@ 
             }
             else
             {
-                foreach($info['differs'] as $finfo)
+                foreach ($info['differs'] as $finfo)
                 {
                     $inDest = !empty($finfo['dest']);
                     $inSource = !empty($finfo['source']);
@@ -560,45 +560,45 @@ 
     {
         $result = 'ALTER TABLE `'.$tab.'` ';
         $action = strtolower($action);
-        $keyField = '`?\w`?(?:\(\d+\))?';//matches `name`(10)
-        $keyFieldList = '(?:'.$keyField.'(?:,\s?)?)+';//matches `name`(10),`desc`(255)
+        $keyField = '`?\w`?(?:\(\d+\))?'; //matches `name`(10)
+        $keyFieldList = '(?:'.$keyField.'(?:,\s?)?)+'; //matches `name`(10),`desc`(255)
         if (preg_match('/((?:PRIMARY )|(?:UNIQUE )|(?:FULLTEXT ))?KEY `?(\w+)?`?\s(\('.$keyFieldList.'\))/i', $sql, $m)) {   //key and index operations
             $type = strtolower(trim($m[1]));
             $name = trim($m[2]);
             $fields = trim($m[3]);
-            switch($action)
+            switch ($action)
             {
             case 'drop':
-                if ($type=='primary') {
-                    $result.= 'DROP PRIMARY KEY';
+                if ($type == 'primary') {
+                    $result .= 'DROP PRIMARY KEY';
                 }
                 else
                 {
-                    $result.= 'DROP INDEX `'.$name.'`';
+                    $result .= 'DROP INDEX `'.$name.'`';
                 }
                 break;
             case 'add':
-                if ($type=='primary') {
-                    $result.= 'ADD PRIMARY KEY '.$fields;
+                if ($type == 'primary') {
+                    $result .= 'ADD PRIMARY KEY '.$fields;
                 }
-                elseif ($type=='') {
-                    $result.= 'ADD INDEX `'.$name.'` '.$fields;
+                elseif ($type == '') {
+                    $result .= 'ADD INDEX `'.$name.'` '.$fields;
                 }
                 else
                 {
-                    $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                    $result .= 'ADD '.strtoupper($type).' `'.$name.'` '.$fields; //fulltext or unique
                 }
                 break;
             case 'modify':
-                if ($type=='primary') {
-                    $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
+                if ($type == 'primary') {
+                    $result .= 'DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
                 }
-                elseif ($type=='') {
-                    $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
+                elseif ($type == '') {
+                    $result .= 'DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
                 }
                 else
                 {
-                    $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
+                    $result .= 'DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields; //fulltext or unique
                 }
                 break;
 
@@ -607,14 +607,14 @@ 
         else //fields operations
         {
             $sql = rtrim(trim($sql), ',');
-            $result.= strtoupper($action);
-            if ($action=='drop') {
+            $result .= strtoupper($action);
+            if ($action == 'drop') {
                 $spacePos = strpos($sql, ' ');
-                $result.= ' '.substr($sql, 0, $spacePos);
+                $result .= ' '.substr($sql, 0, $spacePos);
             }
             else
             {
-                $result.= ' '.$sql;
+                $result .= ' '.$sql;
             }
         }
         return $result;
@@ -629,34 +629,34 @@ 
     *
     * $skipInBrackets - if true, delimiter will be skipped if located inside (brackets) which are not string literals or comment parts
     */
-    public function getDelimPos($string, $offset=0, $delim=';', $skipInBrackets=false)
+    public function getDelimPos($string, $offset = 0, $delim = ';', $skipInBrackets = false)
     {
         $stack = array();
-        $rbs = '\\\\';    //reg - escaped backslash
+        $rbs = '\\\\'; //reg - escaped backslash
         $regPrefix = "(?<!$rbs)(?:$rbs{2})*";
         $reg = $regPrefix.'("|\')|(/\\*)|(\\*/)|(-- )|(\r\n|\r|\n)|';
         if ($skipInBrackets) {
-            $reg.='(\(|\))|';
+            $reg .= '(\(|\))|';
         }
         else 
         {
-            $reg.='()';
+            $reg .= '()';
         }
         $reg .= '('.preg_quote($delim).')';
         while (preg_match('%'.$reg.'%', $string, $m, PREG_OFFSET_CAPTURE, $offset))
         {
-            $offset = $m[0][1]+strlen($m[0][0]);
-            if (end($stack)=='/*') {
+            $offset = $m[0][1] + strlen($m[0][0]);
+            if (end($stack) == '/*') {
                 if (!empty($m[3][0])) {
                     array_pop($stack);
                 }
-                continue;//here we could also simplify regexp
+                continue; //here we could also simplify regexp
             }
-            if (end($stack)=='-- ') {
+            if (end($stack) == '-- ') {
                 if (!empty($m[5][0])) {
                     array_pop($stack);
                 }
-                continue;//here we could also simplify regexp
+                continue; //here we could also simplify regexp
             }
 
             if (!empty($m[7][0]))// ';' found
@@ -671,16 +671,16 @@ 
             }
             if (!empty($m[6][0]))// '(' or ')' found
             {
-                if (empty($stack) && $m[6][0]=='(') {
+                if (empty($stack) && $m[6][0] == '(') {
                     array_push($stack, $m[6][0]);
                 }
-                elseif($m[6][0]==')' && end($stack)=='(') {
+                elseif ($m[6][0] == ')' && end($stack) == '(') {
                     array_pop($stack);
                 }
             }
             elseif (!empty($m[1][0]))// ' or " found
             {
-                if (end($stack)==$m[1][0]) {
+                if (end($stack) == $m[1][0]) {
                     array_pop($stack);
                 }
                 else
@@ -704,20 +704,20 @@ 
     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
     * the end of the string
     */
-    public function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
+    public function getDelimRpos($string, $offset = 0, $delim = ';', $skipInBrackets = false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);
-        if ($pos===false) {
+        if ($pos === false) {
             return false;
         }
         do
         {
-            $newPos=$this->getDelimPos($string, $pos+1, $delim, $skipInBrackets);
+            $newPos = $this->getDelimPos($string, $pos + 1, $delim, $skipInBrackets);
             if ($newPos !== false) {
                 $pos = $newPos;
             }
         }
-        while($newPos!==false);
+        while ($newPos !== false);
         return $pos;
     }
 }

Braces +67 added lines, -75 removed lines

@@ -142,8 +142,7 @@ 
         $result = array();
         if (is_array($this->config['updateTypes'])) {
             $updateActions = $this->config['updateTypes'];
-        }
-        else
+        } else
         {
             $updateActions = array_map('trim', explode(',', $this->config['updateTypes']));
         }
@@ -155,24 +154,20 @@ 
                 if (in_array('create', $updateActions)) {
                     $result[$table] = $info;
                 }
-            }
-            elseif ($info['destOrphan']) {
+            } elseif ($info['destOrphan']) {
                 if (in_array('drop', $updateActions)) {
                     $result[$table] = $info;
                 }
-            }
-            elseif($info['differs']) {
+            } elseif($info['differs']) {
                 $resultInfo = $info;
                 unset($resultInfo['differs']);
                 foreach ($info['differs'] as $diff)
                 {
                     if (empty($diff['dest']) && in_array('add', $updateActions)) {
                         $resultInfo['differs'][] = $diff;
-                    }
-                    elseif (empty($diff['source']) && in_array('remove', $updateActions)) {
+                    } elseif (empty($diff['source']) && in_array('remove', $updateActions)) {
                         $resultInfo['differs'][] = $diff;
-                    }
-                    elseif(in_array('modify', $updateActions)) {
+                    } elseif(in_array('modify', $updateActions)) {
                         $resultInfo['differs'][] = $diff;
                     }
                 }
@@ -198,11 +193,9 @@ 
         {
             if ($info['sourceOrphan']) {
                 $result['sourceOrphans'][] = $table;
-            }
-            elseif ($info['destOrphan']) {
+            } elseif ($info['destOrphan']) {
                 $result['destOrphans'][] = $table;
-            }
-            else
+            } else
             {
                 $result['different'][] = $table;
             }
@@ -244,11 +237,9 @@ 
             $info = array('destOrphan'=>false, 'sourceOrphan'=>false, 'differs'=>false);
             if(in_array($tab, $destOrphans)) {
                 $info['destOrphan'] = true;
-            }
-            elseif (in_array($tab, $sourceOrphans)) {
+            } elseif (in_array($tab, $sourceOrphans)) {
                 $info['sourceOrphan'] = true;
-            }
-            else
+            } else
             {                

                 $destSql = $this->getTabSql($this->destStruct, $tab, true);
                 $sourceSql = $this->getTabSql($this->sourceStruct, $tab, true);
@@ -256,12 +247,12 @@ 
                 if ($diffs===false) {
                     trigger_error('[WARNING] error parsing definition of table "'.$tab.'" - skipped');
                     continue;
-                }
-                elseif (!empty($diffs))//not empty array
+                } elseif (!empty($diffs)) {
+                    //not empty array
                 {
-                    $info['differs'] = $diffs;                    

-                }                

-                else { continue;//empty array
+                    $info['differs'] = $diffs;
+                }
+                } else { continue;//empty array
                 }         
             }
             $result[$tab] = $info;
@@ -279,10 +270,12 @@ 
     {
         $result = array();
         if (preg_match_all('/CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?(?:`?(\w+)`?\.)?`?(\w+)`?/i', $struct, $m)) {
-            foreach($m[2] as $match)//m[1] is a database name if any
+            foreach($m[2] as $match) {
+                //m[1] is a database name if any
             {
                 $result[] = $match;
             }
+            }
         }
         return $result;
     }
@@ -309,8 +302,7 @@ 
             $end = $this->getDelimPos($struct, $offset);
             if ($end === false) {
                 $result = substr($struct, $start);
-            }
-            else
+            } else
             {
                 $result = substr($struct, $start, $end-$start);//already without ';'
             }
@@ -382,9 +374,11 @@ 
         $result = array();        

         //split with comma delimiter, not line breaks
         $sourceParts =  $this->splitTabSql($sourceSql);
-        if ($sourceParts===false)//error parsing sql
+        if ($sourceParts===false) {
+            //error parsing sql
         {
             trigger_error('[WARNING] error parsing source sql');
+        }
             return false;
         }
         $destParts = $this->splitTabSql($destSql);
@@ -423,15 +417,12 @@ 
             $different =  $inSource && $inDest && $destPartsIndexed[$key]!=$sourcePartsIndexed[$key];
             if ($sourceOrphan) {
                 $info['source'] = $sourcePartsIndexed[$key];
-            }
-            elseif ($destOrphan) {
+            } elseif ($destOrphan) {
                 $info['dest'] = $destPartsIndexed[$key];
-            }
-            elseif ($different) {
+            } elseif ($different) {
                 $info['source'] = $sourcePartsIndexed[$key];
                 $info['dest'] = $destPartsIndexed[$key];
-            }
-            else { continue; 
+            } else { continue; 
             }
             $result[] = $info;
         }
@@ -452,19 +443,24 @@ 
         $options = $this->config;
         $result = array('key'=>'', 'line'=>'');
         $line = rtrim(trim($line), ',');
-        if (preg_match('/^(CREATE TABLE)|(\) ENGINE=)/i', $line))//first or last table definition line
+        if (preg_match('/^(CREATE TABLE)|(\) ENGINE=)/i', $line)) {
+            //first or last table definition line
         {
             return false;
         }
-        if (preg_match('/^(PRIMARY KEY)|(((UNIQUE )|(FULLTEXT ))?KEY `?\w+`?)/i', $line, $m))//key definition
+        }
+        if (preg_match('/^(PRIMARY KEY)|(((UNIQUE )|(FULLTEXT ))?KEY `?\w+`?)/i', $line, $m)) {
+            //key definition
         {
             $key = $m[0];
         }
-        elseif (preg_match('/^`?\w+`?/i', $line, $m))//field definition
+        } elseif (preg_match('/^`?\w+`?/i', $line, $m)) {
+            //field definition
         {
-            $key = '!'.$m[0];//to make sure fields will be synchronised before the keys
+            $key = '!'.$m[0];
         }
-        else
+        //to make sure fields will be synchronised before the keys
+        } else
         {
             return false;//line has no valuable info (empty or comment)
         }
@@ -501,13 +497,16 @@ 
         }
         foreach($diff as $tab=>$info)
         {
-            if ($info['sourceOrphan'])//delete it
+            if ($info['sourceOrphan']) {
+                //delete it
             {
                 $sqls[] = 'DROP TABLE `'.$tab.'`';
             }
-            elseif ($info['destOrphan'])//create destination table in source
+            } elseif ($info['destOrphan']) {
+                //create destination table in source
             {
                 $database = '';
+            }
                 $destSql = $this->getTabSql($this->destStruct, $tab, $database);
                 if (!empty($options['ignoreIncrement'])) {
                     $destSql = preg_replace("/\s*AUTO_INCREMENT=[0-9]+/i", '', $destSql);
@@ -519,8 +518,7 @@ 
                     $destSql = preg_replace('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*)(?:IF NOT EXISTS\s*)?(`?\w+`?)/i', '$1IF NOT EXISTS $2', $destSql);
                 }
                 $sqls[] = $destSql;
-            }
-            else
+            } else
             {
                 foreach($info['differs'] as $finfo)
                 {
@@ -529,12 +527,10 @@ 
                     if ($inSource && !$inDest) {
                         $sql = $finfo['source'];
                         $action = 'drop';
-                    }
-                    elseif ($inDest && !$inSource) {
+                    } elseif ($inDest && !$inSource) {
                         $sql = $finfo['dest'];
                         $action = 'add';
-                    }
-                    else
+                    } else
                     {
                         $sql = $finfo['dest'];
                         $action = 'modify';
@@ -571,8 +567,7 @@ 
             case 'drop':
                 if ($type=='primary') {
                     $result.= 'DROP PRIMARY KEY';
-                }
-                else
+                } else
                 {
                     $result.= 'DROP INDEX `'.$name.'`';
                 }
@@ -580,11 +575,9 @@ 
             case 'add':
                 if ($type=='primary') {
                     $result.= 'ADD PRIMARY KEY '.$fields;
-                }
-                elseif ($type=='') {
+                } elseif ($type=='') {
                     $result.= 'ADD INDEX `'.$name.'` '.$fields;
-                }
-                else
+                } else
                 {
                     $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
                 }
@@ -592,27 +585,23 @@ 
             case 'modify':
                 if ($type=='primary') {
                     $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
-                }
-                elseif ($type=='') {
+                } elseif ($type=='') {
                     $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
-                }
-                else
+                } else
                 {
                     $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
                 }
                 break;
 
             }
-        }
-        else //fields operations
+        } else //fields operations
         {
             $sql = rtrim(trim($sql), ',');
             $result.= strtoupper($action);
             if ($action=='drop') {
                 $spacePos = strpos($sql, ' ');
                 $result.= ' '.substr($sql, 0, $spacePos);
-            }
-            else
+            } else
             {
                 $result.= ' '.$sql;
             }
@@ -637,8 +626,7 @@ 
         $reg = $regPrefix.'("|\')|(/\\*)|(\\*/)|(-- )|(\r\n|\r|\n)|';
         if ($skipInBrackets) {
             $reg.='(\(|\))|';
-        }
-        else 
+        } else 
         {
             $reg.='()';
         }
@@ -659,43 +647,47 @@ 
                 continue;//here we could also simplify regexp
             }
 
-            if (!empty($m[7][0]))// ';' found
+            if (!empty($m[7][0])) {
+                // ';' found
             {
                 if (empty($stack)) {
                     return $m[7][1];
-                }
-                else
+            }
+                } else
                 {
                     //var_dump($stack, substr($string, $offset-strlen($m[0][0])));
                 }
             }
-            if (!empty($m[6][0]))// '(' or ')' found
+            if (!empty($m[6][0])) {
+                // '(' or ')' found
             {
                 if (empty($stack) && $m[6][0]=='(') {
                     array_push($stack, $m[6][0]);
-                }
-                elseif($m[6][0]==')' && end($stack)=='(') {
+            }
+                } elseif($m[6][0]==')' && end($stack)=='(') {
                     array_pop($stack);
                 }
-            }
-            elseif (!empty($m[1][0]))// ' or " found
+            } elseif (!empty($m[1][0])) {
+                // ' or " found
             {
                 if (end($stack)==$m[1][0]) {
                     array_pop($stack);
-                }
-                else
+            }
+                } else
                 {
                     array_push($stack, $m[1][0]);
                 }
-            }
-            elseif (!empty($m[2][0])) // opening comment / *
+            } elseif (!empty($m[2][0])) {
+                // opening comment / *
             {
                 array_push($stack, $m[2][0]);
             }
-            elseif (!empty($m[4][0])) // opening comment --
+            } elseif (!empty($m[4][0])) {
+                // opening comment --
             {
                 array_push($stack, $m[4][0]);
             }
+            }
         }
         return false;
     }

module/UIComponents/src/UIComponents/View/Helper/Components/Element.php

Spacing +3 added lines, -3 removed lines

@@ -33,10 +33,10 @@
      */
     public function __invoke($options = array())
     {
-        if ( is_object($options) && method_exists($options, 'toArray') ) {
+        if (is_object($options) && method_exists($options, 'toArray')) {
             $options = $options->toArray();
-        } else if ( is_object($options) ) {
-            $options = (array)$options;
+        } else if (is_object($options)) {
+            $options = (array) $options;
         }
         
         if (isset($options['container']) && (null !== $options['container'])) {

module/UIComponents/src/UIComponents/View/Helper/Components/PluginManager.php

Indentation +13 added lines, -13 removed lines

@@ -33,8 +33,8 @@ 
      */
     protected $invokableClasses = [
 
-    	// panels
-    	//
+        // panels
+        //
         'element'              => 'UIComponents\View\Helper\Components\Element',
         'block'             => 'UIComponents\View\Helper\Components\Block',
         //'well'              => 'UIComponents\View\Helper\Components\Well',
@@ -43,33 +43,33 @@ 
         'widget'            => 'UIComponents\View\Helper\Components\Widget',
         'dashboard'         => 'UIComponents\View\Helper\Components\Dashboard',
 
-    	// page components
-    	//
+        // page components
+        //
         'nav'               => 'UIComponents\View\Helper\Components\Navbar', // set 'alias to' or combine with 'Navbars' !
         'topbar'            => 'UIComponents\View\Helper\Components\Navbar', // set 'alias to' or combine with 'Navbars' !
         'breadcrumbs'       => 'UIComponents\View\Helper\Components\Breadcrumbs',
         'languagemenu'      => 'UIComponents\View\Helper\Components\Languagemenu',
-    	'toolbar'           => 'UIComponents\View\Helper\Components\Toolbar',
+        'toolbar'           => 'UIComponents\View\Helper\Components\Toolbar',
 
         // controls
         //
         'button'            => 'UIComponents\View\Helper\Components\Button', // default, drop-down/up, splitted
         'buttongroup'       => 'UIComponents\View\Helper\Components\Buttongroup',
-    	//'inputgroup'        => 'UIComponents\View\Helper\Components\Inputgroup',
+        //'inputgroup'        => 'UIComponents\View\Helper\Components\Inputgroup',
         //'progressbar'       => 'UIComponents\View\Helper\Components\Progressbar',
 
-    	// forms
-    	//
+        // forms
+        //
         'formgroup'         => 'UIComponents\View\Helper\Components\Formgroup',
 
-    	// lists/tables
-    	//
+        // lists/tables
+        //
         //'listgroup'         => 'UIComponents\View\Helper\Components\Listgroup',
         'table'         	=> 'UIComponents\View\Helper\Components\Listgroup',
-    	//'pagination'        => 'UIComponents\View\Helper\Components\Pagination',
+        //'pagination'        => 'UIComponents\View\Helper\Components\Pagination',
 
-    	// widgets
-    	//
+        // widgets
+        //
         //'label'             => 'UIComponents\View\Helper\Components\Label',
         //'badge'             => 'UIComponents\View\Helper\Components\Badge',
         //'pageheader'        => 'UIComponents\View\Helper\Components\Pageheader',