bb-drummer / my-application

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

Doc Comments +4 added lines, -2 removed lines

@@ -215,6 +215,7 @@ 
      *
     * @access private
     * @param  string $source and $dest are strings - database tables structures
+    * @param string $dest
     * @return array
     * - table (array)
     *        - destOrphan (boolean)
@@ -368,8 +369,8 @@ 
     * 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
+    * @param  string $sourceSql table structure
+    * @param  string $destSql   right table structure supports some $options
     * supports some $options
     * @return array
     *     - [0]
@@ -703,6 +704,7 @@ 
     /**
     * works the same as getDelimPos except returns position of the first occurence of the delimiter starting from
     * the end of the string
+    * @param string $string
     */
     public function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {

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/Factory/ComponentsControllerFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      *
      * @param ServiceLocatorInterface $serviceLocator
      *
-     * @return mixed
+     * @return ComponentsController
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {

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

Doc Comments +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
      * in the static templates with dynamic data.
      *
      * @param $which String 's' for Static or else dynamic
-     * @param $needle String Placeholder
+     * @param string $needle String Placeholder
      * @param $replacement String Replacement String
      *
      * @return self
@@ -139,7 +139,7 @@ 
     /**
      * Sets an encoding for the template's head block.
      *
-     * @param $encoding string Encoding to set
+     * @param string $encoding string Encoding to set
      * @return self
      */    
     public function setEncoding ($encoding)
@@ -245,7 +245,7 @@ 
      * Replaces a named function with the translated variant 
      * 
      * @param $template string Contents of the template to translate (it is reference to save memory!!!) 
-     * @param $functionName string Name of the translation function (e.g. i18n) 
+     * @param string $functionName string Name of the translation function (e.g. i18n) 
      * @return self
      */ 
     public function replacei18n(& $template, $functionName) { 

Indentation +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  */
 abstract class TemplateAbstract implements TemplateInterface, TranslatorAwareInterface
 {
-	use TranslatorAwareInterfaceTrait;
+    use TranslatorAwareInterfaceTrait;
 
     /**
      * Needles (static)
@@ -77,7 +77,7 @@ 
      * 
      * @param array $tags
      * @param \Zend\I18n\Translator\TranslatorInterface $translator
-	 * @return \UIComponents\Template\TemplateAbstract
+     * @return \UIComponents\Template\TemplateAbstract
      */
     public function __construct ($tags = false, $translator = null)
     {

Spacing +18 added lines, -18 removed lines

@@ -30,25 +30,25 @@ 
      * Needles (static)
      * @var array
      */
-    public $needles = array ();
+    public $needles = array();
 
     /**
      * Replacements (static)
      * @var array
      */
-    public $replacements = array ();
+    public $replacements = array();
 
     /**
      * dynamicNeedles (dynamic)
      * @var array
      */
-    public $dynamicNeedles = array ();
+    public $dynamicNeedles = array();
 
     /**
      * dynamicReplacements (dynamic)
      * @var array
      */
-    public $dynamicReplacements = array ();
+    public $dynamicReplacements = array();
 
     /**
      * Dynamic counter
@@ -60,7 +60,7 @@ 
      * Tags array (for dynamic blocks);
      * @var array
      */
-    public $tags = array (
+    public $tags = array(
         'static' => '{%s}', 
         'start' => '<!-- BEGIN:BLOCK -->', 
         'end' => '<!-- END:BLOCK -->'
@@ -79,7 +79,7 @@ 
      * @param \Zend\I18n\Translator\TranslatorInterface $translator
 	 * @return \UIComponents\Template\TemplateAbstract
      */
-    public function __construct ($tags = false, $translator = null)
+    public function __construct($tags = false, $translator = null)
     {
         if (is_array($tags))
         {
@@ -102,7 +102,7 @@ 
      * @param $sDomain    string    Sets the domain to use for template translations
      * @return self
      */    
-    public function setDomain ($sDomain)
+    public function setDomain($sDomain)
     {
         $this->_sDomain = $sDomain;
         return $this;
@@ -142,7 +142,7 @@ 
      * @param $encoding string Encoding to set
      * @return self
      */    
-    public function setEncoding ($encoding)
+    public function setEncoding($encoding)
     {
         $this->_encoding = $encoding;
         return $this;
@@ -167,10 +167,10 @@ 
     public function reset()
     {
         $this->dynamicContent = 0;
-        $this->needles = array ();
-        $this->replacements = array ();
-        $this->dynamicNeedles = array ();
-        $this->dynamicReplacements = array ();
+        $this->needles = array();
+        $this->replacements = array();
+        $this->dynamicNeedles = array();
+        $this->dynamicReplacements = array();
         return $this;
     }
 
@@ -215,7 +215,7 @@ 
             unset ($pieces[0][0]); 
 
             //generate dynamic blocks 
-            for ($a = 0; $a < $this->dynamicContent; $a ++) { 
+            for ($a = 0; $a < $this->dynamicContent; $a++) { 
                 $content .= str_replace($this->dynamicNeedles[$a], $this->dynamicReplacements[$a], $pieces[1][0]); 
             } 
             unset ($pieces[1][0]); 
@@ -229,7 +229,7 @@ 
         
         if ($this->_encoding != "")
         {
-            $content = '<meta http-equiv="Content-Type" content="text/html; charset=' . $this->_encoding . '">' . "\n" . $content;
+            $content = '<meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'">'."\n".$content;
             //$content = str_replace("</head>", '<meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'">'."\n".'</head>', $content);
         }
           
@@ -252,12 +252,12 @@ 
 
         // Be sure that php code stays unchanged 
         $php_matches = array();
-        $container     = array();
+        $container = array();
         if (preg_match_all('/<\?(php)?((.)|(\s))*?\?>/i', $template, $php_matches)) { 
             $x = 0; 
             foreach ($php_matches[0] as $php_match) { 
                 $x++; 
-                $template = str_replace ($php_match , "{PHP#".$x."#PHP}", $template); 
+                $template = str_replace($php_match, "{PHP#".$x."#PHP}", $template); 
                 $container[$x] = $php_match; 
             }
         }
@@ -267,14 +267,14 @@ 
         preg_match_all("/".preg_quote($functionName, "/")."\\(([\\\"\\'])(.*?)\\1\\)/s", $template, $matches); 
 
         $matches = array_values(array_unique($matches[2])); 
-        for ($a = 0; $a < count($matches); $a ++) { 
+        for ($a = 0; $a < count($matches); $a++) { 
             $template = preg_replace("/".preg_quote($functionName, "/")."\\([\\\"\\']".preg_quote($matches[$a], "/")."[\\\"\\']\\)/s", $this->translate($matches[$a], $this->_sDomain), $template);
         } 
 
         // Change back php placeholder 
         if (is_array($container)) { 
             foreach ($container as $x => $php_match) { 
-                $template = str_replace ("{PHP#".$x."#PHP}" , $php_match, $template); 
+                $template = str_replace("{PHP#".$x."#PHP}", $php_match, $template); 
             } 
         }
         return $this;

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/AbstractHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -385,7 +385,7 @@
     /**
      * get DOM object
      * 
-     * @return the $_DOMDoc
+     * @return \DOMDocument $_DOMDoc
      */
     public function getDOMDoc() {
         if ( ! $this->_DOMDoc instanceof \DOMDocument ) {

Unused Use Statements -6 removed lines

@@ -15,16 +15,10 @@
 
 namespace UIComponents\View\Helper;
 
-use RecursiveIteratorIterator;
-use Zend\EventManager\EventManager;
 use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerInterface;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\Navigation\Page\AbstractPage;
-use Zend\Navigation\AbstractContainer;
-use Zend\Permissions\Acl;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View;
 use Zend\View\Exception;
 use \UIComponents\Translator\TranslatorAwareInterfaceTrait;

Indentation +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
     
     
 
-   /**
+    /**
      * Magic overload: Proxy calls to the navigation container
      *
      * @param    string $method    method name in container

Spacing +19 added lines, -19 removed lines

@@ -151,7 +151,7 @@ 
             
         } catch (\Exception $e) {
             
-            $msg = get_class($e) . ': ' . $e->getMessage() . "\n" . $e->getTraceAsString();
+            $msg = get_class($e).': '.$e->getMessage()."\n".$e->getTraceAsString();
             trigger_error($msg, E_USER_ERROR);
             return '';
             
@@ -194,9 +194,9 @@ 
 
         /** @var \Zend\View\Helper\EscapeHtml $escaper */
         $escaper = $this->view->plugin('escapeHtml');
-        $label    = $escaper($label);
+        $label = $escaper($label);
 
-        return '<a' . $this->htmlAttribs($attribs) . '>' . $label . '</a>';
+        return '<a'.$this->htmlAttribs($attribs).'>'.$label.'</a>';
     }
 
     /**
@@ -212,7 +212,7 @@ 
         $prefix = get_class($this);
         $prefix = strtolower(trim(substr($prefix, strrpos($prefix, '\\')), '\\'));
 
-        return $prefix . '-' . $value;
+        return $prefix.'-'.$value;
     }
 
     //
@@ -224,7 +224,7 @@ 
      */
     public function buildComponent() {
         $html = ' '.__CLASS__.' ';
-        if ( empty($this->getTagname()) ) {
+        if (empty($this->getTagname())) {
             return '';
         }
         
@@ -235,11 +235,11 @@ 
         $body = $this->getContent();
         
         $content = (array($header, $body, $footer));
-        if ( is_array($body) && !isset($body["tagname"])) {
+        if (is_array($body) && !isset($body["tagname"])) {
             $content = array_merge(array($header), ($body), array($footer));
         }
         
-        $component = $this->_createElement($this->getTagname(), $this->getClassnames(), (array)$this->getAttributes(), $content);
+        $component = $this->_createElement($this->getTagname(), $this->getClassnames(), (array) $this->getAttributes(), $content);
 
         return $component;
 
@@ -259,29 +259,29 @@ 
         $html = '';
         $html .= '<'.$tagname.''.((isset($classnames) && !empty($classnames)) ? ' class="'.$classnames.'"' : '').' '.$this->htmlAttribs($attributes).'>';
         if (!empty($content)) {
-            if ( $content instanceof AbstractHelper ) {
+            if ($content instanceof AbstractHelper) {
                 $html .= $content->render();
-            } else if ( is_array($content) && isset($content['tagname']) ) {
+            } else if (is_array($content) && isset($content['tagname'])) {
                 $html .= $this->_createElement(
                     $content['tagname'],
                     (isset($content['classnames']) && !empty($content['classnames']) ? $content['classnames'] : (isset($content['class']) && !empty($content['class']) ? $content['class'] : '')),
                     (isset($content['attributes']) && !empty($content['attributes']) ? $content['attributes'] : (isset($content['attr']) && !empty($content['attr']) ? $content['attr'] : '')),
                     (isset($content['content']) && !empty($content['content']) ? $content['content'] : '')
                 );
-            } else if ( is_array($content) ) {
+            } else if (is_array($content)) {
                 foreach ($content as $key => $item) {
-                    if ( $item instanceof AbstractHelper ) {
+                    if ($item instanceof AbstractHelper) {
                         $html .= $item->render();
-                    } else if ( is_array($item) && isset($item['tagname']) ) {
+                    } else if (is_array($item) && isset($item['tagname'])) {
                         $html .= $this->_createElement(
                             $item['tagname'],
                             (isset($item['classnames']) && !empty($item['classnames']) ? $item['classnames'] : (isset($item['class']) && !empty($item['class']) ? $item['class'] : '')),
-                            (array)(isset($item['attributes']) && !empty($item['attributes']) ? $item['attributes'] : (isset($item['attr']) && !empty($item['attr']) ? $item['attr'] : '')),
+                            (array) (isset($item['attributes']) && !empty($item['attributes']) ? $item['attributes'] : (isset($item['attr']) && !empty($item['attr']) ? $item['attr'] : '')),
                             (isset($item['content']) && !empty($item['content']) ? $item['content'] : '')
                         );
-                    } else if ( is_array($item) ) {
+                    } else if (is_array($item)) {
                         foreach ($content as $key => $value) {
-                            $html .= (string)$value;
+                            $html .= (string) $value;
                         }
                     } else {
                         $html .= $item;
@@ -316,7 +316,7 @@ 
      * @param string $tagname
      */
     public function setTagname($tagname) {
-        if ( null !== $tagname ) {
+        if (null !== $tagname) {
             $this->tagname = $tagname;
         }
         return $this;
@@ -337,7 +337,7 @@ 
      * @param mixed $header
      */
     public function setHeader($header) {
-        if ( null !== $header ) {
+        if (null !== $header) {
             $this->header = $header;
         }
         return $this;
@@ -358,7 +358,7 @@ 
      * @param mixed $footer
      */
     public function setFooter($footer = null) {
-        if ( null !== $footer ) {
+        if (null !== $footer) {
             $this->footer = $footer;
         }
         return $this;
@@ -388,7 +388,7 @@ 
      * @return the $_DOMDoc
      */
     public function getDOMDoc() {
-        if ( ! $this->_DOMDoc instanceof \DOMDocument ) {
+        if (!$this->_DOMDoc instanceof \DOMDocument) {
             $this->_DOMDoc = new \DOMDocument();
         }
         return $this->_DOMDoc;

module/UIComponents/src/UIComponents/View/Helper/AbstractProxyHelper.php

Doc Comments +4 added lines, -4 removed lines

@@ -264,7 +264,7 @@ 
      * Sets the default proxy to use in {@link render()}
      *
      * @param  string $proxy default proxy
-     * @return Bootstrap
+     * @return AbstractProxyHelper
      */
     public function setDefaultProxy($proxy)
     {
@@ -286,7 +286,7 @@ 
      * Sets whether container should be injected when proxying
      *
      * @param  bool $injectContainer
-     * @return Bootstrap
+     * @return AbstractProxyHelper
      */
     public function setInjectContainer($injectContainer = true)
     {
@@ -308,7 +308,7 @@ 
      * Sets whether ACL should be injected when proxying
      *
      * @param  bool $injectAcl
-     * @return NavigBootstrapation
+     * @return AbstractProxyHelper
      */
     public function setInjectAcl($injectAcl = true)
     {
@@ -330,7 +330,7 @@ 
      * Sets whether translator should be injected when proxying
      *
      * @param  bool $injectTranslator
-     * @return Bootstrap
+     * @return AbstractProxyHelper
      */
     public function setInjectTranslator($injectTranslator = true)
     {

Indentation +22 added lines, -22 removed lines

@@ -235,29 +235,29 @@
      */
     protected function inject(\Zend\View\Helper\AbstractHelper $helper)
     {
-		if ( 
-			($helper instanceof \UIComponents\View\Helper\AbstractHelper) ||
-			($helper instanceof \UIComponents\View\Helper\Navigation\Menu) 
-		) {
-	        if ($this->getInjectContainer() && !$helper->hasContainer()) {
-	            $helper->setContainer($this->getContainer());
-	        }
+        if ( 
+            ($helper instanceof \UIComponents\View\Helper\AbstractHelper) ||
+            ($helper instanceof \UIComponents\View\Helper\Navigation\Menu) 
+        ) {
+            if ($this->getInjectContainer() && !$helper->hasContainer()) {
+                $helper->setContainer($this->getContainer());
+            }
 	
-	        if ($this->getInjectAcl()) {
-	            if (!$helper->hasAcl()) {
-	                $helper->setAcl($this->getAcl());
-	            }
-	            if (!$helper->hasRole()) {
-	                $helper->setRole($this->getRole());
-	            }
-	        }
-	        if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
-	            $helper->setTranslator(
-	                $this->getTranslator(),
-	                $this->getTranslatorTextDomain()
-	            );
-	        }
-		}
+            if ($this->getInjectAcl()) {
+                if (!$helper->hasAcl()) {
+                    $helper->setAcl($this->getAcl());
+                }
+                if (!$helper->hasRole()) {
+                    $helper->setRole($this->getRole());
+                }
+            }
+            if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
+                $helper->setTranslator(
+                    $this->getTranslator(),
+                    $this->getTranslatorTextDomain()
+                );
+            }
+        }
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -205,12 +205,12 @@
             return false;
         }
 
-        $helper    = $plugins->get($proxy);
+        $helper = $plugins->get($proxy);
 
         if ($helper && ($helper instanceof \Zend\View\Helper\Navigation\Menu)) {
             
             $container = $this->getContainer();
-            $hash      = spl_object_hash($container) . spl_object_hash($helper);
+            $hash      = spl_object_hash($container).spl_object_hash($helper);
             if (!isset($this->injected[$hash])) {
                 $helper->setContainer();
                 $this->inject($helper);

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

Doc Comments -1 removed lines

@@ -32,7 +32,6 @@
     /**
      * Helper entry point
      *
-     * @param  string|AbstractContainer $container container to operate on
      * @return Components
      */
     public function __invoke($options = array())

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

Doc Comments +5 added lines, -5 removed lines

@@ -146,7 +146,7 @@ 
     }
     
     /**
-     * @return the $olClass
+     * @return string $olClass
      */
     public function getOlClass() {
         return $this->olClass;
@@ -163,7 +163,7 @@ 
     }
 
     /**
-     * @return the $liClass
+     * @return string $liClass
      */
     public function getLiClass() {
         return $this->liClass;
@@ -180,7 +180,7 @@ 
     }
     
     /**
-     * @return the $noList
+     * @return boolean $noList
      */
     public function getNoList() {
         return $this->noList;
@@ -197,7 +197,7 @@ 
     }
     
     /**
-     * @return the $header
+     * @return string $header
      */
     public function getHeader() {
         return $this->header;
@@ -214,7 +214,7 @@ 
     }
     
     /**
-     * @return the $headerClass
+     * @return string $headerClass
      */
     public function getHeaderClass() {
         return $this->headerClass;

Spacing +9 added lines, -9 removed lines

@@ -110,24 +110,24 @@ 
         /** @var \Zend\View\Helper\EscapeHtml $escaper */
         $escaper = $this->view->plugin('escapeHtml');
         
-        $listHtmlOpen = '<ol class="'.$this->getOlClass().'">' . PHP_EOL;
-        if ( !empty($this->getHeader()) ) {
-            $listHtmlOpen .= '<li class="' . $escaper($this->getHeaderClass()) . '">' . $escaper($this->getHeader()) . '</li>' . PHP_EOL;
+        $listHtmlOpen = '<ol class="'.$this->getOlClass().'">'.PHP_EOL;
+        if (!empty($this->getHeader())) {
+            $listHtmlOpen .= '<li class="'.$escaper($this->getHeaderClass()).'">'.$escaper($this->getHeader()).'</li>'.PHP_EOL;
         }
         // put the deepest active page last in breadcrumbs
         if ($this->getLinkLast()) {
-            $html = '<li class="active">' . $this->htmlify($active) . '</li>' . PHP_EOL;
+            $html = '<li class="active">'.$this->htmlify($active).'</li>'.PHP_EOL;
         } else {
-            $html    = '<li class="active">' . $escaper(
+            $html = '<li class="active">'.$escaper(
                 $this->translate($active->getLabel()) //, $active->getTextDomain())
-            ) . '</li>' . PHP_EOL;
+            ).'</li>'.PHP_EOL;
         }
 
         // walk back to root
         while ($parent = $active->getParent()) {
             if ($parent instanceof AbstractPage) {
                 // prepend crumb to html
-                $html = '<li>' . $this->htmlify($parent) . '</li>' . PHP_EOL
+                $html = '<li>'.$this->htmlify($parent).'</li>'.PHP_EOL
                     //. $this->getSeparator()
                     . $html;
             }
@@ -140,9 +140,9 @@ 
             $active = $parent;
         }
 
-        $listHtmlClose = '</ol>' . PHP_EOL;
+        $listHtmlClose = '</ol>'.PHP_EOL;
         
-        return strlen($html) ? $listHtmlOpen . $this->getIndent() . $html . $listHtmlClose : '';
+        return strlen($html) ? $listHtmlOpen.$this->getIndent().$html.$listHtmlClose : '';
     }
     
     /**

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

Doc Comments +3 added lines, -3 removed lines

@@ -174,7 +174,7 @@ 
     
     
     /**
-     * @return the $drop
+     * @return boolean $drop
      */
     public function getDrop() {
         return $this->drop;
@@ -191,7 +191,7 @@ 
     }
 
     /**
-     * @return the $block
+     * @return boolean $block
      */
     public function getBlock() {
         return $this->block;
@@ -206,7 +206,7 @@ 
     }
 
     /**
-     * @return the $active
+     * @return boolean $active
      */
     public function getActive() {
         return $this->active;

Spacing +15 added lines, -15 removed lines

@@ -32,14 +32,14 @@ 
     
     protected $active = false;
     
-    protected $_tags = array('a','input','button');
+    protected $_tags = array('a', 'input', 'button');
     
-    protected $_sizes = array('xs','sm','lg');
+    protected $_sizes = array('xs', 'sm', 'lg');
     protected $_foundations_sizes = array(
         'xs' => 'tiny', 'xs' => 'small', 'lg' => 'large',
     );
 
-    protected $_types = array('default','primary','success','info','warning','alert','danger','link');
+    protected $_types = array('default', 'primary', 'success', 'info', 'warning', 'alert', 'danger', 'link');
     
     /**
      * View helper entry point:
@@ -57,31 +57,31 @@ 
         $component->setHeader('')->setFooter('');
         
         // tag options
-        if ( isset($options["tagname"]) && in_array(strtolower($options["tagname"]), $component->getTags()) ) {
+        if (isset($options["tagname"]) && in_array(strtolower($options["tagname"]), $component->getTags())) {
             $component->setTagname(strtolower($options["tagname"]));
         } else {
             $component->setTagname('a');
         }
-        if ( isset($options["attributes"]) && is_array($options["attributes"]) ) {
+        if (isset($options["attributes"]) && is_array($options["attributes"])) {
             $component->setAttributes($options["attributes"]);
         }
         
         // bootstrap options
-        if ( isset($options["size"]) && in_array(strtolower($options["size"]), $component->getSizes()) ) {
+        if (isset($options["size"]) && in_array(strtolower($options["size"]), $component->getSizes())) {
             $component->addClass('btn-'.strtolower($options["size"]).' '.strtolower($this->_foundations_sizes["size"]));
         }
-        if ( isset($options["type"]) && in_array(strtolower($options["type"]), $component->getTypes()) ) {
+        if (isset($options["type"]) && in_array(strtolower($options["type"]), $component->getTypes())) {
             $component->addClass('btn-'.strtolower($options["type"]).' '.strtolower($options["type"]));
         } else {
             $component->addClass('btn-default');
         }
-        if ( isset($options["drop"]) ) {
+        if (isset($options["drop"])) {
             $component->setDrop($options["drop"]);
         }
-        if ( isset($options["block"]) ) {
+        if (isset($options["block"])) {
             $component->setBlock($options["block"]);
         }
-        if ( isset($options["active"]) ) {
+        if (isset($options["active"])) {
             $component->setActive($options["active"]);
         }
 
@@ -92,14 +92,14 @@ 
             $component->setAttributes(array_merge_recursive($component->getAttributes(), array(
                 'role' => 'button'
             )));
-            if ( isset($options["disabled"]) ) {
+            if (isset($options["disabled"])) {
                 $component->addClass('disabled');
             }
         } else {
             $component->setAttributes(array_merge_recursive($component->getAttributes(), array(
                 'type' => 'button'
             )));
-            if ( isset($options["disabled"]) ) {
+            if (isset($options["disabled"])) {
                 $component->setAttributes(array_merge_recursive($component->getAttributes(), array(
                     'disabled' => 'disabled'
                 )));
@@ -107,9 +107,9 @@ 
         }
         
         // tag content
-        if ( isset($options["label"]) && !empty($options["label"]) ) {
+        if (isset($options["label"]) && !empty($options["label"])) {
             $component->setContent($options["label"]);
-        } else if ( isset($options["content"]) && !empty($options["content"]) ) {
+        } else if (isset($options["content"]) && !empty($options["content"])) {
             $component->setContent($options["content"]);
         }
         
@@ -184,7 +184,7 @@ 
      * @param string $drop
      */
     public function setDrop($drop) {
-        if ( in_array(strtolower($drop), array('up','down'))) {
+        if (in_array(strtolower($drop), array('up', 'down'))) {
             $this->drop = $drop;
         }
         return $this;

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/UIComponents/src/UIComponents/View/Helper/Components/Buttongroup.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     }
 
     /**
-     * @return the $block
+     * @return boolean $block
      */
     public function getBlock() {
         return $this->block;

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
     
     protected $block = false;
     
-    protected $_sizes = array('default','xs','sm','lg');
+    protected $_sizes = array('default', 'xs', 'sm', 'lg');
     protected $_foundations_sizes = array(
         'xs' => 'tiny', 'xs' => 'small', 'lg' => 'large', 'default' => '',
     );
@@ -47,32 +47,32 @@ 
         
         $this->setHeader('')->setFooter('');
 
-        if ( isset($options["attributes"]) && is_array($options["attributes"]) ) {
+        if (isset($options["attributes"]) && is_array($options["attributes"])) {
             $component->setAttributes($options["attributes"]);
         }
         $component->setAttributes(array_merge_recursive($component->getAttributes(), array(
             'role' => 'group'
         )));
         
-        if ( isset($options["vertical"]) && !!$options["vertical"] ) {
+        if (isset($options["vertical"]) && !!$options["vertical"]) {
             $component->setClassnames('btn-group-vertical vertical');
-        } else if ( isset($options["justified"]) && !!$options["justified"] ) {
+        } else if (isset($options["justified"]) && !!$options["justified"]) {
             $component->addClass('btn-group-justified');
         }
         
-        if ( isset($options["size"]) && in_array($options["size"], $component->getSizes()) ) {
+        if (isset($options["size"]) && in_array($options["size"], $component->getSizes())) {
             $component->addClass('btn-group-'.$options["size"].' '.strtolower($this->_foundations_sizes["size"]));
         }
-        if ( isset($options["block"]) ) {
+        if (isset($options["block"])) {
             $component->setBlock($options["block"]);
         }
         if ($component->getBlock()) $component->addClass('btn-block expanded');
         
         
         
-        if ( isset($options["buttons"]) && !empty($options["buttons"]) ) {
+        if (isset($options["buttons"]) && !empty($options["buttons"])) {
             $component->setContent($options["buttons"]);
-        } else if ( isset($options["content"]) && !empty($options["content"]) ) {
+        } else if (isset($options["content"]) && !empty($options["content"])) {
             $component->setContent($options["content"]);
         }
 

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