pradosoft / prado

framework/Web/UI/WebControls/TCheckBoxColumn.php

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
 			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField() !== '')
 				$checkBox->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
-		}
-		else
+		} else
 			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 			$cell->getControls()->add($checkBox);
 			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField() !== '')
-				$checkBox->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$checkBox->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 		}
 		else
 			parent::initializeCell($cell, $columnIndex, $itemType);

framework/Web/UI/WebControls/TCheckBox.php

Braces +3 added lines, -6 removed lines

@@ -328,8 +328,7 @@ 
 				$writer->addAttributes($attributes);
 			if($value !== null)
 				$attributes->add('value', $value);
-		}
-		else
+		} else
 			$onclick = '';
 	if($needspan = $this->getSpanNeeded())
 	{
@@ -343,14 +342,12 @@ 
 			{
 				$this->renderLabel($writer, $clientID, $text);
 				$this->renderInputTag($writer, $clientID, $onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer, $clientID, $onclick);
 				$this->renderLabel($writer, $clientID, $text);
 			}
-		}
-		else
+		} else
 			$this->renderInputTag($writer, $clientID, $onclick);
 		if($needspan)
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TDataList.php

Braces +12 added lines, -24 removed lines

@@ -924,23 +924,19 @@ 
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -1078,8 +1074,7 @@ 
 			$style = $item->getStyle();
 			$item->clearStyle();
 			return $style;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1141,8 +1136,7 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1166,8 +1160,7 @@ 
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1187,8 +1180,7 @@ 
 				return [$this->getItemRenderer(),$this->_itemTemplate];
 			else
 				return $this->getAlternatingItemDisplay();
-		}
-		else
+		} else
 			return [$classPath,$this->_selectedItemTemplate];
 	}
 
@@ -1248,15 +1240,13 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		elseif($template !== null)
+		} elseif($template !== null)
 		{
 			$item = new TDataListItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
-		}
-		else
+		} else
 			$item = null;
 
 		return $item;
@@ -1415,8 +1405,7 @@ 
 				$items->add($this->createItemInternal($i, $itemType));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
-		}
-		else
+		} else
 			$this->createEmptyContent();
 		$this->clearChildState();
 	}
@@ -1481,8 +1470,7 @@ 
 				$this->applyItemStyles();
 				$repeatInfo = $this->getRepeatInfo();
 				$repeatInfo->renderRepeater($writer, $this);
-			}
-			elseif($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
+			} elseif($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
 				parent::render($writer);
 		}
 	}

Spacing +12 added lines, -12 removed lines

@@ -198,7 +198,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -690,7 +690,7 @@ 
 			{
 				$item = $items->itemAt($current);
 				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+					$item->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			}
 			if($value >= 0 && $value < $itemCount)
 			{
@@ -755,7 +755,7 @@ 
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
 			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+				$items->itemAt($current)->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
@@ -1174,9 +1174,9 @@ 
 	private function getAlternatingItemDisplay()
 	{
 		if(($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null)
-			return [$this->getItemRenderer(),$this->_itemTemplate];
+			return [$this->getItemRenderer(), $this->_itemTemplate];
 		else
-			return [$classPath,$this->_alternatingItemTemplate];
+			return [$classPath, $this->_alternatingItemTemplate];
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
@@ -1184,12 +1184,12 @@ 
 		if(($classPath = $this->getSelectedItemRenderer()) === '' && $this->_selectedItemTemplate === null)
 		{
 			if($itemIndex % 2 === 0)
-				return [$this->getItemRenderer(),$this->_itemTemplate];
+				return [$this->getItemRenderer(), $this->_itemTemplate];
 			else
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return [$classPath,$this->_selectedItemTemplate];
+			return [$classPath, $this->_selectedItemTemplate];
 	}
 
 	private function getEditItemDisplay($itemIndex)
@@ -1197,7 +1197,7 @@ 
 		if(($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return [$classPath,$this->_editItemTemplate];
+			return [$classPath, $this->_editItemTemplate];
 	}
 
 	/**
@@ -1345,7 +1345,7 @@ 
 		{
 			$controls = $this->getControls();
 			$count = $controls->getCount();
-			for($i = $this->_header?2:1;$i < $count;$i += 2)
+			for($i = $this->_header ? 2 : 1; $i < $count; $i += 2)
 			{
 				if(($separator = $controls->itemAt($i)) instanceof IStyleable)
 					$separator->getStyle()->mergeWith($separatorStyle);
@@ -1402,7 +1402,7 @@ 
 			$editIndex = $this->getEditItemIndex();
 			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
-			for($i = 0;$i < $itemCount;++$i)
+			for($i = 0; $i < $itemCount; ++$i)
 			{
 				if($hasSeparator && $i > 0)
 					$this->createItemInternal($i - 1, TListItemType::Separator);
@@ -1411,7 +1411,7 @@ 
 				elseif($i === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
 				else
-					$itemType = $i % 2?TListItemType::AlternatingItem : TListItemType::Item;
+					$itemType = $i % 2 ?TListItemType::AlternatingItem : TListItemType::Item;
 				$items->add($this->createItemInternal($i, $itemType));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
@@ -1453,7 +1453,7 @@ 
 			elseif($itemIndex === $selectedIndex)
 				$itemType = TListItemType::SelectedItem;
 			else
-				$itemType = $itemIndex % 2?TListItemType::AlternatingItem : TListItemType::Item;
+				$itemType = $itemIndex % 2 ?TListItemType::AlternatingItem : TListItemType::Item;
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}

framework/Web/UI/WebControls/TBoundColumn.php

Braces +4 added lines, -8 removed lines

@@ -178,8 +178,7 @@ 
 						$control->setItemType($item->getItemType());
 					}
 					$cell->getControls()->add($control);
-				}
-				else
+				} else
 					$control = $cell;
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 				break;
@@ -196,15 +195,13 @@ 
 						}
 						$cell->getControls()->add($control);
 						$cell->registerObject('EditControl', $control);
-					}
-					else
+					} else
 					{
 						$control = new TTextBox;
 						$cell->getControls()->add($control);
 						$cell->registerObject('TextBox', $control);
 					}
-				}
-				else
+				} else
 				{
 					if(($classPath = $this->getItemRenderer()) !== '')
 					{
@@ -215,8 +212,7 @@ 
 							$control->setItemType($item->getItemType());
 						}
 						$cell->getControls()->add($control);
-					}
-					else
+					} else
 						$control = $cell;
 				}
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);

Spacing +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
 				}
 				else
 					$control = $cell;
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			case TListItemType::EditItem:
 				if(!$this->getReadOnly())
@@ -219,7 +219,7 @@ 
 					else
 						$control = $cell;
 				}
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);

framework/Web/UI/WebControls/TMultiView.php

Braces +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
 			$this->_cachedActiveViewIndex = -1;
 			if($index >= 0)
 				$this->activateView($views->itemAt($index), true);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
@@ -161,8 +160,7 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			elseif($v->getActive())
+			} elseif($v->getActive())
 			{
 				$v->setActive(false);
 				if($triggerEvent)
@@ -240,8 +238,7 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
-					}
-					else
+					} else
 						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 					break;
 				case self::CMD_SWITCHVIEWINDEX:

framework/Web/UI/WebControls/TConditional.php

Braces +2 added lines, -4 removed lines

@@ -79,8 +79,7 @@ 
 		try
 		{
 			$result = $this->getTemplateControl()->evaluateExpression($this->_condition);
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}
@@ -88,8 +87,7 @@ 
 		{
 			if($this->_trueTemplate)
 				$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
-		}
-		elseif($this->_falseTemplate)
+		} elseif($this->_falseTemplate)
 			$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		$this->_creatingChildren = false;
 	}

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		{
 			$result = $this->getTemplateControl()->evaluateExpression($this->_condition);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}

framework/Web/UI/WebControls/TLiteralColumn.php

Braces +1 added lines, -2 removed lines

@@ -117,8 +117,7 @@
 					$text = THttpUtility::htmlEncode($text);
 				$cell->setText($text);
 			}
-		}
-		else
+		} else
 			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 		{
 			if($this->getDataField() !== '')
 			{
-				$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$cell->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			} else {
 				$text = $this->getText();
 				if($this->getEncode())

framework/Web/UI/WebControls/TEmailAddressValidator.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 				{
 					$domain = substr($value, $pos + 1);
 					return $domain === ''?false:checkdnsrr($domain, 'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	public function getRegularExpression()
 	{
 		$regex = parent::getRegularExpression();
-		return $regex === ''?self::EMAIL_REGEXP:$regex;
+		return $regex === '' ?self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 				if(($pos = strpos($value, '@')) !== false)
 				{
 					$domain = substr($value, $pos + 1);
-					return $domain === ''?false:checkdnsrr($domain, 'MX');
+					return $domain === '' ?false:checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;

framework/Web/UI/WebControls/TRepeater.php

Braces +6 added lines, -12 removed lines

@@ -467,8 +467,7 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -492,8 +491,7 @@ 
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -543,15 +541,13 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		elseif($template !== null)
+		} elseif($template !== null)
 		{
 			$item = new TRepeaterItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
-		}
-		else
+		} else
 			$item = null;
 
 		return $item;
@@ -635,8 +631,7 @@ 
 				$items->add($this->createItemInternal($i, $itemType, false, null));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
-		}
-		else
+		} else
 			$this->createEmptyContent();
 		$this->clearChildState();
 	}
@@ -697,8 +692,7 @@ 
 		{
 			$this->onItemCommand($param);
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +3 added lines, -3 removed lines

@@ -627,11 +627,11 @@ 
 			$items = $this->getItems();
 			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
-			for($i = 0;$i < $itemCount;++$i)
+			for($i = 0; $i < $itemCount; ++$i)
 			{
 				if($hasSeparator && $i > 0)
 					$this->createItemInternal($i - 1, TListItemType::Separator);
-				$itemType = $i % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
+				$itemType = $i % 2 == 0 ?TListItemType::Item : TListItemType::AlternatingItem;
 				$items->add($this->createItemInternal($i, $itemType, false, null));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
@@ -668,7 +668,7 @@ 
 				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
 			if($hasSeparator && $itemIndex > 0)
 				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
-			$itemType = $itemIndex % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
+			$itemType = $itemIndex % 2 == 0 ?TListItemType::Item : TListItemType::AlternatingItem;
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}