pradosoft / prado

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

framework/Security/TAuthorizationRule.php

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 				{
 					$this->_everyone = true;
 					break;
-				}
-				elseif($user === '?')
+				} elseif($user === '?')
 					$this->_guest = true;
 				elseif($user === '@')
 					$this->_authenticated = true;

Spacing +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
 		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action === 'allow')?1:-1;
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}

framework/Collections/TStack.php

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 				$this->_d[] = $item;
 				++$this->_c;
 			}
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 				$this->_d[] = $item;
 				++$this->_c;
 			}
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

framework/TPropertyValue.php

Braces +3 added lines, -6 removed lines

@@ -124,11 +124,9 @@ 
 			{
 				eval('$array=array' . $value . ';');
 				return $array;
-			}
-			else
+			} else
 				return $len > 0?[$value]:[];
-		}
-		else
+		} else
 			return (array)$value;
 	}
 
@@ -171,8 +169,7 @@ 
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
-		}
-		elseif(!is_array($enums))
+		} elseif(!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);

Spacing +13 added lines, -13 removed lines

@@ -62,10 +62,10 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
+		if(is_string($value))
 			return strcasecmp($value, 'true') == 0 || $value != 0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -77,12 +77,12 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
+		if(TJavaScript::isJsLiteral($value))
 			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
+		if(is_bool($value))
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -120,16 +120,16 @@ 
 		{
 			$value = trim($value);
 			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
+			if($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
 			{
 				eval('$array=array' . $value . ';');
 				return $array;
 			}
 			else
-				return $len > 0?[$value]:[];
+				return $len > 0 ? [$value] : [];
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -190,6 +190,6 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ?null:$value;
 	}
 }
\ No newline at end of file

framework/Web/Services/TPageConfiguration.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			if($dom->loadFromFile($fname))

Spacing +13 added lines, -13 removed lines

@@ -200,7 +200,7 @@ 
 			$rules = [];
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns = isset($authorization['pages'])?$authorization['pages']:'';
+				$patterns = isset($authorization['pages']) ? $authorization['pages'] : '';
 				$ruleApplies = false;
 				if(empty($patterns) || trim($patterns) === '*') // null or empty string
 					$ruleApplies = true;
@@ -231,11 +231,11 @@ 
 				}
 				if($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
+					$action = isset($authorization['action']) ? $authorization['action'] : '';
+					$users = isset($authorization['users']) ? $authorization['users'] : '';
+					$roles = isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb = isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips = isset($authorization['ips']) ? $authorization['ips'] : '';
 					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
@@ -258,7 +258,7 @@ 
 					unset($page['properties']);
 				}
 				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
 				if(strcasecmp($id, $this->_pagePath) === 0)
 					$matching = true;
 				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
@@ -273,14 +273,14 @@ 
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when = isset($include['when']) ?true:false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
 				$filePath = $include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+					$this->_includes[$filePath] = [$configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
 				else
-					$this->_includes[$filePath] = [$configPagePath,$when];
+					$this->_includes[$filePath] = [$configPagePath, $when];
 			}
 		}
 	}
@@ -346,7 +346,7 @@ 
 				if(empty($id))
 					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
 				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
 				if(strcasecmp($id, $this->_pagePath) === 0)
 					$matching = true;
 				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
@@ -364,9 +364,9 @@ 
 			if(($filePath = $node->getAttribute('file')) === null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
 			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+				$this->_includes[$filePath] = [$configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
 			else
-				$this->_includes[$filePath] = [$configPagePath,$when];
+				$this->_includes[$filePath] = [$configPagePath, $when];
 		}
 	}
 }
\ No newline at end of file

framework/Web/TAssetManager.php

Braces +2 added lines, -4 removed lines

@@ -173,8 +173,7 @@ 
 			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
-		}
-		else
+		} else
 		{
 			$dir = $this->hash($fullpath);
 			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -297,8 +296,7 @@ 
 						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);

framework/Web/UI/TTheme.php

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins = $skins;
-				}
-				else
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -295,20 +294,16 @@ 
 							{
 								$setter = 'set' . $name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly', $type, $name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else	// complex property
 						$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
 						elseif($skin[0] !== -1)
 							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
 						$type = $skin[1];
-						$id = isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$id = isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
 						if(isset($this->_skins[$type][$id]))
 							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
@@ -171,7 +171,7 @@ 
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
 			if($cache !== null)
-				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins, $this->_cssFiles, $this->_jsFiles, time()]);
 		}
 	}
 

framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php

Braces +5 added lines, -10 removed lines

@@ -51,8 +51,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -65,8 +64,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -74,11 +72,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
@@ -87,8 +83,7 @@ 
 				if($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');