pradosoft / prado

framework/Web/UI/ActiveControls/TValueTriggeredCallback.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function setDecayRate($value)
 	{
-		$decay = TPropertyValue::ensureFloat($value);
+		$decay=TPropertyValue::ensureFloat($value);
 		if($decay < 0)
 			throw new TConfigurationException('callback_decay_be_not_negative', $this->getID());
 		$this->setViewState('Decay', $decay);
@@ -90,10 +90,10 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$options['PropertyName'] = $this->getPropertyName();
-		$options['Interval'] = $this->getInterval();
-		$options['Decay'] = $this->getDecayRate();
+		$options=parent::getTriggerOptions();
+		$options['PropertyName']=$this->getPropertyName();
+		$options['Interval']=$this->getInterval();
+		$options['Decay']=$this->getDecayRate();
 		return $options;
 	}
 

framework/Web/UI/ActiveControls/TActiveTableRow.php

Braces +2 added lines, -4 removed lines

@@ -119,8 +119,7 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -163,8 +162,7 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,

Doc Comments +2 added lines

@@ -100,6 +100,7 @@ 
 	 * TActiveTableRow.
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
+	 * @param TActiveTableCellEventParameter $param
 	 */
 	public function raiseCallbackEvent($param)
 	{
@@ -131,6 +132,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TActiveTableRowEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveTableRowEventParameter $param
 	 */
 	public function onRowSelected($param)
 	{

Spacing +16 added lines, -16 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		$parameter = new TActiveTableRowEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getRowIndex());
+		$parameter=new TActiveTableRowEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getRowIndex());
 		$this->onRowSelected($parameter);
 	}
 
@@ -117,7 +117,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if ($param instanceof TActiveTableCellEventParameter)
+		if($param instanceof TActiveTableCellEventParameter)
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
@@ -147,7 +147,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnRowSelected'))
+		if($this->hasEventHandler('OnRowSelected'))
 			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -160,10 +160,10 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getHasPreRendered())
+		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
+			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
@@ -171,9 +171,9 @@ 
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
-			if ($this->getHasControls())
+			if($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
+				foreach($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
 					$control->getActiveControl()->setEnableUpdate(false);
 			}
 		}
@@ -186,8 +186,8 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 
@@ -199,8 +199,8 @@ 
 	 */
 	public function getRowIndex()
 	{
-		foreach ($this->getTable()->getRows() as $key => $row)
-			if ($row == $this) return $key;
+		foreach($this->getTable()->getRows() as $key => $row)
+			if($row==$this) return $key;
 		throw new TConfigurationException('tactivetablerow_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	public function getTable()
 	{
-		if ($this->_table === null)
+		if($this->_table===null)
 		{
-			$table = $this->getParent();
-			while (!($table instanceof TTable) && $table !== null)
+			$table=$this->getParent();
+			while(!($table instanceof TTable) && $table!==null)
 			{
-				$table = $table->getParent();
+				$table=$table->getParent();
 			}
-			if ($table instanceof TTable) $this->_table = $table;
+			if($table instanceof TTable) $this->_table=$table;
 			else throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
 		}
 		return $this->_table;

framework/Web/UI/ActiveControls/TCallbackEventParameter.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 	 */
 	public function __construct($response, $parameter)
 	{
-		$this->_response = $response;
-		$this->_parameter = $parameter;
+		$this->_response=$response;
+		$this->_parameter=$parameter;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TEventTriggeredCallback.php

Spacing +4 added lines, -4 removed lines

@@ -64,10 +64,10 @@
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$name = preg_replace('/^on/', '', $this->getEventName());
-		$options['EventName'] = strtolower($name);
-		$options['StopEvent'] = $this->getPreventDefaultAction();
+		$options=parent::getTriggerOptions();
+		$name=preg_replace('/^on/', '', $this->getEventName());
+		$options['EventName']=strtolower($name);
+		$options['StopEvent']=$this->getPreventDefaultAction();
 		return $options;
 	}
 

framework/Web/UI/WebControls/TBaseValidator.php

Braces +2 added lines, -4 removed lines

@@ -518,16 +518,14 @@
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
 					if($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);

Doc Comments +5 added lines, -2 removed lines

@@ -185,6 +185,7 @@ 
 	 * TBaseValidator::$_clientClass, be sure to update the corresponding
 	 * "Javascript/validation3.js" file as well.
 	 * @param TControl control to validate.
+	 * @param \Prado\Web\UI\TControl $control
 	 * @return string control type for client-side validation.
 	 */
 	private function getClientControlClass($control)
@@ -263,7 +264,7 @@ 
 	/**
 	 * Update the ControlToValidate component's css class depending
 	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
+	 * @return boolean|null true if change, false otherwise.
 	 */
 	protected function updateControlCssClass()
 	{
@@ -388,6 +389,7 @@ 
 	 * The ID path is the dot-connected IDs of the controls reaching from
 	 * the validator's naming container to the target control.
 	 * @param string the ID path
+	 * @param string $value
 	 */
 	public function setControlToValidate($value)
 	{
@@ -476,7 +478,7 @@ 
 	}
 
 	/**
-	 * @return TControl control to be validated. Null if no control is found.
+	 * @return \Prado\Web\UI\TControl control to be validated. Null if no control is found.
 	 * @throws TConfigurationException if {@link getControlToValidate
 	 * ControlToValidate} is empty or does not point to a valid control
 	 */
@@ -553,6 +555,7 @@ 
 
 	/**
 	 * @param string the css class that is applied to the control being validated in case the validation fails
+	 * @param string $value
 	 */
 	public function setControlCssClass($value)
 	{

Spacing +54 added lines, -54 removed lines

@@ -81,11 +81,11 @@ 
 	/**
 	 * @var boolean whether the validation succeeds
 	 */
-	private $_isValid = true;
+	private $_isValid=true;
 	/**
 	 * @var boolean whether the validator has been registered with the page
 	 */
-	private $_registered = false;
+	private $_registered=false;
 	/**
 	 * @var TValidatorClientSide validator client-script options.
 	 */
@@ -95,7 +95,7 @@ 
 	 * them specially.
 	 * @var array list of control class names
 	 */
-	private static $_clientClass = ['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
+	private static $_clientClass=['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
 
 	/**
 	 * Constructor.
@@ -115,7 +115,7 @@ 
 	{
 		parent::onInit($param);
 		$this->getPage()->getValidators()->add($this);
-		$this->_registered = true;
+		$this->_registered=true;
 	}
 
 	/**
@@ -124,9 +124,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
+		if($this->_registered && ($page=$this->getPage())!==null)
 			$page->getValidators()->remove($this);
-		$this->_registered = false;
+		$this->_registered=false;
 		parent::onUnload($param);
 	}
 
@@ -137,9 +137,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$display = $this->getDisplay();
-		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
+		$display=$this->getDisplay();
+		$visible=$this->getEnabled(true) && !$this->getIsValid();
+		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
 			$writer->addStyleAttribute('display', 'none');
 		elseif(!$visible)
 			$writer->addStyleAttribute('visibility', 'hidden');
@@ -154,29 +154,29 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$control = $this->getValidationTarget();
-		$options['ID'] = $this->getClientID();
-		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		$options['Display'] = $this->getDisplay();
-		$options['ErrorMessage'] = $this->getErrorMessage();
+		$control=$this->getValidationTarget();
+		$options['ID']=$this->getClientID();
+		$options['FormID']=$this->getPage()->getForm()->getClientID();
+		$options['Display']=$this->getDisplay();
+		$options['ErrorMessage']=$this->getErrorMessage();
 		if($this->getFocusOnError())
 		{
-			$options['FocusOnError'] = $this->getFocusOnError();
-			$options['FocusElementID'] = $this->getFocusElementID();
+			$options['FocusOnError']=$this->getFocusOnError();
+			$options['FocusElementID']=$this->getFocusElementID();
 		}
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
-		$options['ControlCssClass'] = $this->getControlCssClass();
+			$options['ControlToValidate']=$control->getClientID();
+		$options['ControlCssClass']=$this->getControlCssClass();
 
-		$options['ControlType'] = $this->getClientControlClass($control);
-		$options['Enabled'] = $this->getEnabled(true);
+		$options['ControlType']=$this->getClientControlClass($control);
+		$options['Enabled']=$this->getEnabled(true);
 
 		//get date format from date picker target control
 		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+			$options['DateFormat']=$control->getDateFormat();
 
-		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
+		$options=array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
 		return $options;
 	}
@@ -193,7 +193,7 @@ 
 		foreach(self::$_clientClass as $type)
 			if($control instanceof $type)
 				return $type;
-		$reflectionClass = new \ReflectionClass($control);
+		$reflectionClass=new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
 
@@ -215,8 +215,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide===null)
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -236,15 +236,15 @@ 
 	 */
 	public function renderClientControlScript($writer)
 	{
-		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
+		$scripts=$this->getPage()->getClientScript();
+		if($this->getEnableClientScript())
 			$scripts->registerPradoScript('validator');
-		$formID = $this->getPage()->getForm()->getClientID();
-		$scriptKey = "TBaseValidator:$formID";
+		$formID=$this->getPage()->getForm()->getClientID();
+		$scriptKey="TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
-			$manager['FormID'] = $formID;
-			$options = TJavaScript::encode($manager);
+			$manager['FormID']=$formID;
+			$options=TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
 		if($this->getEnableClientScript())
@@ -255,7 +255,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -268,17 +268,17 @@ 
 	 */
 	protected function updateControlCssClass()
 	{
-		if(($cssClass = $this->getControlCssClass()) !== '')
+		if(($cssClass=$this->getControlCssClass())!=='')
 		{
-			$control = $this->getValidationTarget();
+			$control=$this->getValidationTarget();
 			if($control instanceof TWebControl)
 			{
-				$class = preg_replace('/ ' . preg_quote($cssClass) . '/', '', $control->getCssClass());
+				$class=preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
 				if(!$this->getIsValid())
 				{
-					$class .= ' ' . $cssClass;
+					$class.=' '.$cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
+				} elseif($control->getIsValid())
 					$control->setCssClass($class);
 			}
 		}
@@ -289,11 +289,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:' . $this->getClientID();
+		$key='prado:'.$this->getClientID();
 		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
-			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new ' . $this->getClientClassName() . '(' . $options . ');';
+			$options=TJavaScript::encode($this->getClientScriptOptions());
+			$script='new '.$this->getClientClassName().'('.$options.');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -321,10 +321,10 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
+		$value=TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
 		if(!$value)
-			$this->_isValid = true;
+			$this->_isValid=true;
 	}
 
 	/**
@@ -418,17 +418,17 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id = $this->getViewState('FocusElementID', '')) === '')
+		if(($id=$this->getViewState('FocusElementID', ''))==='')
 		{
-			$target = $this->getValidationTarget();
+			$target=$this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
 			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
-				$id = $target->getClientID() . '_c0';
+				$id=$target->getClientID().'_c0';
 			} else {
-				$id = $target->getClientID();
+				$id=$target->getClientID();
 			}
 		}
 		return $id;
@@ -473,7 +473,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -483,7 +483,7 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
 			return $control;
 		else
 			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
@@ -513,10 +513,10 @@ 
 		$this->onValidate();
 		if($this->getVisible(true) && $this->getEnabled(true))
 		{
-			$target = $this->getValidationTarget();
+			$target=$this->getValidationTarget();
 			// if the target is not a disabled web control
-			if($target === null ||
-				($target !== null &&
+			if($target===null ||
+				($target!==null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
 				if($this->evaluateIsValid())
@@ -600,9 +600,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if(($text=$this->getText())!=='')
 			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
+		elseif(($text=$this->getErrorMessage())!=='')
 			$writer->write($text);
 		else
 			parent::renderContents($writer);

framework/I18N/TTranslateParameter.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 * To trim or not to trim the contents.
 	 * @var boolean
 	 */
-	protected $trim = true;
+	protected $trim=true;
 
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->key = $value;
+		$this->key=$value;
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->trim = TPropertyValue::ensureBoolean($value);
+		$this->trim=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,10 +106,10 @@ 
 	 */
 	public function getParameter()
 	{
-		$value = $this->getValue();
+		$value=$this->getValue();
 		if(strlen($value) > 0)
 			return $value;
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$this->renderControl($htmlWriter);
 		return $this->getTrim() ?
 			trim($htmlWriter->flush()) : $htmlWriter->flush();

framework/I18N/core/MessageSource_gettext.php

Braces +3 added lines, -6 removed lines

@@ -260,8 +260,7 @@ 
 				if(!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
-			}
-			else
+			} else
 				return false;
 		}
 		return false;
@@ -304,8 +303,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}
@@ -354,8 +352,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}

Doc Comments +6 added lines

@@ -199,6 +199,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $MOFile
+	 */
 	private function getPOFile($MOFile)
 	{
 		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
@@ -421,6 +424,9 @@ 
 		return $catalogue;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +102 added lines, -102 removed lines

@@ -25,7 +25,7 @@ 
 /**
  * Get the Gettext class.
  */
-require_once(dirname(__FILE__) . '/Gettext/TGettext.php');
+require_once(dirname(__FILE__).'/Gettext/TGettext.php');
 
 /**
  * MessageSource_gettext class.
@@ -44,23 +44,23 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.mo';
+	protected $dataExt='.mo';
 
 	/**
 	 * PO data filename extension
 	 * @var string
 	 */
-	protected $poExt = '.po';
+	protected $poExt='.po';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 
@@ -71,17 +71,17 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO', $filename);
+		$mo=TGettext::factory('MO', $filename);
 		$mo->load();
-		$result = $mo->toArray();
+		$result=$mo->toArray();
 
-		$results = [];
-		$count = 0;
+		$results=[];
+		$count=0;
 		foreach($result['strings'] as $source => $target)
 		{
-			$results[$source][] = $target; //target
-			$results[$source][] = $count++; //id
-			$results[$source][] = ''; //comments
+			$results[$source][]=$target; //target
+			$results[$source][]=$count++; //id
+			$results[$source][]=''; //comments
 		}
 		return $results;
 	}
@@ -104,7 +104,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -128,24 +128,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
 
-		$catalogues = [$source];
+		$catalogues=[$source];
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator .
-								$variant . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.
+								$variant.$this->dataExt;
 			}
 		}
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir, array_reverse($catalogues));
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -159,17 +159,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$catalogues = [];
+		$variants=explode('_', $this->culture);
+		$catalogues=[];
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -183,16 +183,16 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue = 'messages')
+	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
-			$po = $this->getPOFile($file);
+			$file=$this->getSource($variant);
+			$po=$this->getPOFile($file);
 			if(is_file($file) || is_file($po))
 				return [$variant, $file, $po];
 		}
@@ -201,8 +201,8 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
-		return $filebase . $this->poExt;
+		$filebase=substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
+		return $filebase.$this->poExt;
 	}
 
 	/**
@@ -212,48 +212,48 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue = 'messages')
+	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
-			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+			list($variant, $MOFile, $POFile)=$this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
-		$strings = [];
+		$strings=[];
 		foreach($messages as $message)
-			$strings[$message] = '';
+			$strings[$message]='';
 
 		//load the PO
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
-		$existing = count($result['strings']);
+		$existing=count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'], $strings);
+		$result['strings']=array_merge($result['strings'], $strings);
 
-		$new = count($result['strings']);
+		$new=count($result['strings']);
 
 		if($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
-			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+			$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
-			$mo = $po->toMO();
+			$mo=$po->toMO();
 			if($po->save() && $mo->save($MOFile))
 			{
 				if(!empty($this->cache))
@@ -272,32 +272,32 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue = 'messages')
+	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if($string==$message)
 			{
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 				if($po->save() && $mo->save($MOFile))
 				{
 					if(!empty($this->cache))
@@ -320,33 +320,33 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue = 'messages')
+	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO', $POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if($string==$text)
 			{
-				$result['strings'][$string] = $target;
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['strings'][$string]=$target;
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 
 				if($po->save() && $mo->save($MOFile))
 				{
@@ -378,42 +378,42 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir = null, $variant = null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
 
-		$catalogue = [];
+		$catalogue=[];
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir . '/' . $file)
+			if(is_dir($dir.'/'.$file)
 				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
-				$catalogue = array_merge($catalogue,
-								$this->getCatalogues($dir . '/' . $file, $file));
+				$catalogue=array_merge($catalogue,
+								$this->getCatalogues($dir.'/'.$file, $file));
 			}
 
-			$pos = strpos($file, $this->dataExt);
+			$pos=strpos($file, $this->dataExt);
 
 			if($pos > 0
-				&& substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
+				&& substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file, 0, $pos);
-				$dot = strrpos($name, $this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot + 1, strlen($name));
-					$cat = substr($name, 0, $dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
-				$details[0] = $cat;
-				$details[1] = $culture;
+				$details[0]=$cat;
+				$details[1]=$culture;
 
 
-				$catalogue[] = $details;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -423,15 +423,15 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$mo_file = $this->getSource($variant);
-		$po_file = $this->getPOFile($mo_file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$mo_file=$this->getSource($variant);
+		$po_file=$this->getPOFile($mo_file);
 
-		$dir = dirname($mo_file);
+		$dir=dirname($mo_file);
 		if(!is_dir($dir))
 		{
 			@mkdir($dir);
@@ -440,12 +440,12 @@ 
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO', $po_file);
-		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-		$result['strings'] = [];
+		$po=TGettext::factory('PO', $po_file);
+		$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
+		$result['strings']=[];
 
 		$po->fromArray($result);
-		$mo = $po->toMO();
+		$mo=$po->toMO();
 		if($po->save() && $mo->save($mo_file))
 			return [$variant, $mo_file, $po_file];
 		else

framework/Web/UI/ActiveControls/TActiveHyperLink.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -64,14 +64,14 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $value !== '')
+		if($this->getActiveControl()->canUpdateClientSide() && $value!=='')
 		{
-			$textWriter = new TTextWriter;
-			$renderer = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
+			$textWriter=new TTextWriter;
+			$renderer=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
 			$this->createImage($value)->renderControl($renderer);
 			$this->getPage()->getCallbackClient()->update($this, $textWriter->flush());
 		}
@@ -83,14 +83,14 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		if(parent::getNavigateUrl() === $value)
+		if(parent::getNavigateUrl()===$value)
 			return;
 
 		parent::setNavigateUrl($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			//replace & with & and urldecode the url (setting the href using javascript is literal)
-			$url = urldecode(str_replace('&', '&', $value));
+			$url=urldecode(str_replace('&', '&', $value));
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $url);
 		}
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		if(parent::getTarget() === $value)
+		if(parent::getTarget()===$value)
 			return;
 
 		parent::setTarget($value);

framework/Web/UI/ActiveControls/TActiveImage.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -65,7 +65,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -78,7 +78,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -91,7 +91,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);

Doc Comments +2 added lines

@@ -48,6 +48,7 @@ 
 	/**
 	 * Sets the alternative text to be displayed in the TImage when the image is unavailable.
 	 * @param string the alternative text
+	 * @param string $value
 	 */
 	public function setAlternateText($value)
 	{
@@ -78,6 +79,7 @@ 
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($value)
 	{