pradosoft / prado

framework/Web/UI/ActiveControls/TActiveRepeater.php

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderRepeater($writer) {
-		$writer->addAttribute('id',$this->getSurroundingTagID());
+		$writer->addAttribute('id', $this->getSurroundingTagID());
 		$writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Braces +3 added lines, -6 removed lines

@@ -424,13 +424,11 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		else if($content instanceof THtmlWriter)
+		} else if($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
-		}
-		else
+		} else
 			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
@@ -477,8 +475,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}

Spacing +36 added lines, -36 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_actions = new TList;
+		$this->_actions=new TList;
 	}
 
 	/**
@@ -88,14 +88,14 @@ 
 	public function callClientFunction($function, $params=array())
 	{
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
+			if($params[0] instanceof ISurroundable)
+				$params[0]=$params[0]->getSurroundingTagID();
 			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+				$params[0]=$params[0]->getClientID();
 		}
 		$this->_actions->add(array($function => $params));
 	}
@@ -108,13 +108,13 @@ 
 	 */
 	public function jQuery($element, $method, $params=array())
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
+		if($element instanceof ISurroundable)
+			$element=$element->getSurroundingTagID();
 		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+			$element=$element->getClientID();
 
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
 	}
@@ -147,14 +147,14 @@ 
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
-		$method = TPropertyValue::ensureEnum($method,
+		$method=TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
 		if($control instanceof TControl)
-			$control = $control->getClientID();
+			$control=$control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
 			$control=$control->getSurroundingTagID();
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
 	}
 
 	/**
@@ -226,25 +226,25 @@ 
 	 */
 	public function setListItems($control, $items)
 	{
-		$options = array();
+		$options=array();
 		if($control instanceof TListControl)
 		{
-			$promptText		= $control->getPromptText();
-			$promptValue	= $control->getPromptValue();
+			$promptText=$control->getPromptText();
+			$promptValue=$control->getPromptValue();
 
 			if($promptValue==='')
-				$promptValue = $promptText;
+				$promptValue=$promptText;
 
 			if($promptValue!=='')
-				$options[] = array($promptText, $promptValue);
+				$options[]=array($promptText, $promptValue);
 		}
 
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
 			else
-				$options[] = array($item->getText(),$item->getValue());
+				$options[]=array($item->getText(), $item->getValue());
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -422,16 +422,16 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
-			$content = null;
+			$boundary=$this->getRenderedContentBoundary($content);
+			$content=null;
 		}
 		else if($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($content);
+			$content=null;
 		}
 		else
-			$boundary = null;
+			$boundary=null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
 	}
@@ -456,11 +456,11 @@ 
 	{
 		if($writer instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($writer);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($writer);
+			$content=null;
 		} else {
-			$boundary = null;
-			$content = $writer;
+			$boundary=null;
+			$content=$writer;
 		}
 
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
+			$boundary=$this->getRenderedContentBoundary($content);
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
+			$boundary=$this->getResponseContentBoundary($content);
 		}
 
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@ 
 	 */
 	private function getRenderedContentBoundary($control)
 	{
-		$writer = $this->getResponse()->createHtmlWriter();
-		$adapter = $control->getPage()->getAdapter();
+		$writer=$this->getResponse()->createHtmlWriter();
+		$adapter=$control->getPage()->getAdapter();
 		$adapter->registerControlToRender($control, $writer);
 		return $writer->getWriter()->getBoundary();
 	}
@@ -561,7 +561,7 @@ 
 	 */
 	public function fadeTo($element, $value, $duration=500)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
 	}
 

Doc Comments +9 added lines

@@ -94,6 +94,7 @@ 
 	 * Executes a client-side statement.
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
+	 * @param string $function
 	 */
 	public function callClientFunction($function, $params=array())
 	{
@@ -154,6 +155,7 @@ 
 	 * @param string selection method
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
+	 * @param string $type
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
@@ -423,6 +425,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content.
+	 * @param boolean $self
 	 * @see insertAbout
 	 * @see insertBelow
 	 * @see insertBefore
@@ -461,6 +464,7 @@ 
 	/**
 	 * Evaluate a block of javascript enclosed in a boundary.
 	 * @param THtmlWriter writer for the content.
+	 * @param string $writer
 	 */
 	public function evaluateScript($writer)
 	{
@@ -481,6 +485,7 @@ 
 	 * Similar to to evaluateScript(), but functions declared in the
 	 * inline block will be available to page elements.
 	 * @param THtmlWriter writer for the content.
+	 * @param \Prado\TComponent $content
 	 */
 	public function appendScriptBlock($content)
 	{
@@ -502,6 +507,7 @@ 
 	 * component developers. The render() method is defered to be called in the
 	 * TActivePageAdapter class.
 	 * @param TControl control to be rendered on callback response.
+	 * @param TControl $control
 	 * @return string the boundary for which the rendered content is wrapped.
 	 */
 	private function getRenderedContentBoundary($control)
@@ -514,6 +520,7 @@ 
 
 	/**
 	 * @param THtmlWriter the writer responsible for rendering html content.
+	 * @param THtmlWriter $html
 	 * @return string content boundary.
 	 */
 	private function getResponseContentBoundary($html)
@@ -533,6 +540,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
+	 * @param string $type
 	 */
 	public function visualEffect($type, $element, $options=array())
 	{
@@ -640,6 +648,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array effect options.
+	 * @param string $effect
 	 */
 	public function juiEffect($element, $effect, $options=array())
 	{

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 	/**
 	 * Returns an iterator for traversing the items in the queue.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the queue.
+	 * @return \ArrayIterator an iterator for traversing the items in the queue.
 	 */
 	public function getIterator()
 	{

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**

framework/Wsat/pages/TWsatGenerateAR.php

Spacing +14 added lines, -14 removed lines

@@ -16,36 +16,36 @@
 
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
-                        $tableName = $this->table_name->Text;
-                        $outputFolderNs = $this->output_folder->Text;
-                        $classPrefix = $this->class_prefix->Text;
-                        $classSuffix = $this->class_suffix->Text;
+                        $tableName=$this->table_name->Text;
+                        $outputFolderNs=$this->output_folder->Text;
+                        $classPrefix=$this->class_prefix->Text;
+                        $classSuffix=$this->class_suffix->Text;
 
                         try
                         {
-                                $ar_generator = new TWsatARGenerator();
+                                $ar_generator=new TWsatARGenerator();
                                 $ar_generator->setOpFile($outputFolderNs);
                                 $ar_generator->setClasPrefix($classPrefix);
                                 $ar_generator->setClassSufix($classSuffix);
 
-                                if ($this->build_rel->Checked)
+                                if($this->build_rel->Checked)
                                         $ar_generator->buildRelations();
 
-                                if ($tableName != "*")
+                                if($tableName!="*")
                                         $ar_generator->generate($tableName);
                                 else
                                         $ar_generator->generateAll();
 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
         }
 

Indentation +34 added lines, -34 removed lines

@@ -21,44 +21,44 @@
 class TWsatGenerateAR extends TPage
 {
 
-        public function generate($sender)
-        {
-                if ($this->IsValid)
-                {
-                        $tableName = $this->table_name->Text;
-                        $outputFolderNs = $this->output_folder->Text;
-                        $classPrefix = $this->class_prefix->Text;
-                        $classSuffix = $this->class_suffix->Text;
+		public function generate($sender)
+		{
+				if ($this->IsValid)
+				{
+						$tableName = $this->table_name->Text;
+						$outputFolderNs = $this->output_folder->Text;
+						$classPrefix = $this->class_prefix->Text;
+						$classSuffix = $this->class_suffix->Text;
 
-                        try
-                        {
-                                $ar_generator = new TWsatARGenerator();
-                                $ar_generator->setOpFile($outputFolderNs);
-                                $ar_generator->setClasPrefix($classPrefix);
-                                $ar_generator->setClassSufix($classSuffix);
+						try
+						{
+								$ar_generator = new TWsatARGenerator();
+								$ar_generator->setOpFile($outputFolderNs);
+								$ar_generator->setClasPrefix($classPrefix);
+								$ar_generator->setClassSufix($classSuffix);
 
-                                if ($this->build_rel->Checked)
-                                        $ar_generator->buildRelations();
+								if ($this->build_rel->Checked)
+										$ar_generator->buildRelations();
 
-                                if ($tableName != "*")
-                                        $ar_generator->generate($tableName);
-                                else
-                                        $ar_generator->generateAll();
+								if ($tableName != "*")
+										$ar_generator->generate($tableName);
+								else
+										$ar_generator->generateAll();
 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
-                        {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
-                        }
-                        $this->feedback_panel->Visible = true;
-                }
-        }
+								$this->feedback_panel->CssClass = "green_panel";
+								$this->generation_msg->Text = "The code has been generated successfully.";
+						} catch (Exception $ex)
+						{
+								$this->feedback_panel->CssClass = "red_panel";
+								$this->generation_msg->Text = $ex->getMessage();
+						}
+						$this->feedback_panel->Visible = true;
+				}
+		}
 
-        public function preview($sender)
-        {
-                throw new THttpException(500, "Not implemented yet.");
-        }
+		public function preview($sender)
+		{
+				throw new THttpException(500, "Not implemented yet.");
+		}
 
 }
\ No newline at end of file

framework/Web/Javascripts/TJavaScript.php

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$str='';
 		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -52,7 +52,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 '';
 	}
@@ -65,7 +65,7 @@ 
 	public static function renderScriptBlocksCallback($scripts)
 	{
 		if(count($scripts))
-			return implode("\n",$scripts)."\n";
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -89,7 +89,7 @@ 
 	 */
 	public static function quoteString($js)
 	{
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 
 	/**
@@ -150,16 +150,16 @@ 
 	 * @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);
 		else if(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else if(is_array($value))
 		{
 			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k=>$v)
 				{
@@ -167,7 +167,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
@@ -180,7 +180,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
@@ -208,10 +208,10 @@ 
 			}
 		}
 		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
+				return self::encode(get_object_vars($value), $toMap);
 		else if($value===null)
 			return 'null';
 		else
@@ -223,14 +223,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 &&
+		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;
 	}
@@ -243,7 +243,7 @@ 
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		else if(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -258,37 +258,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");

Braces +3 added lines, -6 removed lines

@@ -171,8 +171,7 @@ 
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -185,8 +184,7 @@ 
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
+		} else if(is_integer($value))
 			return "$value";
 		else if(is_float($value))
 		{
@@ -206,8 +204,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		else if(is_object($value))
+		} else if(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else

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)
 	{

framework/Web/TUrlManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,10 +64,10 @@ 
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&':'&';
+		$amp=$encodeAmpersand ? '&' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -127,24 +127,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}

Braces +5 added lines, -10 removed lines

@@ -80,12 +80,10 @@ 
 						$name=urlencode($name.'[]');
 						foreach($value as $v)
 							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
@@ -93,8 +91,7 @@ 
 					{
 						foreach($value as $v)
 							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -147,14 +144,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }

framework/Web/THttpResponse.php

Braces +5 added lines, -9 removed lines

@@ -281,7 +281,7 @@ 
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -377,8 +377,7 @@ 
 		{
 			foreach($headers as $h)
 				header($h);
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -488,13 +487,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 
@@ -645,8 +642,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),

Doc Comments +4 added lines

@@ -233,6 +233,7 @@ 
 
 	/**
 	 * @param string|boolean output charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -402,6 +403,7 @@ 
 	 * The current application will be terminated after this method is invoked.
 	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of
 	 * the current request will be inserted at the beginning.
+	 * @param string $url
 	 */
 	public function redirect($url)
 	{
@@ -605,6 +607,7 @@ 
 	 * Sends a header.
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
+	 * @param string $value
 	 */
 	public function appendHeader($value, $replace=true)
 	{
@@ -630,6 +633,7 @@ 
 	 * Sends a cookie.
 	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
 	 * @param THttpCookie cook to be sent
+	 * @param THttpCookie $cookie
 	 */
 	public function addCookie($cookie)
 	{

Spacing +49 added lines, -49 removed lines

@@ -65,13 +65,13 @@ 
  */
 class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter
 {
-	const DEFAULT_CONTENTTYPE	= 'text/html';
-	const DEFAULT_CHARSET		= 'UTF-8';
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
 
 	/**
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
 	 */
-	private static $HTTP_STATUS_CODES = array(
+	private static $HTTP_STATUS_CODES=array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -202,7 +202,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new \Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -277,12 +277,12 @@ 
 	 */
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else {
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -320,7 +320,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -337,7 +337,7 @@ 
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
 	 * @throws TInvalidDataValueException if the file cannot be found
 	 */
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
 		static $defaultMimeTypes=array(
 			'css'=>'text/css',
@@ -357,9 +357,9 @@ 
 			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			else if(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext=substr($ext,1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
 			}
@@ -371,7 +371,7 @@ 
 			$clientFileName=basename($clientFileName);
 
 		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$fileSize=($content===null ? filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -385,11 +385,11 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
 		header('Content-Length: '.$fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
 		if($content===null)
 			readfile($fileName);
@@ -429,11 +429,11 @@ 
 
 		if($url[0]==='/')
 			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		if($this->_status >= 300 && $this->_status < 400)
 			// The status code has been modified to a valid redirection status, send it
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: '.str_replace('&amp;', '&', $url));
 
 		if(!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
@@ -454,7 +454,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -476,18 +476,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
-		Prado::trace("Flushing output",'Prado\Web\THttpResponse');
+		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length()>0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -504,7 +504,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -514,15 +514,15 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if($this->getRequest()->getHttpProtocolVersion()===null)
 			$protocol='HTTP/1.1';
 
-		$phpSapiName = substr(php_sapi_name(), 0, 3);
-		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
+		$phpSapiName=substr(php_sapi_name(), 0, 3);
+		$cgi=$phpSapiName=='cgi' || $phpSapiName=='fpm';
 
 		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -539,9 +539,9 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType=$this->_contentType===null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset=$this->getCharset();
-		if($charset === false) {
+		if($charset===false) {
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
@@ -549,10 +549,10 @@ 
 		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
 			$charset=$globalization->getCharset();
 
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -563,8 +563,8 @@ 
 	 */
 	public function getContents()
 	{
-		Prado::trace("Retrieving output",'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_clean();
-		Prado::trace("Clearing output",'Prado\Web\THttpResponse');
+		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
 
 	/**
@@ -583,19 +583,19 @@ 
 	 */
 	public function getHeaders($case=null)
 	{
-		$result = array();
-		$headers = headers_list();
+		$result=array();
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -608,7 +608,7 @@ 
 	 */
 	public function appendHeader($value, $replace=true)
 	{
-		Prado::trace("Sending header '$value'",'Prado\Web\THttpResponse');
+		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
 		header($value, $replace);
 	}
 
@@ -621,9 +621,9 @@ 
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
 	 * @see http://us2.php.net/manual/en/function.error-log.php
 	 */
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
-		error_log($message,$messageType,$destination,$extraHeaders);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 
 	/**

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/TActiveClientScript.php

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl())!=='')
+		if(($scriptUrl=$this->getScriptUrl())!=='')
 		{
 			if($this->getPage()->getIsCallback())
 			{
-				$cs = $this->getPage()->getClientScript();
+				$cs=$this->getPage()->getClientScript();
 				$uniqueid=$this->ClientID.'_custom';
 				if(!$cs->isScriptFileRegistered($uniqueid))
 					$cs->registerScriptFile($uniqueid, $scriptUrl);
@@ -65,7 +65,7 @@ 
 		{
 			if($this->getPage()->getIsCallback())
 			{
-				$extWriter= $this->getPage()->getResponse()->createHtmlWriter();
+				$extWriter=$this->getPage()->getResponse()->createHtmlWriter();
 				$extWriter->write("/*<![CDATA[*/\n");
 				$this->renderChildren($extWriter);
 				$extWriter->write("\n/*]]>*/");