pradosoft / prado

framework/Data/TDbTransaction.php

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
-		}
-		else
+		} else
 			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
@@ -83,8 +82,7 @@ 
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;
-		}
-		else
+		} else
 			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 

framework/Data/TDbCommand.php

Braces +6 added lines, -12 removed lines

@@ -117,8 +117,7 @@ 
 			try
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -193,11 +192,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -230,8 +227,7 @@ 
 			else
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -257,8 +253,7 @@ 
 			$result = $this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -286,8 +281,7 @@ 
 				return stream_get_contents($result);
 			else
 				return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Braces +5 added lines, -6 removed lines

@@ -83,10 +83,10 @@ 
 		if($validArray || $results instanceof \ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		elseif($results instanceof TActiveRecordRelation)
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} elseif($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
 		elseif($results === null || !$validArray)
 			$stack = [];
@@ -236,8 +236,7 @@ 
 		{
 			for($i = 0,$k = count($results);$i < $k;$i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			if(count($collections[$hash]) > 1)
 				throw new TActiveRecordException('ar_belongs_to_multiple_result');
 			$source->$prop = $collections[$hash][0];
-		}
-		else
+		} else
 			$source->$prop = null;
 	}
 

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Braces +4 added lines, -8 removed lines

@@ -122,8 +122,7 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
 			if($this->_editRenderer === null)
 				$this->createEditRenderer($record, $classPath);
@@ -147,8 +146,7 @@ 
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
-		}
-		else
+		} else
 		{
 			throw new TConfigurationException(
 				'scaffold_invalid_edit_renderer', $this->getID(), get_class($record));
@@ -211,15 +209,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		elseif($this->_editRenderer !== null)
+		} elseif($this->_editRenderer !== null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 				if($this->_record === null)
 					throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
-			}
-			else
+			} else
 			{
 				$class = $this->getRecordClass();
 				if($class !== null)

framework/Data/ActiveRecord/TActiveRecord.php

Braces +7 added lines, -14 removed lines

@@ -431,14 +431,12 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		elseif($this->_recordState === self::STATE_LOADED)
+		} elseif($this->_recordState === self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
 				return true;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -461,8 +459,7 @@ 
 				$this->_recordState = self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -729,8 +726,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -749,8 +745,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this, $property, $relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -833,8 +828,7 @@ 
 		{
 			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
-		}
-		elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
+		} elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
 			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
 		elseif(strncasecmp($method, 'findallby', 9) === 0)
 			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
@@ -900,8 +894,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
-		}
-		elseif($criteria instanceof TSqlCriteria)
+		} elseif($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();

framework/Data/TDataSourceConfig.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				foreach($xml['database'] as $name => $value)
 					$db->setSubProperty($name, $value);
 			}
-		}
-		else
+		} else
 		{
 			if($prop = $xml->getElementByTagName('database'))
 			{

framework/Data/TDbDataReader.php

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;
-		}
-		else
+		} else
 			throw new TDbException('dbdatareader_rewind_invalid');
 	}