bb-drummer / my-application

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

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

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

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

module/UIComponents/src/UIComponents/View/Helper/Utilities/AppLogo.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config;
     }
     

module/UIComponents/src/UIComponents/View/Helper/Utilities/AppTitle.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config;
     }
     

module/UIComponents/src/UIComponents/View/Helper/Utilities/AppFavicon.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function render($container = null)
     {
-        $config = new \Zend\Config\Config( $this->getServiceLocator()->getServiceLocator()->get('Config') );
+        $config = new \Zend\Config\Config($this->getServiceLocator()->getServiceLocator()->get('Config'));
         return $config;
     }
     

module/Admin/src/Admin/Entity/User.php

Spacing +9 added lines, -9 removed lines

@@ -54,30 +54,30 @@
      */
     public function exchangeArray($data = array(), $forceEncryptPassword = false)
     {
-        if (isset($data['id']) && !empty($data["id"]) ) {
+        if (isset($data['id']) && !empty($data["id"])) {
             $this->id            = ($data['id']);
             $this->user_id        = ($data['id']);
-        } elseif (isset($data['user_id']) && !empty($data["user_id"]) ) {
+        } elseif (isset($data['user_id']) && !empty($data["user_id"])) {
             $this->id            = ($data['user_id']);
             $this->user_id        = ($data['user_id']);
         }
-        $this->username        = (isset($data['username'])) ? $data['username'] : $this->username;
-        $this->email        = (isset($data['email'])) ? $data['email'] : $this->email;
-        if (isset($data['displayName']) ) {
+        $this->username = (isset($data['username'])) ? $data['username'] : $this->username;
+        $this->email = (isset($data['email'])) ? $data['email'] : $this->email;
+        if (isset($data['displayName'])) {
             $this->display_name    = $data['displayName'];
             $this->displayName    = $data['displayName'];
-        } elseif (isset($data['display_name']) ) {
+        } elseif (isset($data['display_name'])) {
             $this->display_name    = $data['display_name'];
             $this->displayName    = $data['display_name'];
         }
-        if (isset($data["password"]) && $forceEncryptPassword ) {
+        if (isset($data["password"]) && $forceEncryptPassword) {
             $bcrypt = new Bcrypt;
             $bcrypt->setCost(null); // @TODO $this->getUserService()->getOptions()->getPasswordCost());
             $data["password"] = $bcrypt->create($data['password']);
         }
-        $this->password        = (isset($data['password'])) ? $data['password'] : $this->password;
+        $this->password = (isset($data['password'])) ? $data['password'] : $this->password;
         $this->state        = (isset($data['state'])) ? $data['state'] : $this->state;
-        $this->aclrole        = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
+        $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
         $this->token        = (isset($data['token'])) ? $data['token'] : $this->token;
         
         return $this;