bb-drummer / my-application

module/UIComponents/src/UIComponents/Template/TemplateAbstract.php

Braces +6 added lines, -6 removed lines

@@ -189,8 +189,7 @@ 
         if (!@ is_file($template))
         {
             $content = & $template; //template is a string (it is a reference to save memory!!!)
-        }
-        else
+        } else
         {
             $content = implode("", file($template)); //template is a file
         }
@@ -233,10 +232,11 @@ 
             //$content = str_replace("</head>", '<meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'">'."\n".'</head>', $content);
         }
           
-        if ($return)
-            return $content;
-        else
-            echo $content;
+        if ($return) {
+                    return $content;
+        } else {
+                    echo $content;
+        }
     }
 
     /** 

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

Braces +3 added lines, -1 removed lines

@@ -66,7 +66,9 @@
         if ( isset($options["block"]) ) {
             $component->setBlock($options["block"]);
         }
-        if ($component->getBlock()) $component->addClass('btn-block expanded');
+        if ($component->getBlock()) {
+            $component->addClass('btn-block expanded');
+        }
         
         
         

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

Braces +6 added lines, -2 removed lines

@@ -85,8 +85,12 @@
             $component->setActive($options["active"]);
         }
 
-        if ($component->getBlock()) $component->addClass('btn-block expanded');
-        if ($component->getActive()) $component->addClass('active');
+        if ($component->getBlock()) {
+            $component->addClass('btn-block expanded');
+        }
+        if ($component->getActive()) {
+            $component->addClass('active');
+        }
         
         if ($component->getTagname() == 'a') {
             $component->setAttributes(array_merge_recursive($component->getAttributes(), array(

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

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