pradosoft / prado

framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 	 */
 	public function getObserveChanges()
 	{
-		$changes = $this->getOption('ObserveChanges');
+		$changes=$this->getOption('ObserveChanges');
 		return ($changes===null) ? true : $changes;
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Doc Comments +2 added lines

@@ -233,6 +233,8 @@
 
 	/**
 	 * Appends data or javascript code to the body content surrounded with delimiters
+	 * @param \Prado\Web\THttpResponse $response
+	 * @param string $delimiter
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{

Braces +2 added lines, -4 removed lines

@@ -256,14 +256,12 @@
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);

Spacing +41 added lines, -41 removed lines

@@ -37,40 +37,40 @@ 
 	/**
 	 * Callback response data header name.
 	 */
-	const CALLBACK_DATA_HEADER = 'X-PRADO-DATA';
+	const CALLBACK_DATA_HEADER='X-PRADO-DATA';
 	/**
 	 * Callback response client-side action header name.
 	 */
-	const CALLBACK_ACTION_HEADER = 'X-PRADO-ACTIONS';
+	const CALLBACK_ACTION_HEADER='X-PRADO-ACTIONS';
 	/**
 	 * Callback error header name.
 	 */
-	const CALLBACK_ERROR_HEADER = 'X-PRADO-ERROR';
+	const CALLBACK_ERROR_HEADER='X-PRADO-ERROR';
 	/**
 	 * Callback page state header name.
 	 */
-	const CALLBACK_PAGESTATE_HEADER = 'X-PRADO-PAGESTATE';
+	const CALLBACK_PAGESTATE_HEADER='X-PRADO-PAGESTATE';
 	/**
 	 * Script list header name.
 	 */
-	const CALLBACK_SCRIPTLIST_HEADER = 'X-PRADO-SCRIPTLIST';
+	const CALLBACK_SCRIPTLIST_HEADER='X-PRADO-SCRIPTLIST';
 	/**
 	 * Stylesheet list header name.
 	 */
-	const CALLBACK_STYLESHEETLIST_HEADER = 'X-PRADO-STYLESHEETLIST';
+	const CALLBACK_STYLESHEETLIST_HEADER='X-PRADO-STYLESHEETLIST';
 	/**
 	 * Stylesheet header name.
 	 */
-	const CALLBACK_STYLESHEET_HEADER = 'X-PRADO-STYLESHEET';
+	const CALLBACK_STYLESHEET_HEADER='X-PRADO-STYLESHEET';
 	/**
 	 * Hidden field list header name.
 	 */
-	const CALLBACK_HIDDENFIELDLIST_HEADER = 'X-PRADO-HIDDENFIELDLIST';
+	const CALLBACK_HIDDENFIELDLIST_HEADER='X-PRADO-HIDDENFIELDLIST';
 
 	/**
 	 * Callback redirect url header name.
 	 */
-	const CALLBACK_REDIRECT = 'X-PRADO-REDIRECT';
+	const CALLBACK_REDIRECT='X-PRADO-REDIRECT';
 
 	/**
 	 * @var ICallbackEventHandler callback event handler.
@@ -96,7 +96,7 @@ 
 		parent::__construct($control);
 
 		//TODO: can this be done later?
-		$response = $this->getApplication()->getResponse();
+		$response=$this->getApplication()->getResponse();
 		$response->setAdapter(new TCallbackResponseAdapter($response));
 
 		$this->trapCallbackErrorsExceptions();
@@ -108,7 +108,7 @@ 
 	 */
 	public function processCallbackEvent($writer)
 	{
-		Prado::trace("ActivePage raiseCallbackEvent()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage raiseCallbackEvent()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		$this->raiseCallbackEvent();
 	}
 
@@ -117,11 +117,11 @@ 
 	 * @param TControl control for defered rendering
 	 * @param THtmlWriter the renderer
 	 */
-	public function registerControlToRender($control,$writer)
+	public function registerControlToRender($control, $writer)
 	{
-		$id = $control->getUniqueID();
+		$id=$control->getUniqueID();
 		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = array($control,$writer);
+			$this->_controlsToRender[$id]=array($control, $writer);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 */
 	public function renderCallbackResponse($writer)
 	{
-		Prado::trace("ActivePage renderCallbackResponse()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)
+		Prado::trace("ActivePage renderCallbackResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		if(($url=$this->getResponse()->getAdapter()->getRedirectedUrl())===null)
 			$this->renderResponse($writer);
 		else
 			$this->redirect($url);
@@ -151,7 +151,7 @@ 
 	 */
 	protected function redirect($url)
 	{
-		Prado::trace("ActivePage redirect()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage redirect()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);
 	}
 
@@ -162,31 +162,31 @@ 
 	 */
 	protected function renderResponse($writer)
 	{
-		Prado::trace("ActivePage renderResponse()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage renderResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		//renders all the defered render() calls.
 		foreach($this->_controlsToRender as $rid => $forRender)
 			$forRender[0]->render($forRender[1]);
 
-		$response = $this->getResponse();
+		$response=$this->getResponse();
 
 		//send response data in header
 		if($response->getHasAdapter())
 		{
-			$responseData = $response->getAdapter()->getResponseData();
+			$responseData=$response->getAdapter()->getResponseData();
 			if($responseData!==null)
 			{
-				$data = TJavaScript::jsonEncode($responseData);
+				$data=TJavaScript::jsonEncode($responseData);
 
 				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
 			}
 		}
 
 		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
+		if(($handler=$this->getCallbackEventTarget())!==null)
 		{
 			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
 			{
-				$pagestate = $this->getPage()->getClientState();
+				$pagestate=$this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
 			}
 		}
@@ -197,37 +197,37 @@ 
 		//output the end javascript
 		if($this->getPage()->getClientScript()->hasEndScripts())
 		{
-			$writer = $response->createHtmlWriter();
+			$writer=$response->createHtmlWriter();
 			$this->getPage()->getClientScript()->renderEndScriptsCallback($writer);
 			$this->getPage()->getCallbackClient()->evaluateScript($writer);
 		}
 
 		//output the actions
-		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
-		$actions = TJavaScript::jsonEncode($executeJavascript);
+		$executeJavascript=$this->getCallbackClientHandler()->getClientFunctionsToExecute();
+		$actions=TJavaScript::jsonEncode($executeJavascript);
 		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
 
 
-		$cs = $this->Page->getClientScript();
+		$cs=$this->Page->getClientScript();
 
 		// collect all stylesheet file references
-		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets)>0)
+		$stylesheets=$cs->getStyleSheetUrls();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all stylesheet snippets references
-		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets)>0)
+		$stylesheets=$cs->getStyleSheetCodes();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all script file references
-		$scripts = $cs->getScriptUrls();
-		if (count($scripts)>0)
+		$scripts=$cs->getScriptUrls();
+		if(count($scripts) > 0)
 		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
 
 		// collect all hidden field references
-		$fields = $cs->getHiddenFields();
-		if (count($fields)>0)
+		$fields=$cs->getHiddenFields();
+		if(count($fields) > 0)
 		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
 	}
 
@@ -236,7 +236,7 @@ 
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{
-		$content = $response->createHtmlWriter();
+		$content=$response->createHtmlWriter();
 		$content->getWriter()->setBoundary($delimiter);
 		$content->write($data);
 	}
@@ -253,8 +253,8 @@ 
 		 {
 			if($callbackHandler instanceof ICallbackEventHandler)
 			{
-				$param = $this->getCallbackEventParameter();
-				$result = new TCallbackEventParameter($this->getResponse(), $param);
+				$param=$this->getCallbackEventParameter();
+				$result=new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
 			}
 			else
@@ -265,7 +265,7 @@ 
 		 }
 		 else
 		 {
-		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
+		 	$target=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);
 		 }
 	}
@@ -302,7 +302,7 @@ 
 	{
 		if($this->_callbackEventParameter===null)
 		{
-			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+			$param=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
 			$this->_callbackEventParameter=$param;
 		}
 		return $this->_callbackEventParameter;
@@ -324,7 +324,7 @@ 
 	public function getCallbackClientHandler()
 	{
 		if($this->_callbackClient===null)
-			$this->_callbackClient = new TCallbackClientScript;
+			$this->_callbackClient=new TCallbackClientScript;
 		return $this->_callbackClient;
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveRadioButtonList.php

Doc Comments +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TActiveRadioButtonItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 */
 	protected function createRepeatedControl()
 	{
-		$control = new TActiveRadioButtonItem;
+		$control=new TActiveRadioButtonItem;
 		$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
 		return $control;
 	}

framework/Web/UI/ActiveControls/TActiveTableCell.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TActiveTableCellEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveTableCellEventParameter $param
 	 */
 	public function onCellSelected($param)
 	{

Indentation +2 added lines, -2 removed lines

@@ -55,8 +55,8 @@
 {
 
 	/**
-	* @var TTable parent row control containing the cell
-	*/
+	 * @var TTable parent row control containing the cell
+	 */
 	private $_row;
 
 	/**

Spacing +15 added lines, -15 removed lines

@@ -102,7 +102,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		$parameter = new TActiveTableCellEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getCellIndex());
+		$parameter=new TActiveTableCellEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getCellIndex());
 		$this->onCellSelected($parameter);
 		$this->raiseBubbleEvent($this, $parameter);
 	}
@@ -129,7 +129,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnCellSelected'))
+		if($this->hasEventHandler('OnCellSelected'))
 			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -142,19 +142,19 @@ 
 	 */
 	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 {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableCell 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);
 			}
 		}
@@ -167,8 +167,8 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 
@@ -180,8 +180,8 @@ 
 	 */
 	public function getCellIndex()
 	{
-		foreach ($this->getRow()->getCells() as $key => $row)
-			if ($row == $this) return $key;
+		foreach($this->getRow()->getCells() as $key => $row)
+			if($row==$this) return $key;
 		throw new TConfigurationException('tactivetablecell_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -192,14 +192,14 @@ 
 	 */
 	public function getRow()
 	{
-		if ($this->_row === null)
+		if($this->_row===null)
 		{
-			$row = $this->getParent();
-			while (!($row instanceof TTableRow) && $row !== null)
+			$row=$this->getParent();
+			while(!($row instanceof TTableRow) && $row!==null)
 			{
-				$row = $row->getParent();
+				$row=$row->getParent();
 			}
-			if ($row instanceof TTableRow) $this->_row = $row;
+			if($row instanceof TTableRow) $this->_row=$row;
 			else throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
 		}
 		return $this->_row;

Braces +1 added lines, -2 removed lines

@@ -147,8 +147,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 TActiveTableCell on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.

framework/Web/UI/ActiveControls/TActiveTableCellEventParameter.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
+	 * @param \Prado\Web\THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 {
 
 	/**
-	* @var integer the zero-based index of the cell.
-	*/
+	 * @var integer the zero-based index of the cell.
+	 */
 	private $_selectedCellIndex = -1;
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	* @var integer the zero-based index of the cell.
 	*/
-	private $_selectedCellIndex = -1;
+	private $_selectedCellIndex=-1;
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
@@ -42,7 +42,7 @@ 
 	public function __construct($response, $parameter, $index=-1)
 	{
 		parent::__construct($response, $parameter);
-		$this->_selectedCellIndex = $index;
+		$this->_selectedCellIndex=$index;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TAutoCompleteEventParameter.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 
 	/**
 	 * Creates a new TCallbackEventParameter.
+	 * @param \Prado\Web\THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php

Doc Comments +2 added lines

@@ -59,6 +59,7 @@ 
 	/**
 	 * Sets the client side options. Can only be set when client side is null.
 	 * @param TCallbackClientSide client side options.
+	 * @param TActiveCustomValidatorClientSide $client
 	 */
 	public function setClientSide($client)
 	{
@@ -225,6 +226,7 @@ 
 	 * {@link getClientSide ClientSide} property.
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
+	 * @param string $class
 	 */
 	public function registerCallbackClientScript($class,$options=null)
 	{

Spacing +24 added lines, -24 removed lines

@@ -48,9 +48,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if(($client = $this->getOption('ClientSide'))===null)
+		if(($client=$this->getOption('ClientSide'))===null)
 		{
-			$client = $this->createClientSide();
+			$client=$this->createClientSide();
 			$this->setOption('ClientSide', $client);
 		}
 		return $client;
@@ -62,7 +62,7 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if( $this->getOption('ClientSide')===null)
+		if($this->getOption('ClientSide')===null)
 			$this->setOption('ClientSide', $client);
 		else
 			throw new TConfigurationException(
@@ -109,11 +109,11 @@ 
 	{
 		if(($id=$this->getCallbackOptions())!=='')
 		{
-			if(($pos=strrpos($id,'.'))!==false)
+			if(($pos=strrpos($id, '.'))!==false)
 			{
-				$control=$this->getControl()->getSubProperty(substr($id,0,$pos));
-				$newid=substr($id,$pos+1);
-				if ($control!==null)
+				$control=$this->getControl()->getSubProperty(substr($id, 0, $pos));
+				$newid=substr($id, $pos + 1);
+				if($control!==null)
 					$control=$control->$newid;
 			}
 			else
@@ -138,7 +138,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getOption('CausesValidation',true);
+		return $this->getOption('CausesValidation', true);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setOption('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setOption('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getOption('ValidationGroup','');
+		return $this->getOption('ValidationGroup', '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setOption('ValidationGroup',$value,'');
+		$this->setOption('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -205,15 +205,15 @@ 
 	 */
 	protected function getClientSideOptions()
 	{
-		$default = $this->getDefaultClientSideOptions();
-		$options = array_merge($default,$this->getClientSide()->getOptions()->toArray());
-		$validate = $this->getCausesValidation();
-		$options['CausesValidation']= $validate ? '' : false;
+		$default=$this->getDefaultClientSideOptions();
+		$options=array_merge($default, $this->getClientSide()->getOptions()->toArray());
+		$validate=$this->getCausesValidation();
+		$options['CausesValidation']=$validate ? '' : false;
 		$options['ValidationGroup']=$this->getValidationGroup();
-		$options['CallbackParameter'] = $this->getCallbackParameter();
+		$options['CallbackParameter']=$this->getCallbackParameter();
 		// needed for TCallback
 		if(!isset($options['EventTarget']))
-			$options['EventTarget'] = $this->getControl()->getUniqueID();
+			$options['EventTarget']=$this->getControl()->getUniqueID();
 		return $options;
 	}
 
@@ -226,13 +226,13 @@ 
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
 	 */
-	public function registerCallbackClientScript($class,$options=null)
+	public function registerCallbackClientScript($class, $options=null)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		if(is_array($options))
-			$options = array_merge($this->getClientSideOptions(),$options);
+			$options=array_merge($this->getClientSideOptions(), $options);
 		else
-			$options = $this->getClientSideOptions();
+			$options=$this->getClientSideOptions();
 
 		//remove true as default to save bytes
 		if($options['CausesValidation']===true)
@@ -261,8 +261,8 @@ 
 	 */
 	public function getJavascript()
 	{
-		$client = $this->getPage()->getClientScript();
-		return $client->getCallbackReference($this->getControl(),$this->getClientSideOptions());
+		$client=$this->getPage()->getClientScript();
+		return $client->getCallbackReference($this->getControl(), $this->getClientSideOptions());
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -233,8 +233,7 @@ 
 				$newid=substr($id,$pos+1);
 				if ($control!==null)
 					$control=$control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -296,8 +295,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/ActiveControls/TBaseActiveControl.php

Doc Comments +5 added lines, -1 removed lines

@@ -58,6 +58,8 @@ 
 	 * @param string option name.
 	 * @param mixed new value.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param string|boolean $default
 	 * @return mixed options value.
 	 */
 	protected function setOption($name,$value,$default=null)
@@ -72,6 +74,8 @@ 
 	 * named values for the base active controls.
 	 * @param string option name.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param string|boolean $default
 	 * @return mixed options value.
 	 */
 	protected function getOption($name,$default=null)
@@ -89,7 +93,7 @@ 
 	}
 
 	/**
-	 * @return TPage the page containing the attached control.
+	 * @return \Prado\Web\UI\TPage the page containing the attached control.
 	 */
 	protected function getPage()
 	{

Spacing +8 added lines, -8 removed lines

@@ -48,8 +48,8 @@ 
 	 */
 	public function __construct($control)
 	{
-		$this->_control = $control;
-		$this->_options = new TMap;
+		$this->_control=$control;
+		$this->_options=new TMap;
 	}
 
 	/**
@@ -60,11 +60,11 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function setOption($name,$value,$default=null)
+	protected function setOption($name, $value, $default=null)
 	{
-		$value = ($value===null) ? $default : $value;
+		$value=($value===null) ? $default : $value;
 		if($value!==null)
-			$this->_options->add($name,$value);
+			$this->_options->add($name, $value);
 	}
 
 	/**
@@ -74,9 +74,9 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function getOption($name,$default=null)
+	protected function getOption($name, $default=null)
 	{
-		$item = $this->_options->itemAt($name);
+		$item=$this->_options->itemAt($name);
 		return ($item===null) ? $default : $item;
 	}
 
@@ -131,7 +131,7 @@ 
 	public function canUpdateClientSide($bDontRequireVisibility=false)
 	{
 		return 	$this->getControl()->getHasChildInitialized()
-				&& $this->getPage()->getIsLoadingPostData() == false
+				&& $this->getPage()->getIsLoadingPostData()==false
 				&& $this->getPage()->getIsCallback()
 				&& $this->getEnableUpdate()
 				&& ($bDontRequireVisibility || $this->getControl()->getVisible());

framework/Web/UI/ActiveControls/TStyleDiff.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	}
 
 	/**
-	 * @param string CSS custom style string.
+	 * @param string string custom style string.
 	 * @param array CSS style as name-value array.
 	 */
 	protected function getStyleFromString($string)

Spacing +11 added lines, -11 removed lines

@@ -31,10 +31,10 @@ 
 	{
 		if(!($obj instanceof TStyle))
 			return array();
-		$style = $obj->getStyleFields();
-		$style = array_merge($style,$this->getStyleFromString($obj->getCustomStyle()));
+		$style=$obj->getStyleFields();
+		$style=array_merge($style, $this->getStyleFromString($obj->getCustomStyle()));
 		if($obj->hasFont())
-			$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
+			$style=array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
 		return $style;
 	}
 
@@ -44,14 +44,14 @@ 
 	 */
 	protected function getStyleFromString($string)
 	{
-		$style = array();
+		$style=array();
 		if(!is_string($string)) return $style;
 
-		foreach(explode(';',$string) as $sub)
+		foreach(explode(';', $string) as $sub)
 		{
-			$arr=explode(':',$sub);
+			$arr=explode(':', $sub);
 			if(isset($arr[1]) && trim($arr[0])!=='')
-				$style[trim($arr[0])] = trim($arr[1]);
+				$style[trim($arr[0])]=trim($arr[1]);
 		}
 		return $style;
 	}
@@ -68,7 +68,7 @@ 
 		}
 		else
 		{
-			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
+			return $this->_old->getCssClass()!==$this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;
 		}
 	}
@@ -78,7 +78,7 @@ 
 	 */
 	protected function getStyleDiff()
 	{
-		$diff = array_diff_assoc(
+		$diff=array_diff_assoc(
 					$this->getCombinedStyle($this->_new),
 					$this->getCombinedStyle($this->_old));
 		return count($diff) > 0 ? $diff : null;
@@ -93,8 +93,8 @@ 
 			return $this->_null;
 		else
 		{
-			$css = $this->getCssClassDiff();
-			$style = $this->getStyleDiff();
+			$css=$this->getCssClassDiff();
+			$style=$this->getStyleDiff();
 			if(($css!==null) || ($style!==null))
 				return array('CssClass' => $css, 'Style' => $style);
 			else

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 		{
 			return ($this->_new!==null) && $this->_new->hasCssClass()
 						? $this->_new->getCssClass() : null;
-		}
-		else
+		} else
 		{
 			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;