pradosoft / prado

framework/Wsat/TWsatBaseGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@ 
 	{
 		foreach ($this->getAllTableNames() as $table_name)
 		{
-			echo $table_name . "<br>";
+			echo $table_name."<br>";
 			$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-			echo "Table info:" . "<br>";
+			echo "Table info:"."<br>";
 			echo "<pre>";
 			print_r($tableInfo);
 			echo "</pre>";
@@ -82,6 +82,6 @@ 
 
 	protected function eq($data)
 	{
-		return '"' . $data . '"';
+		return '"'.$data.'"';
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -33,8 +33,9 @@ 
 
 	public function __construct()
 	{
-		if (!class_exists("TActiveRecordManager", false))
-			throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
+		if (!class_exists("TActiveRecordManager", false)) {
+					throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
+		}
 		$ar_manager = TActiveRecordManager::getInstance();
 		$_conn = $ar_manager->getDbConnection();
 		$_conn->Active = true;
@@ -44,10 +45,12 @@ 
 	public function setOpFile($op_file_namespace)
 	{
 		$op_file = Prado::getPathOfNamespace($op_file_namespace);
-		if (empty($op_file))
-			throw new Exception("You need to fix your output folder namespace.");
-		if (!is_dir($op_file))
-			mkdir($op_file, 0777, true);
+		if (empty($op_file)) {
+					throw new Exception("You need to fix your output folder namespace.");
+		}
+		if (!is_dir($op_file)) {
+					mkdir($op_file, 0777, true);
+		}
 		$this->_opFile = $op_file;
 	}
 
@@ -68,8 +71,9 @@ 
 	{
 		$tableNames = $this->_dbMetaData->findTableNames();
 		$index = array_search('pradocache', $tableNames);
-		if ($index)
-			array_splice($tableNames, $index, 1);
+		if ($index) {
+					array_splice($tableNames, $index, 1);
+		}
 		return $tableNames;
 	}
 

framework/Wsat/TWsatARGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
 		private function _commonGenerate($tableName, $tableInfo)
 		{
 				if (count($tableInfo->getColumns()) === 0)
-						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+						throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
 				else
 				{
 						$properties = [];
@@ -148,7 +148,7 @@ 
 
 				$clasName = $this->_getProperClassName($tableName);
 				$class = $this->generateClass($properties, $tableName, $clasName, $toString);
-				$output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+				$output = $this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
 				file_put_contents($output, $class);
 		}
 
@@ -156,7 +156,7 @@ 
 		{
 				$table_name_words = str_replace("_", " ", strtolower($tableName));
 				$final_conversion = str_replace(" ", "", ucwords($table_name_words));
-				return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+				return $this->_clasPrefix.$final_conversion.$this->_classSufix;
 		}
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ 
 		protected function generateProperty($field, $metadata)
 		{
 				$prop = '';
-				$name = '$' . $field;
+				$name = '$'.$field;
 
 				/* TODO use in version 2.0 */
 				// $type = $column->getPHPType();
@@ -180,7 +180,7 @@ 
 
 				$code = "\tpublic static \$RELATIONS = array (";
 				foreach ($this->_relations[$tablename] as $rel_data)
-						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+						$code .= "\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
 				$code = substr($code, 0, -1);
 				$code .= "\n\t);";

Braces +24 added lines, -15 removed lines

@@ -71,8 +71,10 @@ 
 						if (!empty($this->_relations))
 						{
 								// Cancel generation of M-M relationships middle table
-								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2) {
+									//M-M relationships
 										continue;
+								}
 						}
 						$this->_commonGenerate($tableName, $tableInfo);
 				}
@@ -87,9 +89,11 @@ 
 						$pks = $tableInfo->getPrimaryKeys();
 						$fks = $tableInfo->getForeignKeys();
 
-						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2) {
+							//M-M relationships
 						{
 								$table_name_mm = $fks[0]["table"];
+						}
 								$table_name_mm2 = $fks[1]["table"];
 
 								$this->_relations[$table_name_mm][] = [
@@ -107,9 +111,11 @@ 
 								];
 								continue;
 						}
-						foreach ($fks as $fk_data)//1-M relationships
+						foreach ($fks as $fk_data) {
+							//1-M relationships
 						{
 								$owner_table = $fk_data["table"];
+						}
 								$slave_table = $table_name;
 								$fk_prop = key($fk_data["keys"]);
 
@@ -136,13 +142,14 @@ 
 
 		private function _commonGenerate($tableName, $tableInfo)
 		{
-				if (count($tableInfo->getColumns()) === 0)
-						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
-				else
+				if (count($tableInfo->getColumns()) === 0) {
+										throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+				} else
 				{
 						$properties = [];
-						foreach ($tableInfo->getColumns() as $field => $metadata)
-								$properties[] = $this->generateProperty($field, $metadata);
+						foreach ($tableInfo->getColumns() as $field => $metadata) {
+														$properties[] = $this->generateProperty($field, $metadata);
+						}
 						$toString = $this->_buildSmartToString($tableInfo);
 				}
 
@@ -175,12 +182,14 @@ 
 
 		private function _renderRelations($tablename)
 		{
-				if (!isset($this->_relations[$tablename]))
-						return "";
+				if (!isset($this->_relations[$tablename])) {
+										return "";
+				}
 
 				$code = "\tpublic static \$RELATIONS = array (";
-				foreach ($this->_relations[$tablename] as $rel_data)
-						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				foreach ($this->_relations[$tablename] as $rel_data) {
+										$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				}
 
 				$code = substr($code, 0, -1);
 				$code .= "\n\t);";
@@ -195,9 +204,9 @@ 
 				{
 						foreach ($tableInfo->getColumns() as $column)
 						{
-								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-										$property = str_replace($this->uqChars, "", $column->ColumnName);
-								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey) {
+																		$property = str_replace($this->uqChars, "", $column->ColumnName);
+								} elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
 								{
 										$property = str_replace($this->uqChars, "", $column->ColumnName);
 										break;

framework/Wsat/TWsatService.php

Braces +6 added lines, -4 removed lines

@@ -48,11 +48,13 @@
 
 		public function init($config)
 		{
-				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
-						throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
+				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal) {
+										throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
+				}
 
-				if (empty($this->_pass))
-						throw new TConfigurationException("You need to specify the Password attribute.");
+				if (empty($this->_pass)) {
+										throw new TConfigurationException("You need to specify the Password attribute.");
+				}
 
 				$this->setDefaultPage("TWsatHome");
 				$this->_startThemeManager();

framework/Wsat/pages/TWsatGenerateAR.php

Braces +8 added lines, -6 removed lines

@@ -37,13 +37,15 @@
 								$ar_generator->setClasPrefix($classPrefix);
 								$ar_generator->setClassSufix($classSuffix);
 
-								if ($this->build_rel->Checked)
-										$ar_generator->buildRelations();
+								if ($this->build_rel->Checked) {
+																		$ar_generator->buildRelations();
+								}
 
-								if ($tableName != "*")
-										$ar_generator->generate($tableName);
-								else
-										$ar_generator->generateAll();
+								if ($tableName != "*") {
+																		$ar_generator->generate($tableName);
+								} else {
+																		$ar_generator->generateAll();
+								}
 
 								$this->feedback_panel->CssClass = "green_panel";
 								$this->generation_msg->Text = "The code has been generated successfully.";

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/Wsat/TWsatScaffoldingGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -53,23 +53,23 @@
 		{
 			default:
 			case self::LIST_TYPE:
-				$unitName = "list" . ucfirst($tableName);
+				$unitName = "list".ucfirst($tableName);
 				break;
 
 			case self::ADD_TYPE:
-				$unitName = "add" . ucfirst($tableName);
+				$unitName = "add".ucfirst($tableName);
 				break;
 
 			case self::SHOW_TYPE:
-				$unitName = "show" . ucfirst($tableName);
+				$unitName = "show".ucfirst($tableName);
 				break;
 		}
 
 		$class = $this->generateClass($unitName);
-		$outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+		$outputClass = $this->_opFile.DIRECTORY_SEPARATOR.$unitName.".php";
 		file_put_contents($outputClass, $class);
 
-		$outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
+		$outputPage = $this->_opFile.DIRECTORY_SEPARATOR.$unitName.".page";
 		$page = $this->generatePage($tableName, $viewType);
 		file_put_contents($outputPage, $page);
 	}

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

Braces +3 added lines, -2 removed lines

@@ -98,8 +98,9 @@
 	 */
 	public function publishAsset($assetPath, $className = null)
 	{
-		if($className === null)
-			$className = get_class($this);
+		if($className === null) {
+					$className = get_class($this);
+		}
 		$class = new \ReflectionClass($className);
 		$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;

Braces +101 added lines, -76 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -104,20 +103,25 @@ 
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'], $configPath);
+		if(isset($config['paths']) && is_array($config['paths'])) {
+					$this->loadPathsPhp($config['paths'], $configPath);
+		}
 
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'], $configPath);
+		if(isset($config['modules']) && is_array($config['modules'])) {
+					$this->loadModulesPhp($config['modules'], $configPath);
+		}
 
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'], $configPath);
+		if(isset($config['services']) && is_array($config['services'])) {
+					$this->loadServicesPhp($config['services'], $configPath);
+		}
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
-			$this->loadParametersPhp($config['parameters'], $configPath);
+		if(isset($config['parameters']) && is_array($config['parameters'])) {
+					$this->loadParametersPhp($config['parameters'], $configPath);
+		}
 
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'], $configPath);
+		if(isset($config['includes']) && is_array($config['includes'])) {
+					$this->loadExternalXml($config['includes'], $configPath);
+		}
 	}
 
 	/**
@@ -172,14 +176,18 @@ 
 			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))
-					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined', $id);
+				} else {
+									$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])) {
+									throw new TConfigurationException('appconfig_alias_redefined', $id);
+				}
 				$this->_aliases[$id] = $p;
 			}
 		}
@@ -209,27 +217,32 @@ 
 					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))
-							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined', $id);
+						} else {
+													$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])) {
+													throw new TConfigurationException('appconfig_alias_redefined', $id);
+						}
 						$this->_aliases[$id] = $p;
+					} else {
+											throw new TConfigurationException('appconfig_alias_invalid');
 					}
-					else
-						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty = false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
-						$this->_usings[] = $namespace;
-					else
-						throw new TConfigurationException('appconfig_using_invalid');
+					if(($namespace = $element->getAttribute('namespace')) !== null) {
+											$this->_usings[] = $namespace;
+					} else {
+											throw new TConfigurationException('appconfig_using_invalid');
+					}
 					$this->_empty = false;
 					break;
 				}
@@ -248,8 +261,9 @@ 
 	{
 		foreach($modulesNode as $id => $module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required', $id);
+			if(!isset($module['class'])) {
+							throw new TConfigurationException('appconfig_moduletype_required', $id);
+			}
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = [];
@@ -278,17 +292,19 @@ 
 				$properties = $element->getAttributes();
 				$id = $properties->itemAt('id');
 				$type = $properties->remove('class');
-				if($type === null)
-					throw new TConfigurationException('appconfig_moduletype_required', $id);
+				if($type === null) {
+									throw new TConfigurationException('appconfig_moduletype_required', $id);
+				}
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
-				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+				if($id === null) {
+									$this->_modules[] = [$type,$properties->toArray(),$element];
+				} else {
+									$this->_modules[$id] = [$type,$properties->toArray(),$element];
+				}
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
 
@@ -301,8 +317,9 @@ 
 	{
 		foreach($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
-				throw new TConfigurationException('appconfig_servicetype_required');
+			if(!isset($service['class'])) {
+							throw new TConfigurationException('appconfig_servicetype_required');
+			}
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
@@ -324,16 +341,18 @@ 
 			if($element->getTagName() === 'service')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
-					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
-					throw new TConfigurationException('appconfig_servicetype_required', $id);
+				if(($id = $properties->itemAt('id')) === null) {
+									throw new TConfigurationException('appconfig_serviceid_required');
+				}
+				if(($type = $properties->remove('class')) === null) {
+									throw new TConfigurationException('appconfig_servicetype_required', $id);
+				}
 				$element->setParent(null);
 				$this->_services[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
 
@@ -356,8 +375,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = [$type,$properties];
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -376,21 +394,23 @@ 
 			if($element->getTagName() === 'parameter')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
-					throw new TConfigurationException('appconfig_parameterid_required');
+				if(($id = $properties->remove('id')) === null) {
+									throw new TConfigurationException('appconfig_parameterid_required');
+				}
 				if(($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
-						$this->_parameters[$id] = $element;
-					else
-						$this->_parameters[$id] = $value;
+					if(($value = $properties->remove('value')) === null) {
+											$this->_parameters[$id] = $element;
+					} else {
+											$this->_parameters[$id] = $value;
+					}
+				} else {
+									$this->_parameters[$id] = [$type,$properties->toArray()];
 				}
-				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
 
@@ -404,13 +424,15 @@ 
 		foreach($includeNode as $include)
 		{
 			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
-				throw new TConfigurationException('appconfig_includefile_required');
+			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 . ')';
-			else
-				$$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,14 +444,17 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
-			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
-			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
-		else
-			$this->_includes[$filePath] = $when;
+		if(($when = $includeNode->getAttribute('when')) === null) {
+					$when = true;
+		}
+		if(($filePath = $includeNode->getAttribute('file')) === null) {
+					throw new TConfigurationException('appconfig_includefile_required');
+		}
+		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);
 	}
 
 	/**