pradosoft / prado

framework/Security/TAuthorizationRule.php

Spacing +22 added lines, -22 removed lines

@@ -78,7 +78,7 @@ 
 	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
 	{
 		$action = strtolower(trim($action));
-		if($action === 'allow' || $action === 'deny')
+		if ($action === 'allow' || $action === 'deny')
 			$this->_action = $action;
 		else
 			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
@@ -89,46 +89,46 @@ 
 		$this->_guest = false;
 		$this->_authenticated = false;
 
-		if(trim($users) === '')
+		if (trim($users) === '')
 			$users = '*';
-		foreach(explode(',', $users) as $user)
+		foreach (explode(',', $users) as $user)
 		{
-			if(($user = trim(strtolower($user))) !== '')
+			if (($user = trim(strtolower($user))) !== '')
 			{
-				if($user === '*')
+				if ($user === '*')
 				{
 					$this->_everyone = true;
 					break;
 				}
-				elseif($user === '?')
+				elseif ($user === '?')
 					$this->_guest = true;
-				elseif($user === '@')
+				elseif ($user === '@')
 					$this->_authenticated = true;
 				else
 					$this->_users[] = $user;
 			}
 		}
 
-		if(trim($roles) === '')
+		if (trim($roles) === '')
 			$roles = '*';
-		foreach(explode(',', $roles) as $role)
+		foreach (explode(',', $roles) as $role)
 		{
-			if(($role = trim(strtolower($role))) !== '')
+			if (($role = trim(strtolower($role))) !== '')
 				$this->_roles[] = $role;
 		}
 
-		if(($verb = trim(strtolower($verb))) === '')
+		if (($verb = trim(strtolower($verb))) === '')
 			$verb = '*';
-		if($verb === '*' || $verb === 'get' || $verb === 'post')
+		if ($verb === '*' || $verb === 'get' || $verb === 'post')
 			$this->_verb = $verb;
 		else
 			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
-		if(trim($ipRules) === '')
+		if (trim($ipRules) === '')
 			$ipRules = '*';
-		foreach(explode(',', $ipRules) as $ipRule)
+		foreach (explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule = trim($ipRule)) !== '')
+			if (($ipRule = trim($ipRule)) !== '')
 				$this->_ipRules[] = $ipRule;
 		}
 	}
@@ -206,19 +206,19 @@ 
 	 */
 	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;
+		if ($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
+		if (empty($this->_ipRules))
 			return 1;
-		foreach($this->_ipRules as $rule)
+		foreach ($this->_ipRules as $rule)
 		{
-			if($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
 				return 1;
 		}
 		return 0;
@@ -231,9 +231,9 @@ 
 
 	private function isRoleMatched($user)
 	{
-		foreach($this->_roles as $role)
+		foreach ($this->_roles as $role)
 		{
-			if($role === '*' || $user->isInRole($role))
+			if ($role === '*' || $user->isInRole($role))
 				return true;
 		}
 		return false;

framework/Security/TAuthorizationRuleCollection.php

Spacing +4 added lines, -4 removed lines

@@ -32,12 +32,12 @@ 
 	 */
 	public function isUserAllowed($user, $verb, $ip)
 	{
-		if($user instanceof IUser)
+		if ($user instanceof IUser)
 		{
 			$verb = strtolower(trim($verb));
-			foreach($this as $rule)
+			foreach ($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+				if (($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
 					return ($decision > 0);
 			}
 			return true;
@@ -56,7 +56,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
+		if ($item instanceof TAuthorizationRule)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');

framework/Security/TUser.php

Spacing +10 added lines, -10 removed lines

@@ -91,7 +91,7 @@ 
 	 */
 	public function setIsGuest($value)
 	{
-		if($isGuest = TPropertyValue::ensureBoolean($value))
+		if ($isGuest = TPropertyValue::ensureBoolean($value))
 		{
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles([]);
@@ -112,14 +112,14 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 			$this->setState('Roles', $value, []);
 		else
 		{
 			$roles = [];
-			foreach(explode(',', $value) as $role)
+			foreach (explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
+				if (($role = trim($role)) !== '')
 					$roles[] = $role;
 			}
 			$this->setState('Roles', $roles, []);
@@ -132,8 +132,8 @@ 
 	 */
 	public function isInRole($role)
 	{
-		foreach($this->getRoles() as $r)
-			if(strcasecmp($role, $r) === 0)
+		foreach ($this->getRoles() as $r)
+			if (strcasecmp($role, $r) === 0)
 				return true;
 		return false;
 	}
@@ -152,9 +152,9 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
+		if (!empty($data))
 			$this->_state = unserialize($data);
-		if(!is_array($this->_state))
+		if (!is_array($this->_state))
 			$this->_state = [];
 		return $this;
 	}
@@ -174,7 +174,7 @@ 
 	 */
 	protected function getState($key, $defaultValue = null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	protected function setState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_state[$key]);
 		else
 			$this->_state[$key] = $value;

framework/Security/TDbUserManager.php

Spacing +7 added lines, -7 removed lines

@@ -61,10 +61,10 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
+		if ($this->_userClass === '')
 			throw new TConfigurationException('dbusermanager_userclass_required');
 		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
-		if(!($this->_userFactory instanceof TDbUser))
+		if (!($this->_userFactory instanceof TDbUser))
 			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getUser($username = null)
 	{
-		if($username === null)
+		if ($username === null)
 		{
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
@@ -152,7 +152,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if ($this->_conn === null)
 		{
 			$this->_conn = $this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
@@ -168,10 +168,10 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID !== '')
+		if ($connectionID !== '')
 		{
 			$conn = $this->getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
+			if ($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
@@ -199,7 +199,7 @@ 
 	public function saveUserToCookie($cookie)
 	{
 		$user = $this->getApplication()->getUser();
-		if($user instanceof TDbUser)
+		if ($user instanceof TDbUser)
 			$user->saveUserToCookie($cookie);
 	}
 }
\ No newline at end of file

framework/Security/TSecurityManager.php

Spacing +13 added lines, -13 removed lines

@@ -84,8 +84,8 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+		if (null === $this->_validationKey) {
+			if (null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
 				$this->_validationKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
@@ -99,7 +99,7 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
 		$this->_validationKey = $value;
@@ -111,8 +111,8 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+		if (null === $this->_encryptionKey) {
+			if (null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
 				$this->_encryptionKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
@@ -126,7 +126,7 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
 		$this->_encryptionKey = $value;
@@ -148,7 +148,7 @@ 
 	public function setHashAlgorithm($value)
 	{
 		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
-		if(!in_array($this->_hashAlgorithm, hash_algos()))
+		if (!in_array($this->_hashAlgorithm, hash_algos()))
 			throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
 	}
 
@@ -167,7 +167,7 @@ 
 	public function setCryptAlgorithm($value)
 	{
 		$this->_cryptAlgorithm = TPropertyValue::ensureString($value);
-		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
+		if (!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
 			throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
 	}
 
@@ -179,11 +179,11 @@ 
 	 */
 	public function encrypt($data)
 	{
-		if(extension_loaded('openssl'))
+		if (extension_loaded('openssl'))
 		{
 			$key = md5($this->getEncryptionKey());
 			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
-			return $iv . openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
+			return $iv.openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
 		}
 		else
 			throw new TNotSupportedException('securitymanager_openssl_required');
@@ -197,7 +197,7 @@ 
 	 */
 	public function decrypt($data)
 	{
-		if(extension_loaded('openssl'))
+		if (extension_loaded('openssl'))
 		{
 			$key = md5($this->getEncryptionKey());
 			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
@@ -215,7 +215,7 @@ 
 	public function hashData($data)
 	{
 		$hmac = $this->computeHMAC($data);
-		return $hmac . $data;
+		return $hmac.$data;
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	{
 		$len = $this->strlen($this->computeHMAC('test'));
 
-		if($this->strlen($data) < $len)
+		if ($this->strlen($data) < $len)
 			return false;
 
 		$hmac = $this->substr($data, 0, $len);

framework/Wsat/pages/TWsatScaffolding.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 								{
 										$id = "cb_$tableName";
 										$obj = $this->tableNames->findControl($id);
-										if($obj !== null && $obj->Checked)
+										if ($obj !== null && $obj->Checked)
 										{
 												$scf_generator->generateCRUD($tableName);
 										}

framework/TApplicationComponent.php

Spacing +2 added lines, -2 removed lines

@@ -98,10 +98,10 @@
 	 */
 	public function publishAsset($assetPath, $className = null)
 	{
-		if($className === null)
+		if ($className === null)
 			$className = get_class($this);
 		$class = new \ReflectionClass($className);
-		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
+		$fullPath = dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
 	}
 

framework/TApplicationConfiguration.php

Spacing +64 added lines, -64 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
@@ -95,28 +95,28 @@ 
 	public function loadFromPhp($config, $configPath)
 	{
 		// application properties
-		if(isset($config['application']))
+		if (isset($config['application']))
 		{
-			foreach($config['application'] as $name => $value)
+			foreach ($config['application'] as $name => $value)
 			{
 				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
+		if (isset($config['paths']) && is_array($config['paths']))
 			$this->loadPathsPhp($config['paths'], $configPath);
 
-		if(isset($config['modules']) && is_array($config['modules']))
+		if (isset($config['modules']) && is_array($config['modules']))
 			$this->loadModulesPhp($config['modules'], $configPath);
 
-		if(isset($config['services']) && is_array($config['services']))
+		if (isset($config['services']) && is_array($config['services']))
 			$this->loadServicesPhp($config['services'], $configPath);
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
+		if (isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
 
-		if(isset($config['includes']) && is_array($config['includes']))
+		if (isset($config['includes']) && is_array($config['includes']))
 			$this->loadExternalXml($config['includes'], $configPath);
 	}
 
@@ -128,15 +128,15 @@ 
 	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
-		foreach($dom->getAttributes() as $name => $value)
+		foreach ($dom->getAttributes() as $name => $value)
 		{
 			$this->_properties[$name] = $value;
 			$this->_empty = false;
 		}
 
-		foreach($dom->getElements() as $element)
+		foreach ($dom->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'paths':
 					$this->loadPathsXml($element, $configPath);
@@ -167,26 +167,26 @@ 
 	 */
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
+		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
 		{
-			foreach($pathsNode['aliases'] as $id => $path)
+			foreach ($pathsNode['aliases'] as $id => $path)
 			{
 				$path = str_replace('\\', '/', $path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 					$p = realpath($path);
 				else
-					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-				if($p === false || !is_dir($p))
+					$p = realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				if ($p === false || !is_dir($p))
 					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-				if(isset($this->_aliases[$id]))
+				if (isset($this->_aliases[$id]))
 					throw new TConfigurationException('appconfig_alias_redefined', $id);
 				$this->_aliases[$id] = $p;
 			}
 		}
 
-		if(isset($pathsNode['using']) && is_array($pathsNode['using']))
+		if (isset($pathsNode['using']) && is_array($pathsNode['using']))
 		{
-			foreach($pathsNode['using'] as $namespace)
+			foreach ($pathsNode['using'] as $namespace)
 			{
 				$this->_usings[] = $namespace;
 			}
@@ -200,22 +200,22 @@ 
 	 */
 	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach($pathsNode->getElements() as $element)
+		foreach ($pathsNode->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'alias':
 				{
-					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
+					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
 						$path = str_replace('\\', '/', $path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 							$p = realpath($path);
 						else
-							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-						if($p === false || !is_dir($p))
+							$p = realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						if ($p === false || !is_dir($p))
 							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-						if(isset($this->_aliases[$id]))
+						if (isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						$this->_aliases[$id] = $p;
 					}
@@ -226,7 +226,7 @@ 
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
+					if (($namespace = $element->getAttribute('namespace')) !== null)
 						$this->_usings[] = $namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
@@ -246,20 +246,20 @@ 
 	 */
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach($modulesNode as $id => $module)
+		foreach ($modulesNode as $id => $module)
 		{
-			if(!isset($module['class']))
+			if (!isset($module['class']))
 				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = [];
-			if(isset($module['properties']))
+			if (isset($module['properties']))
 			{
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
+			$this->_modules[$id] = [$type, $properties, $module];
 			$this->_empty = false;
 		}
 	}
@@ -271,20 +271,20 @@ 
 	 */
 	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach($modulesNode->getElements() as $element)
+		foreach ($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'module')
+			if ($element->getTagName() === 'module')
 			{
 				$properties = $element->getAttributes();
 				$id = $properties->itemAt('id');
 				$type = $properties->remove('class');
-				if($type === null)
+				if ($type === null)
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+				if ($id === null)
+					$this->_modules[] = [$type, $properties->toArray(), $element];
 				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+					$this->_modules[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -299,15 +299,15 @@ 
 	 */
 	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach($servicesNode as $id => $service)
+		foreach ($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
+			if (!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
+			$this->_services[$id] = [$type, $properties, $service];
 			$this->_empty = false;
 		}
 	}
@@ -319,17 +319,17 @@ 
 	 */
 	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach($servicesNode->getElements() as $element)
+		foreach ($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'service')
+			if ($element->getTagName() === 'service')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
+				if (($id = $properties->itemAt('id')) === null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
+				if (($type = $properties->remove('class')) === null)
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
+				$this->_services[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -344,17 +344,17 @@ 
 	 */
 	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach($parametersNode as $id => $parameter)
+		foreach ($parametersNode as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				if(isset($parameter['class']))
+				if (isset($parameter['class']))
 				{
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : [];
 					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$this->_parameters[$id] = [$type, $properties];
 				}
 			}
 			else
@@ -371,22 +371,22 @@ 
 	 */
 	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach($parametersNode->getElements() as $element)
+		foreach ($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'parameter')
+			if ($element->getTagName() === 'parameter')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type = $properties->remove('class')) === null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
+					if (($value = $properties->remove('value')) === null)
 						$this->_parameters[$id] = $element;
 					else
 						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
+					$this->_parameters[$id] = [$type, $properties->toArray()];
 				$this->_empty = false;
 			}
 			else
@@ -401,14 +401,14 @@ 
 	 */
 	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach($includeNode as $include)
+		foreach ($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
+			$when = isset($include['when']) ?true:false;
+			if (!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = '('.$this->_includes[$filePath].') || ('.$when.')';
 			else
 				$$this->_includes[$filePath] = $when;
 			$this->_empty = false;
@@ -422,12 +422,12 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
+		if (($when = $includeNode->getAttribute('when')) === null)
 			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
+		if (($filePath = $includeNode->getAttribute('file')) === null)
 			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+		if (isset($this->_includes[$filePath]))
+			$this->_includes[$filePath] = '('.$this->_includes[$filePath].') || ('.$when.')';
 		else
 			$this->_includes[$filePath] = $when;
 		$this->_empty = false;

framework/Web/TSessionIterator.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 		{
 			$this->_key = next($this->_keys);
 		}
-		while(!isset($_SESSION[$this->_key]) && $this->_key !== false);
+		while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
 	}
 
 	/**