pradosoft / prado

framework/Data/SqlMap/DataMapper/TSqlMapFifoCache.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
-		if($this->_keyList->getCount() > $this->_cacheSize)
+		if ($this->_keyList->getCount() > $this->_cacheSize)
 		{
 			$oldestKey = $this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);

framework/Data/SqlMap/DataMapper/TSqlMapException.php

Spacing +10 added lines, -10 removed lines

@@ -30,12 +30,12 @@ 
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
+		for ($i = 0; $i < $n; ++$i)
 		{
-			if($args[$i] instanceof SimpleXMLElement)
-				$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
+			if ($args[$i] instanceof SimpleXMLElement)
+				$tokens['{'.$i.'}'] = $this->implodeNode($args[$i]);
 			else
-				$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+				$tokens['{'.$i.'}'] = TPropertyValue::ensureString($args[$i]);
 		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
@@ -47,9 +47,9 @@ 
 	protected function implodeNode($node)
 	{
 		$attributes = [];
-		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
-		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
+		foreach ($node->attributes() as $k => $v)
+			$attributes[] = $k.'="'.(string) $v.'"';
+		return '<'.$node->getName().' '.implode(' ', $attributes).'>';
 	}
 
 	/**
@@ -59,9 +59,9 @@ 
 	{
 		$lang = Prado::getPreferredLanguage();
 		$dir = dirname(__FILE__);
-		$msgFile = $dir . '/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = $dir . '/messages.txt';
+		$msgFile = $dir.'/messages-'.$lang.'.txt';
+		if (!is_file($msgFile))
+			$msgFile = $dir.'/messages.txt';
 		return $msgFile;
 	}
 }
\ No newline at end of file

Braces +11 added lines, -8 removed lines

@@ -32,10 +32,11 @@ 
 		$tokens = [];
 		for($i = 0;$i < $n;++$i)
 		{
-			if($args[$i] instanceof SimpleXMLElement)
-				$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
-			else
-				$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+			if($args[$i] instanceof SimpleXMLElement) {
+							$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
+			} else {
+							$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+			}
 		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
@@ -47,8 +48,9 @@ 
 	protected function implodeNode($node)
 	{
 		$attributes = [];
-		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
+		foreach($node->attributes() as $k => $v) {
+					$attributes[] = $k . '="' . (string)$v . '"';
+		}
 		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
 	}
 
@@ -60,8 +62,9 @@ 
 		$lang = Prado::getPreferredLanguage();
 		$dir = dirname(__FILE__);
 		$msgFile = $dir . '/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = $dir . '/messages.txt';
+		if(!is_file($msgFile)) {
+					$msgFile = $dir . '/messages.txt';
+		}
 		return $msgFile;
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 	public function getType()
 	{
-		if($this->_type === null)
+		if ($this->_type === null)
 			return get_class($this);
 		else
 			return $this->_type;

Braces +5 added lines, -4 removed lines

@@ -50,10 +50,11 @@
 
 	public function getType()
 	{
-		if($this->_type === null)
-			return get_class($this);
-		else
-			return $this->_type;
+		if($this->_type === null) {
+					return get_class($this);
+		} else {
+					return $this->_type;
+		}
 	}
 
 	public function setType($value)

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php

Spacing +8 added lines, -8 removed lines

@@ -31,8 +31,8 @@ 
 	 */
 	public function getDbTypeHandler($dbType = 'NULL')
 	{
-		foreach($this->_typeHandlers as $handler)
-			if($handler->getDbType() === $dbType)
+		foreach ($this->_typeHandlers as $handler)
+			if ($handler->getDbType() === $dbType)
 				return $handler;
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getTypeHandler($class)
 	{
-		if(isset($this->_typeHandlers[$class]))
+		if (isset($this->_typeHandlers[$class]))
 			return $this->_typeHandlers[$class];
 	}
 
@@ -63,9 +63,9 @@ 
 	 */
 	public function createInstanceOf($type = '')
 	{
-		if(strlen($type) > 0)
+		if (strlen($type) > 0)
 		{
-			switch(strtolower($type))
+			switch (strtolower($type))
 			{
 				case 'string': return '';
 				case 'array': return [];
@@ -74,9 +74,9 @@ 
 				case 'bool': case 'boolean': return false;
 			}
 
-			if(class_exists('Prado', false))
+			if (class_exists('Prado', false))
 				return Prado::createComponent($type);
-			elseif(class_exists($type, false)) //NO auto loading
+			elseif (class_exists($type, false)) //NO auto loading
 				return new $type;
 			else
 				throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
@@ -91,7 +91,7 @@ 
 	 */
 	public function convertToType($type, $value)
 	{
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'integer': case 'int':
 				$type = 'integer'; break;

Braces +13 added lines, -9 removed lines

@@ -31,9 +31,10 @@ 
 	 */
 	public function getDbTypeHandler($dbType = 'NULL')
 	{
-		foreach($this->_typeHandlers as $handler)
-			if($handler->getDbType() === $dbType)
+		foreach($this->_typeHandlers as $handler) {
+					if($handler->getDbType() === $dbType)
 				return $handler;
+		}
 	}
 
 	/**
@@ -42,8 +43,9 @@ 
 	 */
 	public function getTypeHandler($class)
 	{
-		if(isset($this->_typeHandlers[$class]))
-			return $this->_typeHandlers[$class];
+		if(isset($this->_typeHandlers[$class])) {
+					return $this->_typeHandlers[$class];
+		}
 	}
 
 	/**
@@ -74,12 +76,14 @@ 
 				case 'bool': case 'boolean': return false;
 			}
 
-			if(class_exists('Prado', false))
-				return Prado::createComponent($type);
-			elseif(class_exists($type, false)) //NO auto loading
+			if(class_exists('Prado', false)) {
+							return Prado::createComponent($type);
+			} elseif(class_exists($type, false)) {
+				//NO auto loading
 				return new $type;
-			else
-				throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
+			} else {
+							throw new TSqlMapException('sqlmap_unable_to_find_class', $type);
+			}
 		}
 	}
 

framework/Data/SqlMap/DataMapper/TLazyLoadList.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 		$statement = $mappedStatement->getStatement();
 		$registry = $mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
+		if (!is_object($list))
 			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
 		return new TObjectProxy($handler, $list);
 	}
@@ -79,7 +79,7 @@ 
 	 */
 	protected function fetchListData()
 	{
-		if($this->_loaded == false)
+		if ($this->_loaded == false)
 		{
 			$this->_innerList = $this->_statement->executeQueryForList($this->_connection, $this->_param);
 			$this->_loaded = true;
@@ -96,7 +96,7 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
+		if (is_object($this->_innerList))
 			return in_array($method, get_class_methods($this->_innerList));
 		return false;
 	}

Braces +6 added lines, -4 removed lines

@@ -59,8 +59,9 @@ 
 		$statement = $mappedStatement->getStatement();
 		$registry = $mappedStatement->getManager()->getTypeHandlers();
 		$list = $statement->createInstanceOfListClass($registry);
-		if(!is_object($list))
-			throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
+		if(!is_object($list)) {
+					throw new TSqlMapExecutionException('sqlmap_invalid_lazyload_list', $statement->getID());
+		}
 		return new TObjectProxy($handler, $list);
 	}
 
@@ -96,8 +97,9 @@ 
 	public function hasMethod($method)
 	{
 		$this->fetchListData();
-		if(is_object($this->_innerList))
-			return in_array($method, get_class_methods($this->_innerList));
+		if(is_object($this->_innerList)) {
+					return in_array($method, get_class_methods($this->_innerList));
+		}
 		return false;
 	}
 }
\ No newline at end of file

framework/Data/SqlMap/DataMapper/TSqlMapLruCache.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	public function get($key)
 	{
-		if($this->_keyList->contains($key))
+		if ($this->_keyList->contains($key))
 		{
 			$this->_keyList->remove($key);
 			$this->_keyList->add($key);
@@ -45,7 +45,7 @@ 
 	{
 		$this->_cache->add($key, $value);
 		$this->_keyList->add($key);
-		if($this->_keyList->getCount() > $this->_cacheSize)
+		if ($this->_keyList->getCount() > $this->_cacheSize)
 		{
 			$oldestKey = $this->_keyList->removeAt(0);
 			$this->_cache->remove($oldestKey);

framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -31,9 +31,9 @@ 
 	 */
 	protected function createObjectFromNode($node)
 	{
-		if(isset($node['class']))
+		if (isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
+			$obj = Prado::createComponent((string) $node['class']);
 			$this->setObjectPropFromNode($obj, $node, ['class']);
 			return $obj;
 		}
@@ -50,12 +50,12 @@ 
 	 */
 	protected function setObjectPropFromNode($obj, $node, $except = [])
 	{
-		foreach($node->attributes() as $name => $value)
+		foreach ($node->attributes() as $name => $value)
 		{
-			if(!in_array($name, $except))
+			if (!in_array($name, $except))
 			{
-				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+				if ($obj->canSetProperty($name))
+					$obj->{$name} = (string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -72,10 +72,10 @@ 
 	protected function getAbsoluteFilePath($basefile, $resource)
 	{
 		$basedir = dirname($basefile);
-		$file = realpath($basedir . DIRECTORY_SEPARATOR . $resource);
-		if(!is_string($file) || !is_file($file))
+		$file = realpath($basedir.DIRECTORY_SEPARATOR.$resource);
+		if (!is_string($file) || !is_file($file))
 			$file = realpath($resource);
-		if(is_string($file) && is_file($file))
+		if (is_string($file) && is_file($file))
 			return $file;
 		else
 			throw new TSqlMapConfigurationException(
@@ -88,9 +88,9 @@ 
 	 */
 	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if(strpos($filename, '${') !== false)
+		if (strpos($filename, '${') !== false)
 			$filename = $config->replaceProperties($filename);
-		if(!is_file($filename))
+		if (!is_file($filename))
 			throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
 		return simplexml_load_string($config->replaceProperties(file_get_contents($filename)));
@@ -105,10 +105,10 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(['id','ID','Id', 'iD'] as $id)
+		foreach (['id', 'ID', 'Id', 'iD'] as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
+			foreach ($document->xpath($xpath) as $node)
 				return $node;
 		}
 	}

Braces +22 added lines, -16 removed lines

@@ -54,12 +54,13 @@ 
 		{
 			if(!in_array($name, $except))
 			{
-				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
-				else
-					throw new TSqlMapConfigurationException(
+				if($obj->canSetProperty($name)) {
+									$obj->{$name} = (string)$value;
+				} else {
+									throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
 						$node, $this->getConfigFile());
+				}
 			}
 		}
 	}
@@ -73,13 +74,15 @@ 
 	{
 		$basedir = dirname($basefile);
 		$file = realpath($basedir . DIRECTORY_SEPARATOR . $resource);
-		if(!is_string($file) || !is_file($file))
-			$file = realpath($resource);
-		if(is_string($file) && is_file($file))
-			return $file;
-		else
-			throw new TSqlMapConfigurationException(
+		if(!is_string($file) || !is_file($file)) {
+					$file = realpath($resource);
+		}
+		if(is_string($file) && is_file($file)) {
+					return $file;
+		} else {
+					throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_resource', $resource);
+		}
 	}
 	/**
 	 * Load document using simple xml.
@@ -88,11 +91,13 @@ 
 	 */
 	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if(strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
-		if(!is_file($filename))
-			throw new TSqlMapConfigurationException(
+		if(strpos($filename, '${') !== false) {
+					$filename = $config->replaceProperties($filename);
+		}
+		if(!is_file($filename)) {
+					throw new TSqlMapConfigurationException(
 				'sqlmap_unable_to_find_config', $filename);
+		}
 		return simplexml_load_string($config->replaceProperties(file_get_contents($filename)));
 	}
 	/**
@@ -108,8 +113,9 @@ 
 		foreach(['id','ID','Id', 'iD'] as $id)
 		{
 			$xpath = "//{$tag}[@{$id}='{$value}']";
-			foreach($document->xpath($xpath) as $node)
-				return $node;
+			foreach($document->xpath($xpath) as $node) {
+							return $node;
+			}
 		}
 	}
 	/**

framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 		$mappings = [];
 		preg_match_all(self::PARAMETER_TOKEN_REGEXP, $sqlText, $matches);
 
-		for($i = 0, $k = count($matches[1]); $i < $k; $i++)
+		for ($i = 0, $k = count($matches[1]); $i < $k; $i++)
 		{
 			$mappings[] = $this->parseMapping($matches[1][$i], $scope);
 			$sqlText = str_replace($matches[0][$i], '?', $sqlText);
@@ -62,12 +62,12 @@ 
 		$mapping = new TParameterProperty;
 		$properties = explode(',', $token);
 		$mapping->setProperty(trim(array_shift($properties)));
-		foreach($properties as $property)
+		foreach ($properties as $property)
 		{
 			$prop = explode('=', $property);
 			$name = trim($prop[0]); $value = trim($prop[1]);
-			if($mapping->canSetProperty($name))
-				$mapping->{'set' . $name}($value);
+			if ($mapping->canSetProperty($name))
+				$mapping->{'set'.$name}($value);
 			else
 			{
 				throw new TSqlMapUndefinedException(

Braces +3 added lines, -3 removed lines

@@ -66,9 +66,9 @@
 		{
 			$prop = explode('=', $property);
 			$name = trim($prop[0]); $value = trim($prop[1]);
-			if($mapping->canSetProperty($name))
-				$mapping->{'set' . $name}($value);
-			else
+			if($mapping->canSetProperty($name)) {
+							$mapping->{'set' . $name}($value);
+			} else
 			{
 				throw new TSqlMapUndefinedException(
 						'sqlmap_undefined_property_inline_map',

framework/Data/SqlMap/Configuration/TParameterMap.php

Spacing +7 added lines, -7 removed lines

@@ -101,9 +101,9 @@ 
 	 */
 	public function getProperty($index)
 	{
-		if(is_string($index))
+		if (is_string($index))
 			return $this->_propertyMap->itemAt($index);
-		elseif(is_int($index))
+		elseif (is_int($index))
 			return $this->_properties->itemAt($index);
 		else
 			throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
@@ -147,12 +147,12 @@ 
 	{
 		$value = $this->getObjectValue($parameterValue, $property);
 
-		if(($handler = $this->createTypeHandler($property, $registry)) !== null)
+		if (($handler = $this->createTypeHandler($property, $registry)) !== null)
 			$value = $handler->getParameter($value);
 
 		$value = $this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType()) !== null)
+		if (($type = $property->getType()) !== null)
 			$value = $registry->convertToType($type, $value);
 
 		return $value;
@@ -169,7 +169,7 @@ 
 	{
 		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $property->getTypeHandler())
+		if ($handler === null && $property->getTypeHandler())
 			$handler = Prado::createComponent($type);
 		return $handler;
 	}
@@ -207,9 +207,9 @@ 
 	 */
 	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue()) !== null)
+		if (($nullValue = $property->getNullValue()) !== null)
 		{
-			if($nullValue === $value)
+			if ($nullValue === $value)
 				$value = null;
 		}
 		return $value;

Braces +20 added lines, -16 removed lines

@@ -101,12 +101,13 @@ 
 	 */
 	public function getProperty($index)
 	{
-		if(is_string($index))
-			return $this->_propertyMap->itemAt($index);
-		elseif(is_int($index))
-			return $this->_properties->itemAt($index);
-		else
-			throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
+		if(is_string($index)) {
+					return $this->_propertyMap->itemAt($index);
+		} elseif(is_int($index)) {
+					return $this->_properties->itemAt($index);
+		} else {
+					throw new TSqlMapException('sqlmap_index_must_be_string_or_int', $index);
+		}
 	}
 
 	/**
@@ -147,13 +148,15 @@ 
 	{
 		$value = $this->getObjectValue($parameterValue, $property);
 
-		if(($handler = $this->createTypeHandler($property, $registry)) !== null)
-			$value = $handler->getParameter($value);
+		if(($handler = $this->createTypeHandler($property, $registry)) !== null) {
+					$value = $handler->getParameter($value);
+		}
 
 		$value = $this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType()) !== null)
-			$value = $registry->convertToType($type, $value);
+		if(($type = $property->getType()) !== null) {
+					$value = $registry->convertToType($type, $value);
+		}
 
 		return $value;
 	}
@@ -169,8 +172,9 @@ 
 	{
 		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+		if($handler === null && $property->getTypeHandler()) {
+					$handler = Prado::createComponent($type);
+		}
 		return $handler;
 	}
 
@@ -186,8 +190,7 @@ 
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -209,8 +212,9 @@ 
 	{
 		if(($nullValue = $property->getNullValue()) !== null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue === $value) {
+							$value = null;
+			}
 		}
 		return $value;
 	}