pradosoft / prado

framework/Web/UI/WebControls/TLinkButton.php

Doc Comments +1 added lines

@@ -325,6 +325,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
-		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 	}
 

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page = $this->getPage();
+		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 
 		$writer->addAttribute('id', $this->getClientID());
@@ -113,7 +113,7 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -140,7 +140,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//" . $this->getClientID();
+		$nop="javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -161,11 +161,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['StopEvent'] = true;
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['StopEvent']=true;
 
 		return $options;
 	}
@@ -178,7 +178,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);

framework/Web/UI/WebControls/TWebControl.php

Doc Comments +11 added lines, -2 removed lines

@@ -53,6 +53,7 @@ 
 	 * control does work with javascript and your class wants to flag that it requires an id
 	 * to operate properly.  Once set to true, it stays that way.
 	 * @param boolean pass true to enable enforcement of the tag attribute id.
+	 * @param boolean $value
 	 */
 	public function setEnsureId($value)
 	{
@@ -60,7 +61,7 @@ 
 	}
 
 	/**
-	 * @return whether this web control must have an id
+	 * @return boolean this web control must have an id
 	 */
 	public function getEnsureId()
 	{
@@ -107,6 +108,7 @@ 
 	 * Only one-character string can be set, or an exception will be raised.
 	 * Pass in an empty string if you want to disable access key.
 	 * @param string the access key to be set
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the access key is specified with more than one character
 	 */
 	public function setAccessKey($value)
@@ -186,6 +188,7 @@ 
 
 	/**
 	 * @param string the border width of the control
+	 * @param string $value
 	 */
 	public function setBorderWidth($value)
 	{
@@ -213,6 +216,7 @@ 
 
 	/**
 	 * @param string the foreground color of the control
+	 * @param string $value
 	 */
 	public function setForeColor($value)
 	{
@@ -239,7 +243,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style of the control, default is TDisplayStyle::Fixed
+	 * @return string display style of the control, default is TDisplayStyle::Fixed
 	 */
 	public function getDisplay()
 	{
@@ -248,6 +252,7 @@ 
 
 	/**
 	 * @param string the css class of the control
+	 * @param string $value
 	 */
 	public function setCssClass($value)
 	{
@@ -267,6 +272,7 @@ 
 
 	/**
 	 * @param string the height of the control
+	 * @param string $value
 	 */
 	public function setHeight($value)
 	{
@@ -310,6 +316,7 @@ 
 	 * Sets the css style string of the control.
 	 * The style string will be prefixed to the styles set via other control properties (e.g. Height, Width).
 	 * @param string the css style string
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the parameter is not a string
 	 */
 	public function setStyle($value)
@@ -340,6 +347,7 @@ 
 	 * Sets the tab index of the control.
 	 * Pass 0 if you want to disable tab index.
 	 * @param integer the tab index to be set
+	 * @param integer $value
 	 */
 	public function setTabIndex($value)
 	{
@@ -388,6 +396,7 @@ 
 
 	/**
 	 * @param string the width of the control
+	 * @param string $value
 	 */
 	public function setWidth($value)
 	{

Spacing +23 added lines, -23 removed lines

@@ -41,7 +41,7 @@ 
 	/**
 	 *	@var boolean ensures the inclusion the id in the tag rendering.
 	 */
-	private $_ensureid = false;
+	private $_ensureid=false;
 
 	/**
 	 *	@var TWebControlDecorator this render things before and after both the open and close tag
@@ -57,7 +57,7 @@ 
 	 */
 	public function setEnsureId($value)
 	{
-		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
+		$this->_ensureid|=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	/**
 	 * @return TWebControlDecorator
 	 */
-	public function getDecorator($create = true)
+	public function getDecorator($create=true)
 	{
 		if($create && !$this->_decorator)
-			$this->_decorator = new TWebControlDecorator($this);
+			$this->_decorator=new TWebControlDecorator($this);
 		return $this->_decorator;
 	}
 
@@ -122,7 +122,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBackColor();
 		else
 			return '';
@@ -141,7 +141,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderColor();
 		else
 			return '';
@@ -160,7 +160,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderStyle();
 		else
 			return '';
@@ -179,7 +179,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderWidth();
 		else
 			return '';
@@ -206,7 +206,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getForeColor();
 		else
 			return '';
@@ -225,7 +225,7 @@ 
 	 */
 	public function getHeight()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getHeight();
 		else
 			return '';
@@ -260,7 +260,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getCssClass();
 		else
 			return '';
@@ -279,7 +279,7 @@ 
 	 */
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style', null) !== null;
+		return $this->getViewState('Style', null)!==null;
 	}
 
 	/**
@@ -297,11 +297,11 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
-			$style = $this->createStyle();
+			$style=$this->createStyle();
 			$this->setViewState('Style', $style, null);
 			return $style;
 		}
@@ -381,7 +381,7 @@ 
 	 */
 	public function getWidth()
 	{
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getWidth();
 		else
 			return '';
@@ -403,7 +403,7 @@ 
 	 * @param TEventParameter event parameter to be passed to the event handlers
 	 */
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
+		if($decorator=$this->getDecorator(false))
 			$decorator->instantiate();
 
 		parent::onPreRender($param);
@@ -418,17 +418,17 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID() !== '' || $this->getEnsureId())
+		if($this->getID()!=='' || $this->getEnsureId())
 			$writer->addAttribute('id', $this->getClientID());
-		if(($accessKey = $this->getAccessKey()) !== '')
+		if(($accessKey=$this->getAccessKey())!=='')
 			$writer->addAttribute('accesskey', $accessKey);
 		if(!$this->getEnabled())
 			$writer->addAttribute('disabled', 'disabled');
-		if(($tabIndex = $this->getTabIndex()) > 0)
+		if(($tabIndex=$this->getTabIndex()) > 0)
 			$writer->addAttribute('tabindex', "$tabIndex");
-		if(($toolTip = $this->getToolTip()) !== '')
+		if(($toolTip=$this->getToolTip())!=='')
 			$writer->addAttribute('title', $toolTip);
-		if($style = $this->getViewState('Style', null))
+		if($style=$this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 		if($this->getHasAttributes())
 		{
@@ -459,7 +459,7 @@ 
 	 */
 	public function renderBeginTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPreTagText($writer);
 			$this->addAttributesToRender($writer);
 			$writer->renderBeginTag($this->getTagName());
@@ -487,7 +487,7 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);

framework/Web/UI/WebControls/TWebControlDecorator.php

Doc Comments +1 added lines

@@ -128,6 +128,7 @@
 	 * Initializes the control .
 	 * @param TWebControl The control that is to be decorated.
 	 * @param boolean whether decoration is just around the inner content
+	 * @param TWebControl $control
 	 */
 	public function __construct($control, $onlyinternal = false) {
 		$this->_control = $control;

Spacing +31 added lines, -31 removed lines

@@ -70,7 +70,7 @@ 
 	 * @var boolean tells if the decoration uses state in its templates.  If there are no templates
 	 * in the instance of the decoration this variable is unused.
 	 */
-	private $_usestate = false;
+	private $_usestate=false;
 
 	/**
 	 * @var TWebControl the control to decorate
@@ -85,25 +85,25 @@ 
 	/**
 	 * @var boolean This tells if the Templates have been
 	 */
-	private $_addedTemplateDecoration = false;
+	private $_addedTemplateDecoration=false;
 
 
 	/**
 	 * @var string the text that goes before the open tag
 	 */
-	private $_pretagtext = '';
+	private $_pretagtext='';
 	/**
 	 * @var string the text that goes after the open tag
 	 */
-	private $_precontentstext = '';
+	private $_precontentstext='';
 	/**
 	 * @var string the text that goes before the close tag
 	 */
-	private $_postcontentstext = '';
+	private $_postcontentstext='';
 	/**
 	 * @var string the text that goes after the close tag
 	 */
-	private $_posttagtext = '';
+	private $_posttagtext='';
 
 
 
@@ -130,9 +130,9 @@ 
 	 * @param TWebControl The control that is to be decorated.
 	 * @param boolean whether decoration is just around the inner content
 	 */
-	public function __construct($control, $onlyinternal = false) {
-		$this->_control = $control;
-		$this->_internalonly = $onlyinternal;
+	public function __construct($control, $onlyinternal=false) {
+		$this->_control=$control;
+		$this->_internalonly=$onlyinternal;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function setUseState($value)
 	{
-		$this->_usestate = TPropertyValue::ensureBoolean($value);
+		$this->_usestate=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	public function setPreTagText($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtext = TPropertyValue::ensureString($value);
+			$this->_pretagtext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -180,7 +180,7 @@ 
 	 */
 	public function setPreContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstext = TPropertyValue::ensureString($value);
+			$this->_precontentstext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -196,7 +196,7 @@ 
 	 */
 	public function setPostContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstext = TPropertyValue::ensureString($value);
+			$this->_postcontentstext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -212,7 +212,7 @@ 
 	 */
 	public function setPostTagText($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtext = TPropertyValue::ensureString($value);
+			$this->_posttagtext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -228,7 +228,7 @@ 
 	 */
 	public function setPreTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtemplate = $value;
+			$this->_pretagtemplate=$value;
 	}
 
 
@@ -244,7 +244,7 @@ 
 	 */
 	public function setPreContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstemplate = $value;
+			$this->_precontentstemplate=$value;
 	}
 
 
@@ -260,7 +260,7 @@ 
 	 */
 	public function setPostContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstemplate = $value;
+			$this->_postcontentstemplate=$value;
 	}
 
 
@@ -276,7 +276,7 @@ 
 	 */
 	public function setPostTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtemplate = $value;
+			$this->_posttagtemplate=$value;
 	}
 
 	/**
@@ -285,15 +285,15 @@ 
 	 * This call attaches the ensureTemplateDecoration to the TPage onSaveStateComplete so
 	 * these controls don't have page states.  This is as close to not influencing the page as possible.
 	 */
-	public function instantiate($outercontrol = null) {
+	public function instantiate($outercontrol=null) {
 		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 
-			$this->_outercontrol = $outercontrol;
+			$this->_outercontrol=$outercontrol;
 			if($this->getUseState())
 				$this->ensureTemplateDecoration();
 			else
-				$this->_control->getPage()->onSaveStateComplete[] = [$this, 'ensureTemplateDecoration'];
+				$this->_control->getPage()->onSaveStateComplete[]=[$this, 'ensureTemplateDecoration'];
 		}
 	}
 
@@ -306,28 +306,28 @@ 
 	 * control
 	 * @return boolean returns true if the template decorations have been added
 	 */
-	public function ensureTemplateDecoration($sender = null, $param = null) {
+	public function ensureTemplateDecoration($sender=null, $param=null) {
 
-		$control = $this->_control;
-		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
-			$outercontrol = $control;
+		$control=$this->_control;
+		$outercontrol=$this->_outercontrol;
+		if($outercontrol===null)
+			$outercontrol=$control;
 
 		if($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
 
-		$this->_addedTemplateDecoration = true;
+		$this->_addedTemplateDecoration=true;
 
 		if($this->getPreContentsTemplate())
 		{
-			$precontents = new TCompositeControl;
+			$precontents=new TCompositeControl;
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
 
 		if($this->getPostContentsTemplate())
 		{
-			$postcontents = new TCompositeControl;
+			$postcontents=new TCompositeControl;
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
@@ -338,14 +338,14 @@ 
 
 		if($this->getPreTagTemplate())
 		{
-			$pretag = new TCompositeControl;
+			$pretag=new TCompositeControl;
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
 
 		if($this->getPostTagTemplate())
 		{
-			$posttag = new TCompositeControl;
+			$posttag=new TCompositeControl;
 			$this->getPostTagTemplate()->instantiateIn($posttag);
 			$outercontrol->getParent()->getControls()->insertAfter($outercontrol, $posttag);
 		}

framework/Web/UI/WebControls/TSafeHtml.php

Spacing +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
 	 */
 	public function getConfig()
 	{
-		$config = $this->getViewState('Config', null);
-		return ($config === null) ? \HTMLPurifier_Config::createDefault() : $config;
+		$config=$this->getViewState('Config', null);
+		return ($config===null) ? \HTMLPurifier_Config::createDefault() : $config;
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	 */
 	public function render($writer)
 	{
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		parent::render($htmlWriter);
 		$writer->write($this->parseSafeHtml($htmlWriter->flush()));
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	protected function parseSafeHtml($text)
 	{
-		$purifier = new \HTMLPurifier($this->getConfig());
+		$purifier=new \HTMLPurifier($this->getConfig());
 		return $purifier->purify($text);
 	}
 }

framework/Web/Javascripts/TJavaScript.php

Doc Comments +5 added lines, -2 removed lines

@@ -77,6 +77,7 @@ 
 	/**
 	 * Renders javascript block
 	 * @param string javascript block
+	 * @param string $script
 	 * @return string rendering result
 	 */
 	public static function renderScriptBlock($script)
@@ -97,7 +98,7 @@ 
 	}
 
 	/**
-	 * @return Marks a string as a javascript function. Once marke, the string is considered as a
+	 * @return TJavaScriptLiteral a string as a javascript function. Once marke, the string is considered as a
 	 * raw javascript function that is not supposed to be encoded by {@link encode}
 	 */
 	public static function quoteJsLiteral($js)
@@ -260,6 +261,7 @@ 
 	 * @param string string to be decoded
 	 * @param bool whether to convert returned objects to associative arrays
 	 * @param int recursion depth
+	 * @param string $value
 	 * @return mixed decoded variable
 	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
@@ -302,7 +304,8 @@ 
 	 * Minimize the size of a javascript script.
 	 * This method is based on Douglas Crockford's JSMin.
 	 * @param string code that you want to minimzie
-	 * @return minimized version of the code
+	 * @param string $code
+	 * @return string version of the code
 	 */
 	public static function JSMin($code)
 	{

Braces +3 added lines, -6 removed lines

@@ -160,8 +160,7 @@ 
 					}
 				}
 				return '{' . $results . '}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -174,8 +173,7 @@ 
 				}
 				return '[' . $results . ']';
 			}
-		}
-		elseif(is_int($value))
+		} elseif(is_int($value))
 			return "$value";
 		elseif(is_float($value))
 		{
@@ -195,8 +193,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		elseif(is_object($value))
+		} elseif(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else

Spacing +38 added lines, -38 removed lines

@@ -33,9 +33,9 @@ 
 	 */
 	public static function renderScriptFiles($files)
 	{
-		$str = '';
+		$str='';
 		foreach($files as $file)
-			$str .= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -46,7 +46,7 @@ 
 	 */
 	public static function renderScriptFile($file)
 	{
-		return '<script type="text/javascript" src="' . THttpUtility::htmlEncode($file) . "\"></script>\n";
+		return '<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	public static function renderScriptBlocks($scripts)
 	{
 		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -70,7 +70,7 @@ 
 	public static function renderScriptBlocksCallback($scripts)
 	{
 		if(count($scripts))
-			return implode("\n", $scripts) . "\n";
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -139,40 +139,40 @@ 
 	 * @param boolean wether to encode empty strings too. Default to false for BC.
 	 * @return string the encoded string
 	 */
-	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
+	public static function encode($value, $toMap=true, $encodeEmptyStrings=false)
 	{
 		if(is_string($value))
 			return self::quoteString($value);
 		elseif(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		elseif(is_array($value))
 		{
-			$results = '';
-			if(($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
+			$results='';
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k => $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
-						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
+						if($results!=='')
+							$results.=',';
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '{' . $results . '}';
+				return '{'.$results.'}';
 			}
 			else
 			{
 				foreach($value as $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
-						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
+						if($results!=='')
+							$results.=',';
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '[' . $results . ']';
+				return '['.$results.']';
 			}
 		}
 		elseif(is_int($value))
@@ -188,8 +188,8 @@ 
 					return 'Number.POSITIVE_INFINITY';
 					break;
 				default:
-					$locale = localeConv();
-					if($locale['decimal_point'] == '.')
+					$locale=localeConv();
+					if($locale['decimal_point']=='.')
 						return "$value";
 					else
 						return str_replace($locale['decimal_point'], '.', "$value");
@@ -197,11 +197,11 @@ 
 			}
 		}
 		elseif(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
 				return self::encode(get_object_vars($value), $toMap);
-		elseif($value === null)
+		elseif($value===null)
 			return 'null';
 		else
 			return '';
@@ -212,14 +212,14 @@ 
 	 * @param mixed variable to be encoded
 	 * @return string encoded string
 	 */
-	public static function jsonEncode($value, $options = 0)
+	public static function jsonEncode($value, $options=0)
 	{
-		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
-			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
+		if(($g=Prado::getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
 
-		$s = @json_encode($value, $options);
+		$s=@json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
@@ -231,8 +231,8 @@ 
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
-			$value = iconv($sourceEncoding, 'UTF-8', $value);
-		elseif (is_array($value))
+			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		elseif(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -247,37 +247,37 @@ 
 	 * @param int recursion depth
 	 * @return mixed decoded variable
 	 */
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
+	public static function jsonDecode($value, $assoc=false, $depth=512)
 	{
-		$s = @json_decode($value, $assoc, $depth);
+		$s=@json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err=json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;
 				break;
 			case JSON_ERROR_DEPTH:
-				$msg = 'Maximum stack depth exceeded';
+				$msg='Maximum stack depth exceeded';
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$msg = 'Underflow or the modes mismatch';
+				$msg='Underflow or the modes mismatch';
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$msg = 'Unexpected control character found';
+				$msg='Unexpected control character found';
 				break;
 			case JSON_ERROR_SYNTAX:
-				$msg = 'Syntax error, malformed JSON';
+				$msg='Syntax error, malformed JSON';
 				break;
 			case JSON_ERROR_UTF8:
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
 				break;
 			default:
-				$msg = 'Unknown error';
+				$msg='Unknown error';
 				break;
 		}
 		throw new \Exception("JSON error ($err): $msg");

framework/Security/TSecurityManager.php

Doc Comments +3 added lines, -1 removed lines

@@ -152,7 +152,7 @@ 
 	}
 
 	/**
-	 * @return mixed the algorithm used to encrypt/decrypt data. Defaults to the string 'aes-256-cbc'.
+	 * @return string the algorithm used to encrypt/decrypt data. Defaults to the string 'aes-256-cbc'.
 	 */
 	public function getCryptAlgorithm()
 	{
@@ -173,6 +173,7 @@ 
 	/**
 	 * Encrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be encrypted.
+	 * @param string $data
 	 * @return string the encrypted data
 	 * @throws TNotSupportedException if PHP OpenSSL extension is not loaded
 	 */
@@ -191,6 +192,7 @@ 
 	/**
 	 * Decrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be decrypted.
+	 * @param string $data
 	 * @return string the decrypted data
 	 * @throws TNotSupportedException if PHP OpenSSL extension is not loaded
 	 */

Braces +2 added lines, -4 removed lines

@@ -184,8 +184,7 @@ 
 			$key = md5($this->getEncryptionKey());
 			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return $iv . openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
-		}
-		else
+		} else
 			throw new TNotSupportedException('securitymanager_openssl_required');
 	}
 
@@ -202,8 +201,7 @@ 
 			$key = md5($this->getEncryptionKey());
 			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return openssl_decrypt($this->substr($data, $this->strlen($iv), $this->strlen($data)), $this->_cryptAlgorithm, $key, null, $iv);
-		}
-		else
+		} else
 			throw new TNotSupportedException('securitymanager_openssl_required');
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -50,13 +50,13 @@ 
  */
 class TSecurityManager extends \Prado\TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
 
 	private $_validationKey;
 	private $_encryptionKey;
-	private $_hashAlgorithm = 'sha256';
-	private $_cryptAlgorithm = 'aes-256-cbc';
+	private $_hashAlgorithm='sha256';
+	private $_cryptAlgorithm='aes-256-cbc';
 	private $_mbstring;
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function init($config)
 	{
-		$this->_mbstring = extension_loaded('mbstring');
+		$this->_mbstring=extension_loaded('mbstring');
 		$this->getApplication()->setSecurityManager($this);
 	}
 
@@ -84,9 +84,9 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -99,10 +99,10 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 
 	/**
@@ -111,9 +111,9 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -126,10 +126,10 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, hash_algos()))
 			throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
 	}
@@ -166,7 +166,7 @@ 
 	 */
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = TPropertyValue::ensureString($value);
+		$this->_cryptAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
 			throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
 	}
@@ -181,9 +181,9 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$key = md5($this->getEncryptionKey());
-			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
-			return $iv . openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
+			$key=md5($this->getEncryptionKey());
+			$iv=openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
+			return $iv.openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
 		}
 		else
 			throw new TNotSupportedException('securitymanager_openssl_required');
@@ -199,8 +199,8 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$key = md5($this->getEncryptionKey());
-			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
+			$key=md5($this->getEncryptionKey());
+			$iv=$this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return openssl_decrypt($this->substr($data, $this->strlen($iv), $this->strlen($data)), $this->_cryptAlgorithm, $key, null, $iv);
 		}
 		else
@@ -214,8 +214,8 @@ 
 	 */
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
-		return $hmac . $data;
+		$hmac=$this->computeHMAC($data);
+		return $hmac.$data;
 	}
 
 	/**
@@ -227,14 +227,14 @@ 
 	 */
 	public function validateData($data)
 	{
-		$len = $this->strlen($this->computeHMAC('test'));
+		$len=$this->strlen($this->computeHMAC('test'));
 
 		if($this->strlen($data) < $len)
 			return false;
 
-		$hmac = $this->substr($data, 0, $len);
-		$data2 = $this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		$hmac=$this->substr($data, 0, $len);
+		$data2=$this->substr($data, $len, $this->strlen($data));
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 
 	/**

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Doc Comments +1 added lines

@@ -130,6 +130,7 @@
 
 	/**
 	 * @param string search condition, the SQL string after the WHERE clause.
+	 * @param string $value
 	 */
 	public function setSearchCondition($value)
 	{

Spacing +31 added lines, -31 removed lines

@@ -62,15 +62,15 @@ 
 	 */
 	protected function initializeSort()
 	{
-		$table = $this->getTableInfo();
-		$sorts = ['Sort By', str_repeat('-', 15)];
-		$headers = [];
+		$table=$this->getTableInfo();
+		$sorts=['Sort By', str_repeat('-', 15)];
+		$headers=[];
 		foreach($table->getColumns() as $name => $colum)
 		{
-			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name . ' ASC'] = $fname . ' Ascending';
-			$sorts[$name . ' DESC'] = $fname . ' Descending';
-			$headers[] = $fname ;
+			$fname=ucwords(str_replace('_', ' ', $name));
+			$sorts[$name.' ASC']=$fname.' Ascending';
+			$sorts[$name.' DESC']=$fname.' Descending';
+			$headers[]=$fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -84,7 +84,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
+		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass')!=$this->getRecordClass())
 		{
 			$this->initializeSort();
 			$this->setViewState('CurrentClass', $this->getRecordClass());
@@ -97,10 +97,10 @@ 
 	 */
 	protected function loadRecordData()
 	{
-		$search = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+		$search=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($search));
-		$finder = $this->getRecordFinder();
-		$criteria = $this->getRecordCriteria();
+		$finder=$this->getRecordFinder();
+		$criteria=$this->getRecordCriteria();
 		$this->_list->setDataSource($finder->findAll($criteria));
 		$this->_list->dataBind();
 	}
@@ -110,21 +110,21 @@ 
 	 */
 	protected function getRecordCriteria()
 	{
-		$total = $this->_list->getVirtualItemCount();
-		$limit = $this->_list->getPageSize();
-		$offset = $this->_list->getCurrentPageIndex() * $limit;
+		$total=$this->_list->getVirtualItemCount();
+		$limit=$this->_list->getPageSize();
+		$offset=$this->_list->getCurrentPageIndex() * $limit;
 		if($offset + $limit > $total)
-			$limit = $total - $offset;
-		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+			$limit=$total - $offset;
+		$criteria=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
 			if($offset <= $total)
 				$criteria->setOffset($offset);
 		}
-		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
-			$criteria->OrdersBy[$order[0]] = $order[1];
+		$order=explode(' ', $this->_sort->getSelectedValue(), 2);
+		if(is_array($order) && count($order)===2)
+			$criteria->OrdersBy[$order[0]]=$order[1];
 		return $criteria;
 	}
 
@@ -181,11 +181,11 @@ 
 	 */
 	protected function initializeEdit($sender, $param)
 	{
-		if(($ctrl = $this->getEditViewControl()) !== null)
+		if(($ctrl=$this->getEditViewControl())!==null)
 		{
 			if($param instanceof TRepeaterCommandEventParameter)
 			{
-				$pk = $param->getItem()->getCustomData();
+				$pk=$param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
 				$ctrl->initializeEditForm();
 			}
@@ -199,7 +199,7 @@ 
 	{
 		if($param instanceof TRepeaterCommandEventParameter)
 		{
-			$pk = $param->getItem()->getCustomData();
+			$pk=$param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
 		}
 	}
@@ -209,11 +209,11 @@ 
 	 */
 	protected function listItemCreated($sender, $param)
 	{
-		$item = $param->getItem();
+		$item=$param->getItem();
 		if($item instanceof IItemDataRenderer)
 		{
-			$type = $item->getItemType();
-			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
+			$type=$item->getItemType();
+			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
 	}
@@ -224,11 +224,11 @@ 
 	 */
 	protected function populateField($sender, $param)
 	{
-		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		$item=$param->getItem();
+		if(($data=$item->getData())!==null)
 		{
 			$item->setCustomData($this->getRecordPkValues($data));
-			if(($prop = $item->findControl('_properties')) !== null)
+			if(($prop=$item->findControl('_properties'))!==null)
 			{
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
 				$item->_properties->dataBind();
@@ -301,10 +301,10 @@ 
 	 */
 	protected function getEditViewControl()
 	{
-		if(($id = $this->getEditViewID()) !== null)
+		if(($id=$this->getEditViewID())!==null)
 		{
-			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl === null)
+			$ctrl=$this->getParent()->findControl($id);
+			if($ctrl===null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;
 		}

framework/IO/ITextWriter.php

Doc Comments +1 added lines

@@ -25,6 +25,7 @@
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @return void
 	 */
 	public function write($str);
 	/**

framework/Web/UI/IPostBackDataHandler.php

Doc Comments +1 added lines

@@ -35,6 +35,7 @@
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
 	 * indicating the control data is changed.
+	 * @return void
 	 */
 	public function raisePostDataChangedEvent();
 	/**